summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-02-04 20:20:27 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2004-02-04 20:20:27 +0000
commit5a326f47963cc1ef9f2a0d8a0f3bcb94d9b80b89 (patch)
treec76428cd75cef4d8a412be96af1accf5cdab557f
parent4755552109abd912dbf3ed4ccc6d134500b4f0cb (diff)
downloadATCD-5a326f47963cc1ef9f2a0d8a0f3bcb94d9b80b89.tar.gz
ChangeLogTag: Wed Feb 4 14:18:04 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r--TAO/ChangeLog855
-rw-r--r--TAO/examples/Callback_Quoter/Consumer_Handler.h4
-rw-r--r--TAO/examples/Callback_Quoter/Notifier_Input_Handler.h4
-rw-r--r--TAO/examples/Callback_Quoter/Supplier_i.h4
-rw-r--r--TAO/examples/Content_Server/AMI_Iterator/client.cpp6
-rw-r--r--TAO/examples/Content_Server/AMI_Iterator/server.cpp6
-rw-r--r--TAO/examples/Content_Server/AMI_Observer/client.cpp6
-rw-r--r--TAO/examples/Content_Server/AMI_Observer/server.cpp6
-rw-r--r--TAO/examples/Content_Server/SMI_Iterator/client.cpp6
-rw-r--r--TAO/examples/Content_Server/SMI_Iterator/server.cpp6
-rw-r--r--TAO/examples/Event_Comm/Consumer_Handler.h4
-rw-r--r--TAO/examples/Event_Comm/Notifier_Handler.h4
-rw-r--r--TAO/examples/Event_Comm/Notifier_Server.h4
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp2
-rw-r--r--TAO/examples/Kokyu_dsrt_schedulers/Kokyu_qos.idl2
-rw-r--r--TAO/examples/Logging/Logging_Service_i.h4
-rw-r--r--TAO/examples/Logging/Logging_Test_i.cpp6
-rw-r--r--TAO/examples/Logging/Logging_Test_i.h4
-rw-r--r--TAO/examples/Quoter/Generic_Factory.cpp2
-rw-r--r--TAO/examples/Quoter/client.cpp2
-rw-r--r--TAO/examples/Quoter/client.h2
-rw-r--r--TAO/examples/Quoter/server.h4
-rw-r--r--TAO/examples/RTCORBA/Activity/Activity.h2
-rw-r--r--TAO/examples/RTCORBA/Activity/Builder.h2
-rw-r--r--TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc6
-rw-r--r--TAO/examples/RTScheduling/Starter.h2
-rw-r--r--TAO/examples/Simple/Simple_util.h2
-rw-r--r--TAO/examples/Simple/time-date/Simple_time_date.mpc6
-rw-r--r--TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h4
-rw-r--r--TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp12
-rw-r--r--TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp8
-rw-r--r--TAO/orbsvcs/Event_Service/Event_Service.cpp18
-rw-r--r--TAO/orbsvcs/Event_Service/Event_Service.h4
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp7
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h8
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc1
-rw-r--r--TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.mpc2
-rwxr-xr-xTAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp8
-rwxr-xr-xTAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h2
-rwxr-xr-xTAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp2
-rwxr-xr-xTAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h4
-rwxr-xr-xTAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h4
-rw-r--r--TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp4
-rw-r--r--TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h4
-rw-r--r--TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp12
-rw-r--r--TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h8
-rwxr-xr-xTAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp10
-rwxr-xr-xTAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h2
-rw-r--r--TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp4
-rw-r--r--TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h4
-rw-r--r--TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h4
-rw-r--r--TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h6
-rw-r--r--TAO/orbsvcs/IFR_Service/IFR_Service.cpp2
-rw-r--r--TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h2
-rw-r--r--TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h4
-rw-r--r--TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp2
-rw-r--r--TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h6
-rw-r--r--TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp2
-rw-r--r--TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h2
-rw-r--r--TAO/orbsvcs/LoadBalancer/LoadManager.cpp2
-rw-r--r--TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp4
-rw-r--r--TAO/orbsvcs/LoadBalancer/Monitor_Signal_Handler.h2
-rw-r--r--TAO/orbsvcs/LoadBalancer/Push_Handler.h2
-rw-r--r--TAO/orbsvcs/Naming_Service/Naming_Service.h2
-rw-r--r--TAO/orbsvcs/Notify_Service/Notify_Service.h4
-rw-r--r--TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp6
-rw-r--r--TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h6
-rw-r--r--TAO/orbsvcs/Time_Service/Clerk_i.h6
-rw-r--r--TAO/orbsvcs/Time_Service/Server_i.h6
-rw-r--r--TAO/orbsvcs/Trading_Service/Trading_Service.h8
-rw-r--r--TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h2
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h4
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp4
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h8
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h4
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp10
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h4
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp10
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h4
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h4
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h8
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h8
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h8
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h6
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h8
-rw-r--r--TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp6
-rw-r--r--TAO/orbsvcs/examples/CosEC/Simple/Consumer.h2
-rw-r--r--TAO/orbsvcs/examples/CosEC/Simple/Service.cpp8
-rw-r--r--TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp6
-rw-r--r--TAO/orbsvcs/examples/CosEC/Simple/Supplier.h2
-rw-r--r--TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp8
-rw-r--r--TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc1
-rw-r--r--TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl2
-rw-r--r--TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp4
-rw-r--r--TAO/orbsvcs/examples/Log/Basic/TLS_Client.h4
-rw-r--r--TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp3
-rw-r--r--TAO/orbsvcs/examples/Log/Event/Event_Consumer.h6
-rw-r--r--TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp3
-rw-r--r--TAO/orbsvcs/examples/Log/Event/Event_Supplier.h6
-rw-r--r--TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp5
-rw-r--r--TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h10
-rw-r--r--TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp5
-rw-r--r--TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h6
-rw-r--r--TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp5
-rw-r--r--TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h6
-rw-r--r--TAO/orbsvcs/examples/Notify/Filter/Filter.h6
-rw-r--r--TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h6
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp12
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h2
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp16
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h2
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp14
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h2
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp12
-rw-r--r--TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h2
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/AddrServer.h2
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp8
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/Consumer.h4
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp14
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp8
-rw-r--r--TAO/orbsvcs/examples/RtEC/MCast/Supplier.h4
-rw-r--r--TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Schedule/Schedule.h2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp16
-rw-r--r--TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp4
-rw-r--r--TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp10
-rw-r--r--TAO/orbsvcs/examples/RtEC/Simple/Consumer.h2
-rw-r--r--TAO/orbsvcs/examples/RtEC/Simple/Service.cpp10
-rw-r--r--TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp10
-rw-r--r--TAO/orbsvcs/examples/RtEC/Simple/Supplier.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h20
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp24
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/AV_Core.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Policy.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/RTCP.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/RTP.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Transport.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/default_resource.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/default_resource.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/sfp.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Channel_Clients.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/Channel_Clients_T.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp12
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosNaming.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosNotification.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosTime.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp10
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp14
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Filter.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp18
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/Event_Channel.h10
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/Event_Manip.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h18
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp12
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/RT_Task.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/Timer_Module.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Event_Service_Constants.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event_Utilities.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/Event_Utilities.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/FTRT_GroupManager.idl4
-rw-r--r--TAO/orbsvcs/orbsvcs/FT_CORBA.idl10
-rw-r--r--TAO/orbsvcs/orbsvcs/FT_FaultDetectorFactory.idl6
-rw-r--r--TAO/orbsvcs/orbsvcs/FT_Notifier.idl10
-rw-r--r--TAO/orbsvcs/orbsvcs/FT_ReplicationManager.idl8
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp4
-rwxr-xr-xTAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp6
-rwxr-xr-xTAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h2
-rwxr-xr-xTAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp2
-rwxr-xr-xTAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp6
-rwxr-xr-xTAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent.mpc1
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h3
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl2
-rw-r--r--TAO/orbsvcs/orbsvcs/FtRtecEventComm.idl2
-rw-r--r--TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/IOR_Multicast.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Monitor.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h10
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp7
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h12
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp7
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h10
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/EventLog_i.h10
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp7
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Iterator_i.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp5
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/LogNotification.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp9
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Log_i.cpp11
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/Log_i.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp7
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp7
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h10
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp7
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp3
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/PersistStore.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp24
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp36
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h12
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp34
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h14
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp24
-rw-r--r--TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h10
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Entries.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Admin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Builder.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Consumer.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Container_T.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Event.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Event.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/EventChannel.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/EventType.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Object.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Peer.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Properties.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Properties.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Property.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Property_T.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Service.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Supplier.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp16
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp6
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h7
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h3
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc1
-rw-r--r--TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/RTEvent.mpc1
-rw-r--r--TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc1
-rw-r--r--TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/RTSched.mpc2
-rw-r--r--TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc1
-rw-r--r--TAO/orbsvcs/orbsvcs/RT_Notification.mpc1
-rw-r--r--TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/Scheduler.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp10
-rw-r--r--TAO/orbsvcs/orbsvcs/Scheduler_Factory.h6
-rw-r--r--TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp8
-rw-r--r--TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Security.idl2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/SecurityManager.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/Security_Current.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SecurityLevel1.idl2
-rw-r--r--TAO/orbsvcs/orbsvcs/SecurityLevel2.idl2
-rw-r--r--TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl2
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Time_Utilities.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Time_Utilities.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Interpreter.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trader.h8
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h6
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/ORBInitializer.cpp7
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/ORBInitializer.h2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/RPS_Monitor.cpp1
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/RPS_Monitor.h3
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/ServerRequestInterceptor.cpp1
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp8
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp6
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp6
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp6
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp8
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp10
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp4
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h6
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h6
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h6
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h6
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h10
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h6
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp4
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h6
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h6
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h6
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h12
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h16
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Latency/control.cpp8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp6
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Latency/ping.h6
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp6
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Latency/pong.h6
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h12
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast/server.h14
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h12
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h14
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h10
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h10
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable/server.h8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp2
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h8
-rw-r--r--TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h8
-rw-r--r--TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp8
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_client.h4
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_command.cpp6
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_command.h2
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp2
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_naming_service.h6
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_test_utils.h2
-rw-r--r--TAO/orbsvcs/tests/Concurrency/CC_tests.h4
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp10
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp8
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h2
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp8
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp8
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp8
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/Random.h4
-rw-r--r--TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp8
-rw-r--r--TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h4
-rw-r--r--TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h4
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp12
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h4
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp8
-rw-r--r--TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h2
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h2
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp4
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h4
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp14
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp4
-rw-r--r--TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h4
-rw-r--r--TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp14
-rw-r--r--TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h18
-rw-r--r--TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp20
-rw-r--r--TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h10
-rw-r--r--TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h2
-rw-r--r--TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h2
-rw-r--r--TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h2
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp10
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h6
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp12
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h4
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp10
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h6
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp12
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h2
-rw-r--r--TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp24
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp14
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/BCast.cpp6
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/BCast.h2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp14
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Complex.cpp14
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Control.cpp14
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Control.h2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp14
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Gateway.cpp16
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp14
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Negation.cpp14
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Observer.cpp8
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Observer.h2
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Random.cpp12
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Random.h4
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp6
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Timeout.cpp14
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp14
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h4
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp6
-rw-r--r--TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Connect.cpp6
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Inversion.cpp8
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Latency.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Latency.h4
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp4
-rw-r--r--TAO/orbsvcs/tests/Event/Performance/Throughput.cpp6
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Consumer.cpp8
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Consumer.h4
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h4
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp6
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h4
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Driver.cpp8
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Driver.h2
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Supplier.cpp8
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Supplier.h4
-rw-r--r--TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_App/FT_Creator.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp6
-rw-r--r--TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h2
-rwxr-xr-xTAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_App/FT_TestReplica.idl2
-rwxr-xr-xTAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h4
-rw-r--r--TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h4
-rw-r--r--TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp2
-rw-r--r--TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h4
-rw-r--r--TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h4
-rw-r--r--TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h4
-rw-r--r--TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp6
-rw-r--r--TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h4
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp6
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp6
-rw-r--r--TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp6
-rw-r--r--TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h2
-rw-r--r--TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp7
-rw-r--r--TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h4
-rw-r--r--TAO/orbsvcs/tests/FtRtEvent/consumer.cpp14
-rw-r--r--TAO/orbsvcs/tests/FtRtEvent/supplier.cpp13
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp2
-rw-r--r--TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/InterfaceRepo_IDL3_Test.mpc5
-rw-r--r--TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp2
-rw-r--r--TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h4
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp8
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp10
-rw-r--r--TAO/orbsvcs/tests/Notify/Basic/Sequence.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp6
-rw-r--r--TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp8
-rw-r--r--TAO/orbsvcs/tests/Notify/Blocking/common.cpp4
-rw-r--r--TAO/orbsvcs/tests/Notify/Blocking/common.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp4
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp8
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp4
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp8
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/common.cpp4
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/common.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp4
-rw-r--r--TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp6
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp4
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp8
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp4
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp8
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/common.cpp4
-rw-r--r--TAO/orbsvcs/tests/Notify/Ordering/common.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp4
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp8
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp4
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp4
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp6
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp4
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp6
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp6
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp6
-rw-r--r--TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp6
-rw-r--r--TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h4
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Filter_Command.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/LookupManager.h4
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h6
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp6
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Options_Parser.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Peer.cpp6
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp6
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp6
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp6
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp6
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp6
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp4
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp6
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp4
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp6
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp4
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.h2
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp6
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h6
-rw-r--r--TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp8
-rw-r--r--TAO/orbsvcs/tests/Property/client.h4
-rw-r--r--TAO/orbsvcs/tests/Property/server.h4
-rw-r--r--TAO/orbsvcs/tests/RTCosScheduling/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/RTCosScheduling/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Redundant_Naming/client.cpp8
-rw-r--r--TAO/orbsvcs/tests/Sched/DynSched_Test.cpp8
-rw-r--r--TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp10
-rw-r--r--TAO/orbsvcs/tests/Security/Big_Request/server.cpp1
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/server.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Callback/server_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Crash_Test/client.cpp4
-rw-r--r--TAO/orbsvcs/tests/Security/Crash_Test/server.cpp4
-rw-r--r--TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp4
-rw-r--r--TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp6
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp4
-rw-r--r--TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h2
-rw-r--r--TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h2
-rw-r--r--TAO/orbsvcs/tests/Security/SecurityLevel1/client.cpp4
-rw-r--r--TAO/orbsvcs/tests/Simple_Naming/client.h4
-rw-r--r--TAO/orbsvcs/tests/Time/Client_i.h4
-rw-r--r--TAO/orbsvcs/tests/Trading/Offer_Importer.h2
-rw-r--r--TAO/orbsvcs/tests/Trading/Simple_Dynamic.h2
-rw-r--r--TAO/orbsvcs/tests/Trading/TT_Info.cpp2
-rw-r--r--TAO/orbsvcs/tests/Trading/TT_Info.h6
-rw-r--r--TAO/orbsvcs/tests/Trading/colocated_test.cpp8
-rw-r--r--TAO/orbsvcs/tests/Trading/export_test.cpp8
-rw-r--r--TAO/rules.tao.GNU2
-rw-r--r--TAO/tests/IDL_Test/array.idl21
-rw-r--r--TAO/utils/nslist/nsadd.cpp2
-rw-r--r--TAO/utils/nslist/nsdel.cpp2
-rw-r--r--TAO/utils/nslist/nslist.cpp2
839 files changed, 3020 insertions, 1883 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 0ef3ea255e1..e3558ad278e 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,858 @@
+Wed Feb 4 14:18:04 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ * rules.tao.GNU:
+
+ Added -I$(TAO_ROOT) to TAO_IDLFLAGS.
+
+ * examples/Callback_Quoter/Consumer_Handler.h:
+ * examples/Callback_Quoter/Notifier_Input_Handler.h:
+ * examples/Callback_Quoter/Supplier_i.h:
+ * examples/Content_Server/AMI_Iterator/client.cpp:
+ * examples/Content_Server/AMI_Iterator/server.cpp:
+ * examples/Content_Server/AMI_Observer/client.cpp:
+ * examples/Content_Server/AMI_Observer/server.cpp:
+ * examples/Content_Server/SMI_Iterator/client.cpp:
+ * examples/Content_Server/SMI_Iterator/server.cpp:
+ * examples/Event_Comm/Consumer_Handler.h:
+ * examples/Event_Comm/Notifier_Handler.h:
+ * examples/Event_Comm/Notifier_Server.h:
+ * examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp:
+ * examples/Kokyu_dsrt_schedulers/Kokyu_qos.idl:
+ * examples/Logging/Logging_Service_i.h:
+ * examples/Logging/Logging_Test_i.cpp:
+ * examples/Logging/Logging_Test_i.h:
+ * examples/Quoter/Generic_Factory.cpp:
+ * examples/Quoter/client.cpp:
+ * examples/Quoter/client.h:
+ * examples/Quoter/server.h:
+ * examples/RTCORBA/Activity/Activity.h:
+ * examples/RTCORBA/Activity/Builder.h:
+ * examples/RTScheduling/Starter.h:
+ * examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc:
+ * examples/Simple/Simple_util.h:
+ * examples/Simple/time-date/Simple_time_date.mpc:
+ * orbsvcs/Concurrency_Service/Concurrency_Service.h:
+ * orbsvcs/CosEvent_Service/CosEvent_Service.cpp:
+ * orbsvcs/Dump_Schedule/Dump_Schedule.cpp:
+ * orbsvcs/Event_Service/Event_Service.cpp:
+ * orbsvcs/Event_Service/Event_Service.h:
+ * orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp:
+ * orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h:
+ * orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc:
+ * orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.mpc:
+ * orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp:
+ * orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h:
+ * orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp:
+ * orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h:
+ * orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h:
+ * orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp:
+ * orbsvcs/FT_ReplicationManager/FT_Property_Validator.h:
+ * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp:
+ * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h:
+ * orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp:
+ * orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h:
+ * orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp:
+ * orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h:
+ * orbsvcs/Fault_Detector/Fault_Detector_i.h:
+ * orbsvcs/Fault_Notifier/FT_Notifier_i.h:
+ * orbsvcs/IFR_Service/IFR_Service.cpp:
+ * orbsvcs/ImplRepo_Service/ImR_Activator_i.h:
+ * orbsvcs/LifeCycle_Service/Criteria_Evaluator.h:
+ * orbsvcs/LifeCycle_Service/Factory_Trader.cpp:
+ * orbsvcs/LifeCycle_Service/Factory_Trader.h:
+ * orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp:
+ * orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h:
+ * orbsvcs/LoadBalancer/LoadManager.cpp:
+ * orbsvcs/LoadBalancer/LoadMonitor.cpp:
+ * orbsvcs/LoadBalancer/Monitor_Signal_Handler.h:
+ * orbsvcs/LoadBalancer/Push_Handler.h:
+ * orbsvcs/Naming_Service/Naming_Service.h:
+ * orbsvcs/Notify_Service/Notify_Service.h:
+ * orbsvcs/Scheduling_Service/Scheduling_Service.cpp:
+ * orbsvcs/Scheduling_Service/Scheduling_Service.h:
+ * orbsvcs/Time_Service/Clerk_i.h:
+ * orbsvcs/Time_Service/Server_i.h:
+ * orbsvcs/Trading_Service/Trading_Service.h:
+ * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp:
+ * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h:
+ * orbsvcs/examples/CosEC/Factory/FactoryClient.cpp:
+ * orbsvcs/examples/CosEC/Factory/FactoryDriver.h:
+ * orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp:
+ * orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h:
+ * orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h:
+ * orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp:
+ * orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h:
+ * orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h:
+ * orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp:
+ * orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h:
+ * orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp:
+ * orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h:
+ * orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h:
+ * orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Consumer.h:
+ * orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Supplier.h:
+ * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h:
+ * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h:
+ * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h:
+ * orbsvcs/examples/CosEC/Simple/Consumer.cpp:
+ * orbsvcs/examples/CosEC/Simple/Consumer.h:
+ * orbsvcs/examples/CosEC/Simple/Service.cpp:
+ * orbsvcs/examples/CosEC/Simple/Supplier.cpp:
+ * orbsvcs/examples/CosEC/Simple/Supplier.h:
+ * orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp:
+ * orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc:
+ * orbsvcs/examples/CosEC/TypedSimple/Country.idl:
+ * orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp:
+ * orbsvcs/examples/Log/Basic/TLS_Client.h:
+ * orbsvcs/examples/Log/Event/Event_Consumer.cpp:
+ * orbsvcs/examples/Log/Event/Event_Consumer.h:
+ * orbsvcs/examples/Log/Event/Event_Supplier.cpp:
+ * orbsvcs/examples/Log/Event/Event_Supplier.h:
+ * orbsvcs/examples/Log/Notify/Notify_Consumer.cpp:
+ * orbsvcs/examples/Log/Notify/Notify_Consumer.h:
+ * orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp:
+ * orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h:
+ * orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp:
+ * orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h:
+ * orbsvcs/examples/Notify/Filter/Filter.h:
+ * orbsvcs/examples/Notify/Subscribe/Subscribe.h:
+ * orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp:
+ * orbsvcs/examples/RtEC/IIOPGateway/Consumer.h:
+ * orbsvcs/examples/RtEC/IIOPGateway/EC.cpp:
+ * orbsvcs/examples/RtEC/IIOPGateway/EC.h:
+ * orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp:
+ * orbsvcs/examples/RtEC/IIOPGateway/Gateway.h:
+ * orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp:
+ * orbsvcs/examples/RtEC/IIOPGateway/Supplier.h:
+ * orbsvcs/examples/RtEC/MCast/AddrServer.h:
+ * orbsvcs/examples/RtEC/MCast/Consumer.cpp:
+ * orbsvcs/examples/RtEC/MCast/Consumer.h:
+ * orbsvcs/examples/RtEC/MCast/MCast.cpp:
+ * orbsvcs/examples/RtEC/MCast/Supplier.cpp:
+ * orbsvcs/examples/RtEC/MCast/Supplier.h:
+ * orbsvcs/examples/RtEC/Schedule/Consumer.h:
+ * orbsvcs/examples/RtEC/Schedule/Schedule.h:
+ * orbsvcs/examples/RtEC/Schedule/Service.cpp:
+ * orbsvcs/examples/RtEC/Schedule/Supplier.cpp:
+ * orbsvcs/examples/RtEC/Schedule/Supplier.h:
+ * orbsvcs/examples/RtEC/Simple/Consumer.cpp:
+ * orbsvcs/examples/RtEC/Simple/Consumer.h:
+ * orbsvcs/examples/RtEC/Simple/Service.cpp:
+ * orbsvcs/examples/RtEC/Simple/Supplier.cpp:
+ * orbsvcs/examples/RtEC/Simple/Supplier.h:
+ * orbsvcs/orbsvcs/Channel_Clients.h:
+ * orbsvcs/orbsvcs/Channel_Clients_T.cpp:
+ * orbsvcs/orbsvcs/Channel_Clients_T.h:
+ * orbsvcs/orbsvcs/CosEvent.mpc:
+ * orbsvcs/orbsvcs/CosLoadBalancing.mpc:
+ * orbsvcs/orbsvcs/CosNaming.mpc:
+ * orbsvcs/orbsvcs/CosNotification.mpc:
+ * orbsvcs/orbsvcs/CosTime.mpc:
+ * orbsvcs/orbsvcs/Event_Service_Constants.h:
+ * orbsvcs/orbsvcs/Event_Utilities.cpp:
+ * orbsvcs/orbsvcs/Event_Utilities.h:
+ * orbsvcs/orbsvcs/FTRT_GroupManager.idl:
+ * orbsvcs/orbsvcs/FT_CORBA.idl:
+ * orbsvcs/orbsvcs/FT_FaultDetectorFactory.idl:
+ * orbsvcs/orbsvcs/FT_Notifier.idl:
+ * orbsvcs/orbsvcs/FT_ReplicationManager.idl:
+ * orbsvcs/orbsvcs/FtRtEvent.mpc:
+ * orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl:
+ * orbsvcs/orbsvcs/FtRtecEventComm.idl:
+ * orbsvcs/orbsvcs/IOR_Multicast.h:
+ * orbsvcs/orbsvcs/RTCORBAEvent.mpc:
+ * orbsvcs/orbsvcs/RTEvent.mpc:
+ * orbsvcs/orbsvcs/RTKokyuEvent.mpc:
+ * orbsvcs/orbsvcs/RTOLDEvent.mpc:
+ * orbsvcs/orbsvcs/RTSched.mpc:
+ * orbsvcs/orbsvcs/RTSchedEvent.mpc:
+ * orbsvcs/orbsvcs/RT_Notification.mpc:
+ * orbsvcs/orbsvcs/Runtime_Scheduler.cpp:
+ * orbsvcs/orbsvcs/Runtime_Scheduler.h:
+ * orbsvcs/orbsvcs/Scheduler_Factory.cpp:
+ * orbsvcs/orbsvcs/Scheduler_Factory.h:
+ * orbsvcs/orbsvcs/Scheduler_Utilities.cpp:
+ * orbsvcs/orbsvcs/Scheduler_Utilities.h:
+ * orbsvcs/orbsvcs/Security.idl:
+ * orbsvcs/orbsvcs/SecurityLevel1.idl:
+ * orbsvcs/orbsvcs/SecurityLevel2.idl:
+ * orbsvcs/orbsvcs/SecurityReplaceable.idl:
+ * orbsvcs/orbsvcs/Time_Utilities.cpp:
+ * orbsvcs/orbsvcs/Time_Utilities.h:
+ * orbsvcs/orbsvcs/AV/AVStreams_i.h:
+ * orbsvcs/orbsvcs/AV/AV_Core.cpp:
+ * orbsvcs/orbsvcs/AV/AV_Core.h:
+ * orbsvcs/orbsvcs/AV/FlowSpec_Entry.h:
+ * orbsvcs/orbsvcs/AV/Policy.h:
+ * orbsvcs/orbsvcs/AV/QoS_UDP.cpp:
+ * orbsvcs/orbsvcs/AV/QoS_UDP.h:
+ * orbsvcs/orbsvcs/AV/RTCP.h:
+ * orbsvcs/orbsvcs/AV/RTP.h:
+ * orbsvcs/orbsvcs/AV/Resource_Factory.h:
+ * orbsvcs/orbsvcs/AV/Transport.h:
+ * orbsvcs/orbsvcs/AV/default_resource.cpp:
+ * orbsvcs/orbsvcs/AV/default_resource.h:
+ * orbsvcs/orbsvcs/AV/sfp.h:
+ * orbsvcs/orbsvcs/Concurrency/CC_Lock.h:
+ * orbsvcs/orbsvcs/Concurrency/CC_LockSet.h:
+ * orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h:
+ * orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h:
+ * orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp:
+ * orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h:
+ * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp:
+ * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h:
+ * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h:
+ * orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp:
+ * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h:
+ * orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h:
+ * orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h:
+ * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp:
+ * orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h:
+ * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h:
+ * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h:
+ * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h:
+ * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp:
+ * orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h:
+ * orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h:
+ * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h:
+ * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h:
+ * orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h:
+ * orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp:
+ * orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h:
+ * orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h:
+ * orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h:
+ * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h:
+ * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h:
+ * orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h:
+ * orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp:
+ * orbsvcs/orbsvcs/Event/Dispatching_Modules.h:
+ * orbsvcs/orbsvcs/Event/ECG_Adapters.h:
+ * orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h:
+ * orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h:
+ * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp:
+ * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h:
+ * orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h:
+ * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp:
+ * orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h:
+ * orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp:
+ * orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h:
+ * orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp:
+ * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp:
+ * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp:
+ * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h:
+ * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp:
+ * orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h:
+ * orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h:
+ * orbsvcs/orbsvcs/Event/EC_Dispatching.h:
+ * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h:
+ * orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h:
+ * orbsvcs/orbsvcs/Event/EC_Filter.h:
+ * orbsvcs/orbsvcs/Event/EC_Filter_Builder.h:
+ * orbsvcs/orbsvcs/Event/EC_Gateway.cpp:
+ * orbsvcs/orbsvcs/Event/EC_Gateway.h:
+ * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp:
+ * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h:
+ * orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp:
+ * orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp:
+ * orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h:
+ * orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp:
+ * orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h:
+ * orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp:
+ * orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h:
+ * orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp:
+ * orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h:
+ * orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp:
+ * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp:
+ * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h:
+ * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp:
+ * orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp:
+ * orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp:
+ * orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h:
+ * orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h:
+ * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h:
+ * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp:
+ * orbsvcs/orbsvcs/Event/EC_ProxySupplier.h:
+ * orbsvcs/orbsvcs/Event/EC_QOS_Info.h:
+ * orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h:
+ * orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h:
+ * orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp:
+ * orbsvcs/orbsvcs/Event/EC_Sched_Filter.h:
+ * orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp:
+ * orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h:
+ * orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp:
+ * orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h:
+ * orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h:
+ * orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h:
+ * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp:
+ * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp:
+ * orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp:
+ * orbsvcs/orbsvcs/Event/EC_UDP_Admin.h:
+ * orbsvcs/orbsvcs/Event/Event_Channel.cpp:
+ * orbsvcs/orbsvcs/Event/Event_Channel.h:
+ * orbsvcs/orbsvcs/Event/Event_Manip.cpp:
+ * orbsvcs/orbsvcs/Event/Event_Manip.h:
+ * orbsvcs/orbsvcs/Event/Local_ESTypes.h:
+ * orbsvcs/orbsvcs/Event/Module_Factory.cpp:
+ * orbsvcs/orbsvcs/Event/RT_Task.cpp:
+ * orbsvcs/orbsvcs/Event/RT_Task.h:
+ * orbsvcs/orbsvcs/Event/ReactorTask.cpp:
+ * orbsvcs/orbsvcs/Event/Timer_Module.cpp:
+ * orbsvcs/orbsvcs/Event/Timer_Module.h:
+ * orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp:
+ * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp:
+ * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h:
+ * orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h:
+ * orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp:
+ * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp:
+ * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h:
+ * orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp:
+ * orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp:
+ * orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h:
+ * orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h:
+ * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp:
+ * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Monitor.h:
+ * orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h:
+ * orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp:
+ * orbsvcs/orbsvcs/LoadBalancing/LB_Component.h:
+ * orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h:
+ * orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp:
+ * orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h:
+ * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h:
+ * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp:
+ * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h:
+ * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h:
+ * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h:
+ * orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h:
+ * orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp:
+ * orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h:
+ * orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h:
+ * orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h:
+ * orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h:
+ * orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp:
+ * orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h:
+ * orbsvcs/orbsvcs/LoadBalancing/LB_Random.h:
+ * orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp:
+ * orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h:
+ * orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp:
+ * orbsvcs/orbsvcs/Log/BasicLogFactory_i.h:
+ * orbsvcs/orbsvcs/Log/BasicLog_i.cpp:
+ * orbsvcs/orbsvcs/Log/BasicLog_i.h:
+ * orbsvcs/orbsvcs/Log/EventLogConsumer.cpp:
+ * orbsvcs/orbsvcs/Log/EventLogConsumer.h:
+ * orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp:
+ * orbsvcs/orbsvcs/Log/EventLogFactory_i.h:
+ * orbsvcs/orbsvcs/Log/EventLogNotification.cpp:
+ * orbsvcs/orbsvcs/Log/EventLogNotification.h:
+ * orbsvcs/orbsvcs/Log/EventLog_i.cpp:
+ * orbsvcs/orbsvcs/Log/EventLog_i.h:
+ * orbsvcs/orbsvcs/Log/Iterator_i.cpp:
+ * orbsvcs/orbsvcs/Log/Iterator_i.h:
+ * orbsvcs/orbsvcs/Log/LogMgr_i.h:
+ * orbsvcs/orbsvcs/Log/LogNotification.cpp:
+ * orbsvcs/orbsvcs/Log/LogNotification.h:
+ * orbsvcs/orbsvcs/Log/LogRecordStore.cpp:
+ * orbsvcs/orbsvcs/Log/LogRecordStore.h:
+ * orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h:
+ * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp:
+ * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h:
+ * orbsvcs/orbsvcs/Log/Log_i.cpp:
+ * orbsvcs/orbsvcs/Log/Log_i.h:
+ * orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp:
+ * orbsvcs/orbsvcs/Log/NotifyLogConsumer.h:
+ * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp:
+ * orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h:
+ * orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp:
+ * orbsvcs/orbsvcs/Log/NotifyLogNotification.h:
+ * orbsvcs/orbsvcs/Log/NotifyLog_i.cpp:
+ * orbsvcs/orbsvcs/Log/NotifyLog_i.h:
+ * orbsvcs/orbsvcs/Log/PersistStore.cpp:
+ * orbsvcs/orbsvcs/Log/PersistStore.h:
+ * orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp:
+ * orbsvcs/orbsvcs/Log/RTEventLogConsumer.h:
+ * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp:
+ * orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h:
+ * orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp:
+ * orbsvcs/orbsvcs/Log/RTEventLogNotification.h:
+ * orbsvcs/orbsvcs/Log/RTEventLog_i.cpp:
+ * orbsvcs/orbsvcs/Log/RTEventLog_i.h:
+ * orbsvcs/orbsvcs/Naming/Entries.h:
+ * orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h:
+ * orbsvcs/orbsvcs/Naming/Naming_Loader.h:
+ * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp:
+ * orbsvcs/orbsvcs/Naming/Naming_Utils.h:
+ * orbsvcs/orbsvcs/Naming/Persistent_Entries.h:
+ * orbsvcs/orbsvcs/Notify/Admin.cpp:
+ * orbsvcs/orbsvcs/Notify/AdminProperties.cpp:
+ * orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp:
+ * orbsvcs/orbsvcs/Notify/Buffering_Strategy.h:
+ * orbsvcs/orbsvcs/Notify/Builder.h:
+ * orbsvcs/orbsvcs/Notify/Consumer.h:
+ * orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp:
+ * orbsvcs/orbsvcs/Notify/ConsumerAdmin.h:
+ * orbsvcs/orbsvcs/Notify/Container_T.cpp:
+ * orbsvcs/orbsvcs/Notify/Container_T.h:
+ * orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp:
+ * orbsvcs/orbsvcs/Notify/Default_Factory.cpp:
+ * orbsvcs/orbsvcs/Notify/ETCL_Filter.h:
+ * orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h:
+ * orbsvcs/orbsvcs/Notify/Event.cpp:
+ * orbsvcs/orbsvcs/Notify/Event.h:
+ * orbsvcs/orbsvcs/Notify/EventChannel.h:
+ * orbsvcs/orbsvcs/Notify/EventChannelFactory.h:
+ * orbsvcs/orbsvcs/Notify/EventType.h:
+ * orbsvcs/orbsvcs/Notify/Event_Manager.h:
+ * orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp:
+ * orbsvcs/orbsvcs/Notify/Event_Map_T.cpp:
+ * orbsvcs/orbsvcs/Notify/FilterAdmin.h:
+ * orbsvcs/orbsvcs/Notify/Find_Worker_T.h:
+ * orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h:
+ * orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h:
+ * orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h:
+ * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp:
+ * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h:
+ * orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h:
+ * orbsvcs/orbsvcs/Notify/Object.h:
+ * orbsvcs/orbsvcs/Notify/Peer.h:
+ * orbsvcs/orbsvcs/Notify/Properties.cpp:
+ * orbsvcs/orbsvcs/Notify/Properties.h:
+ * orbsvcs/orbsvcs/Notify/Property.h:
+ * orbsvcs/orbsvcs/Notify/PropertySeq.h:
+ * orbsvcs/orbsvcs/Notify/Property_Boolean.h:
+ * orbsvcs/orbsvcs/Notify/Property_T.h:
+ * orbsvcs/orbsvcs/Notify/ProxyConsumer.h:
+ * orbsvcs/orbsvcs/Notify/ProxySupplier.h:
+ * orbsvcs/orbsvcs/Notify/RT_Builder.cpp:
+ * orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp:
+ * orbsvcs/orbsvcs/Notify/RT_POA_Helper.h:
+ * orbsvcs/orbsvcs/Notify/Seq_Worker_T.h:
+ * orbsvcs/orbsvcs/Notify/Service.h:
+ * orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h:
+ * orbsvcs/orbsvcs/Notify/Supplier.h:
+ * orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp:
+ * orbsvcs/orbsvcs/Notify/SupplierAdmin.h:
+ * orbsvcs/orbsvcs/Notify/Any/AnyEvent.h:
+ * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h:
+ * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h:
+ * orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h:
+ * orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h:
+ * orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp:
+ * orbsvcs/orbsvcs/Notify/Any/PushConsumer.h:
+ * orbsvcs/orbsvcs/Notify/Any/PushSupplier.h:
+ * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h:
+ * orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h:
+ * orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h:
+ * orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h:
+ * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h:
+ * orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h:
+ * orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h:
+ * orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h:
+ * orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h:
+ * orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h:
+ * orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h:
+ * orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h:
+ * orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h:
+ * orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp:
+ * orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h:
+ * orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h:
+ * orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h:
+ * orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h:
+ * orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h:
+ * orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h:
+ * orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp:
+ * orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h:
+ * orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h:
+ * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp:
+ * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h:
+ * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp:
+ * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h:
+ * orbsvcs/orbsvcs/PortableGroup/PG_Operators.h:
+ * orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h:
+ * orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h:
+ * orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h:
+ * orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h:
+ * orbsvcs/orbsvcs/PortableGroup/PG_Utils.h:
+ * orbsvcs/orbsvcs/PortableGroup/PG_conf.h:
+ * orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h:
+ * orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h:
+ * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp:
+ * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h:
+ * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp:
+ * orbsvcs/orbsvcs/Property/CosPropertyService_i.h:
+ * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h:
+ * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h:
+ * orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp:
+ * orbsvcs/orbsvcs/Sched/Config_Scheduler.h:
+ * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp:
+ * orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h:
+ * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h:
+ * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp:
+ * orbsvcs/orbsvcs/Sched/SchedEntry.h:
+ * orbsvcs/orbsvcs/Sched/Scheduler.cpp:
+ * orbsvcs/orbsvcs/Sched/Scheduler.h:
+ * orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp:
+ * orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h:
+ * orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.h:
+ * orbsvcs/orbsvcs/Security/MechanismPolicy.h:
+ * orbsvcs/orbsvcs/Security/PrincipalAuthenticator.h:
+ * orbsvcs/orbsvcs/Security/QOPPolicy.h:
+ * orbsvcs/orbsvcs/Security/SecurityManager.h:
+ * orbsvcs/orbsvcs/Security/Security_Current.h:
+ * orbsvcs/orbsvcs/Security/Security_Current_Impl.h:
+ * orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp:
+ * orbsvcs/orbsvcs/Time/TAO_TIO.h:
+ * orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h:
+ * orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h:
+ * orbsvcs/orbsvcs/Time/TAO_UTO.h:
+ * orbsvcs/orbsvcs/Time/Timer_Helper.h:
+ * orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h:
+ * orbsvcs/orbsvcs/Trader/Constraint_Nodes.h:
+ * orbsvcs/orbsvcs/Trader/Constraint_Visitors.h:
+ * orbsvcs/orbsvcs/Trader/Interpreter.h:
+ * orbsvcs/orbsvcs/Trader/Interpreter_Utils.h:
+ * orbsvcs/orbsvcs/Trader/Trader.h:
+ * orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h:
+ * orbsvcs/orbsvcs/Trader/Trading_Loader.h:
+ * orbsvcs/performance-tests/LoadBalancing/ORBInitializer.cpp:
+ * orbsvcs/performance-tests/LoadBalancing/ORBInitializer.h:
+ * orbsvcs/performance-tests/LoadBalancing/RPS_Monitor.cpp:
+ * orbsvcs/performance-tests/LoadBalancing/RPS_Monitor.h:
+ * orbsvcs/performance-tests/LoadBalancing/ServerRequestInterceptor.cpp:
+ * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp:
+ * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp:
+ * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp:
+ * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp:
+ * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp:
+ * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp:
+ * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp:
+ * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp:
+ * orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp:
+ * orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp:
+ * orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp:
+ * orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp:
+ * orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp:
+ * orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp:
+ * orbsvcs/performance-tests/RTEvent/lib/Consumer.h:
+ * orbsvcs/performance-tests/RTEvent/lib/Control.cpp:
+ * orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp:
+ * orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp:
+ * orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp:
+ * orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h:
+ * orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp:
+ * orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp:
+ * orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h:
+ * orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp:
+ * orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.cpp:
+ * orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp:
+ * orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp:
+ * orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp:
+ * orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h:
+ * orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp:
+ * orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp:
+ * orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp:
+ * orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp:
+ * orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp:
+ * orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp:
+ * orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp:
+ * orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.cpp:
+ * orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp:
+ * orbsvcs/performance-tests/RTEvent/lib/Supplier.h:
+ * orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp:
+ * orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h:
+ * orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp:
+ * orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h:
+ * orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h:
+ * orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h:
+ * orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h:
+ * orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h:
+ * orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h:
+ * orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp:
+ * orbsvcs/tests/AVStreams/Component_Switching/distributer.h:
+ * orbsvcs/tests/AVStreams/Component_Switching/receiver.h:
+ * orbsvcs/tests/AVStreams/Component_Switching/sender.h:
+ * orbsvcs/tests/AVStreams/Full_Profile/ftp.h:
+ * orbsvcs/tests/AVStreams/Full_Profile/server.h:
+ * orbsvcs/tests/AVStreams/Latency/control.cpp:
+ * orbsvcs/tests/AVStreams/Latency/ping.cpp:
+ * orbsvcs/tests/AVStreams/Latency/ping.h:
+ * orbsvcs/tests/AVStreams/Latency/pong.cpp:
+ * orbsvcs/tests/AVStreams/Latency/pong.h:
+ * orbsvcs/tests/AVStreams/Modify_QoS/receiver.h:
+ * orbsvcs/tests/AVStreams/Modify_QoS/sender.h:
+ * orbsvcs/tests/AVStreams/Multicast/ftp.h:
+ * orbsvcs/tests/AVStreams/Multicast/server.h:
+ * orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h:
+ * orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h:
+ * orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h:
+ * orbsvcs/tests/AVStreams/Multiple_Flows/sender.h:
+ * orbsvcs/tests/AVStreams/Pluggable/ftp.h:
+ * orbsvcs/tests/AVStreams/Pluggable/server.h:
+ * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp:
+ * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h:
+ * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h:
+ * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h:
+ * orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp:
+ * orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h:
+ * orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h:
+ * orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h:
+ * orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h:
+ * orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h:
+ * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h:
+ * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h:
+ * orbsvcs/tests/Bug_1630_Regression/testclient.cpp:
+ * orbsvcs/tests/Concurrency/CC_client.h:
+ * orbsvcs/tests/Concurrency/CC_command.cpp:
+ * orbsvcs/tests/Concurrency/CC_command.h:
+ * orbsvcs/tests/Concurrency/CC_command.tab.cpp:
+ * orbsvcs/tests/Concurrency/CC_naming_service.h:
+ * orbsvcs/tests/Concurrency/CC_test_utils.h:
+ * orbsvcs/tests/Concurrency/CC_tests.h:
+ * orbsvcs/tests/CosEvent/Basic/Disconnect.cpp:
+ * orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp:
+ * orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h:
+ * orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp:
+ * orbsvcs/tests/CosEvent/Basic/Push_Event.cpp:
+ * orbsvcs/tests/CosEvent/Basic/Random.cpp:
+ * orbsvcs/tests/CosEvent/Basic/Random.h:
+ * orbsvcs/tests/CosEvent/Basic/Shutdown.cpp:
+ * orbsvcs/tests/CosEvent/lib/Counting_Consumer.h:
+ * orbsvcs/tests/CosEvent/lib/Counting_Supplier.h:
+ * orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp:
+ * orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h:
+ * orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp:
+ * orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h:
+ * orbsvcs/tests/EC_MT_Mcast/AddrServer.h:
+ * orbsvcs/tests/EC_MT_Mcast/Consumer.cpp:
+ * orbsvcs/tests/EC_MT_Mcast/Consumer.h:
+ * orbsvcs/tests/EC_MT_Mcast/MCast.cpp:
+ * orbsvcs/tests/EC_MT_Mcast/Supplier.cpp:
+ * orbsvcs/tests/EC_MT_Mcast/Supplier.h:
+ * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp:
+ * orbsvcs/tests/EC_Mcast/EC_Mcast.h:
+ * orbsvcs/tests/EC_Multiple/EC_Multiple.cpp:
+ * orbsvcs/tests/EC_Multiple/EC_Multiple.h:
+ * orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h:
+ * orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h:
+ * orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h:
+ * orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp:
+ * orbsvcs/tests/EC_Throughput/ECT_Consumer.h:
+ * orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp:
+ * orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h:
+ * orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp:
+ * orbsvcs/tests/EC_Throughput/ECT_Supplier.h:
+ * orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp:
+ * orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h:
+ * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp:
+ * orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp:
+ * orbsvcs/tests/Event/Basic/Atomic_Reconnect.h:
+ * orbsvcs/tests/Event/Basic/BCast.cpp:
+ * orbsvcs/tests/Event/Basic/BCast.h:
+ * orbsvcs/tests/Event/Basic/Bitmask.cpp:
+ * orbsvcs/tests/Event/Basic/Complex.cpp:
+ * orbsvcs/tests/Event/Basic/Control.cpp:
+ * orbsvcs/tests/Event/Basic/Control.h:
+ * orbsvcs/tests/Event/Basic/Disconnect.cpp:
+ * orbsvcs/tests/Event/Basic/Gateway.cpp:
+ * orbsvcs/tests/Event/Basic/MT_Disconnect.cpp:
+ * orbsvcs/tests/Event/Basic/MT_Disconnect.h:
+ * orbsvcs/tests/Event/Basic/Negation.cpp:
+ * orbsvcs/tests/Event/Basic/Observer.cpp:
+ * orbsvcs/tests/Event/Basic/Observer.h:
+ * orbsvcs/tests/Event/Basic/Random.cpp:
+ * orbsvcs/tests/Event/Basic/Random.h:
+ * orbsvcs/tests/Event/Basic/Reconnect.cpp:
+ * orbsvcs/tests/Event/Basic/Timeout.cpp:
+ * orbsvcs/tests/Event/Basic/Wildcard.cpp:
+ * orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp:
+ * orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h:
+ * orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp:
+ * orbsvcs/tests/Event/Mcast/Complex/consumer.cpp:
+ * orbsvcs/tests/Event/Performance/Connect.cpp:
+ * orbsvcs/tests/Event/Performance/Inversion.cpp:
+ * orbsvcs/tests/Event/Performance/Latency.cpp:
+ * orbsvcs/tests/Event/Performance/Latency.h:
+ * orbsvcs/tests/Event/Performance/Latency_Server.cpp:
+ * orbsvcs/tests/Event/Performance/Throughput.cpp:
+ * orbsvcs/tests/Event/lib/Consumer.cpp:
+ * orbsvcs/tests/Event/lib/Consumer.h:
+ * orbsvcs/tests/Event/lib/Counting_Consumer.h:
+ * orbsvcs/tests/Event/lib/Counting_Supplier.cpp:
+ * orbsvcs/tests/Event/lib/Counting_Supplier.h:
+ * orbsvcs/tests/Event/lib/Driver.cpp:
+ * orbsvcs/tests/Event/lib/Driver.h:
+ * orbsvcs/tests/Event/lib/Supplier.cpp:
+ * orbsvcs/tests/Event/lib/Supplier.h:
+ * orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp:
+ * orbsvcs/tests/FT_App/FT_Creator.cpp:
+ * orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp:
+ * orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h:
+ * orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp:
+ * orbsvcs/tests/FT_App/FT_TestReplica.idl:
+ * orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h:
+ * orbsvcs/tests/FT_App/StubBatchConsumer.h:
+ * orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp:
+ * orbsvcs/tests/FT_App/StubFaultAnalyzer.h:
+ * orbsvcs/tests/FT_App/StubFaultConsumer.h:
+ * orbsvcs/tests/FT_App/StubFaultNotifier.h:
+ * orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp:
+ * orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h:
+ * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp:
+ * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp:
+ * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp:
+ * orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp:
+ * orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp:
+ * orbsvcs/tests/FtRtEvent/PushConsumer.cpp:
+ * orbsvcs/tests/FtRtEvent/PushConsumer.h:
+ * orbsvcs/tests/FtRtEvent/PushSupplier.cpp:
+ * orbsvcs/tests/FtRtEvent/PushSupplier.h:
+ * orbsvcs/tests/FtRtEvent/consumer.cpp:
+ * orbsvcs/tests/FtRtEvent/supplier.cpp:
+ * orbsvcs/tests/ImplRepo/NameService/test.cpp:
+ * orbsvcs/tests/InterfaceRepo/IDL3_Test/InterfaceRepo_IDL3_Test.mpc:
+ * orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp:
+ * orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h:
+ * orbsvcs/tests/Notify/Basic/IdAssignment.cpp:
+ * orbsvcs/tests/Notify/Basic/IdAssignment.h:
+ * orbsvcs/tests/Notify/Basic/LifeCycle.cpp:
+ * orbsvcs/tests/Notify/Basic/Sequence.h:
+ * orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp:
+ * orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h:
+ * orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp:
+ * orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp:
+ * orbsvcs/tests/Notify/Blocking/common.cpp:
+ * orbsvcs/tests/Notify/Blocking/common.h:
+ * orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp:
+ * orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp:
+ * orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp:
+ * orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp:
+ * orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp:
+ * orbsvcs/tests/Notify/Discarding/common.cpp:
+ * orbsvcs/tests/Notify/Discarding/common.h:
+ * orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp:
+ * orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp:
+ * orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp:
+ * orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp:
+ * orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp:
+ * orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp:
+ * orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp:
+ * orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp:
+ * orbsvcs/tests/Notify/Ordering/common.cpp:
+ * orbsvcs/tests/Notify/Ordering/common.h:
+ * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp:
+ * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp:
+ * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp:
+ * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp:
+ * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.h:
+ * orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp:
+ * orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp:
+ * orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp:
+ * orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp:
+ * orbsvcs/tests/Notify/Sequence_Multi_Filter/common.h:
+ * orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp:
+ * orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp:
+ * orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp:
+ * orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp:
+ * orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h:
+ * orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h:
+ * orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h:
+ * orbsvcs/tests/Notify/lib/EventChannel_Command.h:
+ * orbsvcs/tests/Notify/lib/Filter_Command.h:
+ * orbsvcs/tests/Notify/lib/LookupManager.h:
+ * orbsvcs/tests/Notify/lib/Notify_Test_Client.h:
+ * orbsvcs/tests/Notify/lib/Options_Parser.cpp:
+ * orbsvcs/tests/Notify/lib/Options_Parser.h:
+ * orbsvcs/tests/Notify/lib/Peer.cpp:
+ * orbsvcs/tests/Notify/lib/Peer_T.cpp:
+ * orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp:
+ * orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp:
+ * orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h:
+ * orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp:
+ * orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp:
+ * orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h:
+ * orbsvcs/tests/Notify/lib/StructuredEvent.h:
+ * orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h:
+ * orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp:
+ * orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp:
+ * orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp:
+ * orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp:
+ * orbsvcs/tests/Notify/performance-tests/Filter/common.cpp:
+ * orbsvcs/tests/Notify/performance-tests/Filter/common.h:
+ * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp:
+ * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h:
+ * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp:
+ * orbsvcs/tests/Property/client.h:
+ * orbsvcs/tests/Property/server.h:
+ * orbsvcs/tests/RTCosScheduling/client.cpp:
+ * orbsvcs/tests/RTCosScheduling/server.cpp:
+ * orbsvcs/tests/Redundant_Naming/client.cpp:
+ * orbsvcs/tests/Sched/DynSched_Test.cpp:
+ * orbsvcs/tests/Sched_Conf/Sched_Conf.cpp:
+ * orbsvcs/tests/Security/Big_Request/server.cpp:
+ * orbsvcs/tests/Security/Callback/client.cpp:
+ * orbsvcs/tests/Security/Callback/server.cpp:
+ * orbsvcs/tests/Security/Callback/server_i.cpp:
+ * orbsvcs/tests/Security/Crash_Test/client.cpp:
+ * orbsvcs/tests/Security/Crash_Test/server.cpp:
+ * orbsvcs/tests/Security/Crash_Test/test_i.cpp:
+ * orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp:
+ * orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp:
+ * orbsvcs/tests/Security/Secure_Invocation/Foo_i.h:
+ * orbsvcs/tests/Security/Secure_Invocation/client.cpp:
+ * orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h:
+ * orbsvcs/tests/Security/SecurityLevel1/client.cpp:
+ * orbsvcs/tests/Simple_Naming/client.h:
+ * orbsvcs/tests/Time/Client_i.h:
+ * orbsvcs/tests/Trading/Offer_Importer.h:
+ * orbsvcs/tests/Trading/Simple_Dynamic.h:
+ * orbsvcs/tests/Trading/TT_Info.cpp:
+ * orbsvcs/tests/Trading/TT_Info.h:
+ * orbsvcs/tests/Trading/colocated_test.cpp:
+ * orbsvcs/tests/Trading/export_test.cpp:
+ * tests/IDL_Test/array.idl:
+ * utils/nslist/nsadd.cpp:
+ * utils/nslist/nsdel.cpp:
+ * utils/nslist/nslist.cpp:
+
+ - Removed all include paths except TAO_ROOT
+ for C++ and IDL compilers, from MPC files.
+
+ - Modified includes in source and header files as necessary,
+ per the above changes.
+
+ - Added missing ACE_ROOT/ace includes.
+
+ - Made other modifications as necessary to MPC files to
+ eliminate build errors.
+
Wed Feb 4 11:08:31 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
* TAO_IDL/fe/fe_tmplinst.cpp:
diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.h b/TAO/examples/Callback_Quoter/Consumer_Handler.h
index 15f12eb3e58..cc0646c0ef2 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/Naming/Naming_Utils.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/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 f9b1a091ed6..6e126029194 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/CosNamingS.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/CosNamingS.h"
+#include "orbsvcs/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 17562742f47..717b1acc1bf 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/Naming/Naming_Utils.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "ace/Reactor.h"
#include "ace/Read_Buffer.h"
#include "ace/OS.h"
diff --git a/TAO/examples/Content_Server/AMI_Iterator/client.cpp b/TAO/examples/Content_Server/AMI_Iterator/client.cpp
index 756603eaf7a..ea4f3158c3e 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/client.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/client.cpp
@@ -4,11 +4,13 @@
// Ossama Othman <ossama@uci.edu>
#include "ace/Process_Manager.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "Web_ServerC.h"
#include "Iterator_Handler.h"
-ACE_RCSID (AMI_Iterator, client, "$Id$")
+ACE_RCSID (AMI_Iterator,
+ client,
+ "$Id$")
// Obtain reference to Iterator_Factory
Web_Server::Iterator_Factory_ptr
diff --git a/TAO/examples/Content_Server/AMI_Iterator/server.cpp b/TAO/examples/Content_Server/AMI_Iterator/server.cpp
index fab8f391270..e1f4fa883e0 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/server.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/server.cpp
@@ -3,12 +3,14 @@
// Ossama Othman <ossama@uci.edu>
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "Web_ServerS.h"
#include "Iterator_Factory_i.h"
-ACE_RCSID (AMI_Iterator, server, "$Id$")
+ACE_RCSID (AMI_Iterator,
+ server,
+ "$Id$")
int
main (int argc, char *argv[])
diff --git a/TAO/examples/Content_Server/AMI_Observer/client.cpp b/TAO/examples/Content_Server/AMI_Observer/client.cpp
index 9c0465ac1c1..890221c96ba 100644
--- a/TAO/examples/Content_Server/AMI_Observer/client.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/client.cpp
@@ -4,11 +4,13 @@
// Ossama Othman <ossama@uci.edu>
#include "ace/Process_Manager.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "Push_Web_ServerC.h"
#include "Push_Iterator_Handler.h"
-ACE_RCSID (AMI_Observer, client, "$Id$")
+ACE_RCSID (AMI_Observer,
+ client,
+ "$Id$")
// Obtain reference to Iterator_Factory
Web_Server::Iterator_Factory_ptr
diff --git a/TAO/examples/Content_Server/AMI_Observer/server.cpp b/TAO/examples/Content_Server/AMI_Observer/server.cpp
index 55854e56c83..2f83bff364b 100644
--- a/TAO/examples/Content_Server/AMI_Observer/server.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/server.cpp
@@ -3,11 +3,13 @@
// Ossama Othman <ossama@uci.edu>
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "Push_Web_ServerS.h"
#include "Push_Iterator_Factory_i.h"
-ACE_RCSID (AMI_Observer, server, "$Id$")
+ACE_RCSID (AMI_Observer,
+ server,
+ "$Id$")
int
main (int argc, char *argv[])
diff --git a/TAO/examples/Content_Server/SMI_Iterator/client.cpp b/TAO/examples/Content_Server/SMI_Iterator/client.cpp
index c5f1703664e..fe5151af49a 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/client.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/client.cpp
@@ -5,11 +5,13 @@
#include "ace/FILE_Connector.h"
#include "ace/Process_Manager.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "Web_ServerC.h"
#include "ace/OS_NS_strings.h"
-ACE_RCSID(SMI_Iterator, client, "$Id$")
+ACE_RCSID (SMI_Iterator,
+ client,
+ "$Id$")
// Retrieve the data from the server
diff --git a/TAO/examples/Content_Server/SMI_Iterator/server.cpp b/TAO/examples/Content_Server/SMI_Iterator/server.cpp
index 733b3e71dfc..f72546b7767 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/server.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/server.cpp
@@ -3,12 +3,14 @@
// Ossama Othman <ossama@uci.edu>
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "Web_ServerS.h"
#include "Iterator_Factory_i.h"
-ACE_RCSID(SMI_Iterator, server, "$Id$")
+ACE_RCSID (SMI_Iterator,
+ server,
+ "$Id$")
int
main (int argc, char *argv[])
diff --git a/TAO/examples/Event_Comm/Consumer_Handler.h b/TAO/examples/Event_Comm/Consumer_Handler.h
index f4b031644d5..2df1a0b799f 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/Naming/Naming_Utils.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/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 93cbe0a02c8..6a13a2485d0 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/Naming/Naming_Utils.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/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 e5f3f38b8e1..3be60e4bc63 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/CosNamingS.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/CosNamingS.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
class Notifier_Server
{
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
index c4fd7a3de4c..f26282b06c6 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
@@ -3,7 +3,7 @@
#include "FP_Scheduler.h"
#include "Kokyu_qosC.h"
#include "utils.h"
-#include "ORB_Constants.h"
+#include "tao/ORB_Constants.h"
#include "tao/RTScheduling/Request_Interceptor.h"
FP_Scheduling::SegmentSchedulingParameter
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Kokyu_qos.idl b/TAO/examples/Kokyu_dsrt_schedulers/Kokyu_qos.idl
index 63cc8df216d..df8607d686d 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/Kokyu_qos.idl
+++ b/TAO/examples/Kokyu_dsrt_schedulers/Kokyu_qos.idl
@@ -35,7 +35,7 @@
#ifndef _KOKYU_DSRT_QOS_PIDL_
#define _KOKYU_DSRT_QOS_PIDL_
-#include <TimeBase.pidl>
+#include <tao/TimeBase.pidl>
#include <tao/RTCORBA/RTCORBA_include.pidl>
#pragma prefix "omg.org"
diff --git a/TAO/examples/Logging/Logging_Service_i.h b/TAO/examples/Logging/Logging_Service_i.h
index bc70c520427..9d7e8e01dc2 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/CosNamingC.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/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 bc70e388cbb..6aaad74b114 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/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "tao/debug.h"
#include "ace/INET_Addr.h"
#include "ace/SOCK_Dgram_Mcast.h"
@@ -11,7 +11,9 @@
#include "ace/OS_NS_arpa_inet.h"
#include "ace/OS_NS_sys_time.h"
-ACE_RCSID(Logger, Logging_Test_i, "$Id$")
+ACE_RCSID (Logger,
+ Logging_Test_i,
+ "$Id$")
// Constructor
Logger_Client::Logger_Client (void)
diff --git a/TAO/examples/Logging/Logging_Test_i.h b/TAO/examples/Logging/Logging_Test_i.h
index 05ad3ea7a89..753b0cd7bc0 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/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "LoggerC.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/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 12516fcb83a..340bb6d7e78 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/LifeCycleServiceC.h"
+#include "orbsvcs/orbsvcs/LifeCycleServiceC.h"
ACE_RCSID (Quoter,
Generic_Factory,
diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp
index 7dec1d90a22..be51846ebe7 100644
--- a/TAO/examples/Quoter/client.cpp
+++ b/TAO/examples/Quoter/client.cpp
@@ -2,7 +2,7 @@
#include "ace/Read_Buffer.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "client.h"
diff --git a/TAO/examples/Quoter/client.h b/TAO/examples/Quoter/client.h
index d5014c872c8..f171180c031 100644
--- a/TAO/examples/Quoter/client.h
+++ b/TAO/examples/Quoter/client.h
@@ -28,7 +28,7 @@
#include "QuoterC.h"
-#include "orbsvcs/CosLifeCycleC.h"
+#include "orbsvcs/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 fe681790c66..1b3362e8c1d 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/CosNamingC.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
#include "tao/PortableServer/ORB_Manager.h"
#include "Quoter_i.h"
#include "QuoterC.h"
diff --git a/TAO/examples/RTCORBA/Activity/Activity.h b/TAO/examples/RTCORBA/Activity/Activity.h
index ea5cef35093..699bc523440 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/CosNamingC.h"
+#include "orbsvcs/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 5b333145f0b..fa71c73a8f7 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/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "tao/RTPortableServer/RTPortableServer.h"
class Periodic_Task;
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc
index 5252cd21879..528386d496c 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc
@@ -2,9 +2,12 @@
// $Id$
project(*Starter): namingexe, rtscheduling_server {
+ idlflags += -o ..
+
IDL_Files {
../Synch.idl
}
+
Source_Files {
../Starter.cpp
../Synch_i.cpp
@@ -16,10 +19,13 @@ project(*Starter): namingexe, rtscheduling_server {
}
project(*test) : namingexe, rtscheduling_server {
+ idlflags += -o ..
+
IDL_Files {
../Synch.idl
../Job.idl
}
+
Source_Files {
test.cpp
MIF_DT_Creator.cpp
diff --git a/TAO/examples/RTScheduling/Starter.h b/TAO/examples/RTScheduling/Starter.h
index 2c499cfda05..4a717c0a367 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/Naming/Naming_Utils.h"
+#include "orbsvcs/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 05336bb5f42..bf6ba78109f 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/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
#include "ace/Get_Opt.h"
#include "ace/Read_Buffer.h"
diff --git a/TAO/examples/Simple/time-date/Simple_time_date.mpc b/TAO/examples/Simple/time-date/Simple_time_date.mpc
index daad131f55e..f668bdf4909 100644
--- a/TAO/examples/Simple/time-date/Simple_time_date.mpc
+++ b/TAO/examples/Simple/time-date/Simple_time_date.mpc
@@ -1,12 +1,12 @@
// -*- MPC -*-
// $Id$
-project(*lib): portableserver {
+project(*lib): portableserver, taolib_with_idl {
sharedname = Time_Date
// The svc conf files assume that the dll is in the current directory
libout = .
+ idlflags += -Wb,export_macro=Alt_Resource_Factory_Export -Wb,export_include=Alt_Resource_Factory.h
dynamicflags += ACE_BUILD_SVC_DLL Alt_Resource_Factory_BUILD_DLL
- idlflags += -Wb,export_macro=Alt_Resource_Factory_Export -Wb,export_include=Alt_Resource_Factory.h
Source_Files {
Time_Date.cpp
Time_Date_i.cpp
@@ -33,6 +33,6 @@ project(*client): taoclient, namingexe {
client.cpp
Time_Date_Client_i.cpp
}
- idl_files {
+ IDL_Files {
}
}
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
index 18a728b7e86..38d5bb7ad7e 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/Concurrency/Concurrency_Utils.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h"
+#include "orbsvcs/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 1f2ace518e1..4dfc74e1fde 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
@@ -1,14 +1,16 @@
// $Id$
-#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 "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 "ace/Get_Opt.h"
#include "ace/Argv_Type_Converter.h"
#include "ace/OS_main.h"
-ACE_RCSID(CosEvent_Service, CosEvent_Service, "$Id$")
+ACE_RCSID (CosEvent_Service,
+ CosEvent_Service,
+ "$Id$")
int
ACE_TMAIN (int argc, ACE_TCHAR* argv[])
diff --git a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
index 39909650b17..90c6ad963d1 100644
--- a/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
+++ b/TAO/orbsvcs/Dump_Schedule/Dump_Schedule.cpp
@@ -6,10 +6,12 @@
#include "ace/Argv_Type_Converter.h"
#include "ace/OS_main.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
-ACE_RCSID(Dump_Schedule, Dump_Schedule, "$Id$")
+ACE_RCSID (Dump_Schedule,
+ Dump_Schedule,
+ "$Id$")
// This program dumps the results of one scheduling in a C++ file.
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp
index 88068232fdf..f8dad651a53 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.cpp
+++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp
@@ -7,19 +7,21 @@
#include "ace/Argv_Type_Converter.h"
#include "ace/OS_main.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/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/Event/EC_Default_Factory.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
#include "tao/BiDir_GIOP/BiDirGIOP.h"
#include "ace/OS_NS_strings.h"
-ACE_RCSID(Event_Service, Event_Service, "$Id$")
+ACE_RCSID (Event_Service,
+ Event_Service,
+ "$Id$")
int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
{
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.h b/TAO/orbsvcs/Event_Service/Event_Service.h
index 6e6065f292b..a97012f6900 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/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/RtecSchedulerS.h"
+#include "orbsvcs/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 6c932f42874..b4568f7dba7 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
@@ -7,16 +7,15 @@
#include "ace/INET_Addr.h"
#include "ace/SOCK_Connector.h"
#include "ace/SOCK_Stream.h"
-#include "orbsvcs/Sched/Config_Scheduler.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h"
+#include "orbsvcs/orbsvcs/Sched/Config_Scheduler.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h"
#include "ace/OS_main.h"
ACE_RCSID (Event_Service,
FT_EventService,
"$Id$")
-
int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
{
FT_EventService 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 64fd3722ff6..958173e1715 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/CosNamingC.h"
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
-#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h"
-#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.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 "TP_Task.h"
namespace POA_RtecScheduler
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc
index 265b2dca723..d6b8e89bdbb 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.mpc
@@ -4,7 +4,6 @@
project(FTRTEC_Factory_Service): orbsvcsexe, fault_tolerance, notify {
after += FaultTolerance
exename = ftrtec_factory_service
- includes += $(TAO_ROOT)/orbsvcs
specific(gnuace) {
lit_libs += TAO_Strategies
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.mpc b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.mpc
index 7c3643cc630..7625ff12fa2 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.mpc
+++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.mpc
@@ -3,7 +3,7 @@
project(FTRTEC_Gateway_Service): orbsvcsexe, ftrteventclient {
exename = ftrtec_gateway_service
- includes += $(TAO_ROOT)/orbsvcs $(TAO_ROOT)/orbsvcs/FtRtEvent/Utils
+ includes += $(TAO_ROOT)/orbsvcs/FtRtEvent/Utils
Source_Files {
FTRTEC_Gateway_Service.cpp
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp
index e177f9d92f4..06834e6126a 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/CosNotifyCommC.h"
-#include "orbsvcs/FT_NotifierC.h"
-#include "orbsvcs/FT_FaultDetectorFactoryC.h"
-#include "orbsvcs/FT_ReplicationManagerC.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/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 814162e6662..ccf11188739 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/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
namespace TAO
{
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
index 5d59b163372..a988aa4c917 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/FT_ReplicationManagerC.h"
+#include "orbsvcs/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 4ce246a321a..38bf8e8b347 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/CosNotifyCommS.h"
-#include "orbsvcs/FT_NotifierC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommS.h"
+#include "orbsvcs/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 d0b64b49e4f..2c8ce6cb62d 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/FT_CORBAC.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/FT_CORBAC.h"
+#include "orbsvcs/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 205f9f96d63..e2df60d3357 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/PortableGroup/PG_Operators.h"
-#include "orbsvcs/FT_ReplicationManagerC.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Operators.h"
+#include "orbsvcs/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 cc5912f9b36..6b389719098 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/PortableGroup/PG_Default_Property_Validator.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h"
+#include "orbsvcs/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 1d4fbc0e5c3..cf289d8bad8 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
@@ -21,13 +21,13 @@
#include <tao/IORTable/IORTable.h>
#include <tao/debug.h>
#include <tao/ORB_Constants.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/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/FaultTolerance/FT_IOGR_Property.h>
+#include <orbsvcs/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_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
index 3536274bd0d..dd8f18d4f50 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
@@ -22,16 +22,16 @@
#pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include <orbsvcs/FT_ReplicationManagerS.h>
+#include <orbsvcs/orbsvcs/FT_ReplicationManagerS.h>
//#include <orbsvcs/PortableGroup/PG_PropertyManager.h>
//#include <orbsvcs/PortableGroup/PG_GenericFactory.h>
//#include <orbsvcs/PortableGroup/PG_ObjectGroupManager.h>
// Note: the new, improved versions...
//#include <orbsvcs/PortableGroup/PG_Object_Group_Map.h>
-#include <orbsvcs/PortableGroup/PG_Properties_Support.h>
-#include <orbsvcs/PortableGroup/PG_Group_Factory.h>
+#include <orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h>
+#include <orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h>
-#include <orbsvcs/PortableGroup/PG_FactoryRegistry.h>
+#include <orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h>
#include <orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h>
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
index bf32bd3af12..3fd0ed9edf4 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/CosNotifyCommC.h"
-#include "orbsvcs/FT_NotifierC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/FT_NotifierC.h"
#include "orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h"
#include "orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h"
-#include "orbsvcs/PortableGroup/PG_Property_Utils.h"
-#include "orbsvcs/PortableGroup/PG_Operators.h"
-#include "orbsvcs/FaultTolerance/FT_IOGR_Property.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 <tao/debug.h>
#include <iostream>
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h
index f15238af5bf..1149c2e149f 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/FT_CORBAC.h"
+#include "orbsvcs/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 8eecb140f24..e5b9f27cd5a 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
@@ -13,8 +13,8 @@
#include "FT_FaultDetectorFactory_i.h"
#include "Fault_Detector_i.h"
#include "ace/Get_Opt.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/PortableGroup/PG_Property_Set.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h"
// Use this macro at the beginning of CORBA methods
// to aid in debugging.
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
index ec7dd75f590..c9d5b8e6398 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
@@ -32,8 +32,8 @@ namespace TAO
/////////////////////////////////
// Includes needed by this header
#include <ace/Vector_T.h>
-#include <orbsvcs/FT_FaultDetectorFactoryS.h>
-#include <orbsvcs/FT_ReplicationManagerC.h>
+#include <orbsvcs/orbsvcs/FT_FaultDetectorFactoryS.h>
+#include <orbsvcs/orbsvcs/FT_ReplicationManagerC.h>
#include <ace/Thread_Manager.h>
/////////////////////
diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h
index d5882ad1a15..9f5d76029cf 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/FT_NotifierC.h"
-#include "orbsvcs/FT_ReplicaC.h"
+#include "orbsvcs/orbsvcs/FT_NotifierC.h"
+#include "orbsvcs/orbsvcs/FT_ReplicaC.h"
#include "ace/Time_Value.h"
diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
index ab820df236c..5f3e11e20d8 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
@@ -34,9 +34,9 @@ namespace TAO
}
-#include <orbsvcs/FT_NotifierS.h>
-#include <orbsvcs/FT_ReplicationManagerC.h>
-#include <orbsvcs/Notify/Notify_EventChannelFactory_i.h>
+#include <orbsvcs/orbsvcs/FT_NotifierS.h>
+#include <orbsvcs/orbsvcs/FT_ReplicationManagerC.h>
+#include <orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h>
#include <ace/Vector_T.h>
/////////////////////
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
index fff9f9dd50d..4ce922eda83 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
@@ -6,7 +6,7 @@
#include "orbsvcs/orbsvcs/IFRService/Options.h"
#include "orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h"
#include "orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h"
-#include "orbsvcs/IOR_Multicast.h"
+#include "orbsvcs/orbsvcs/IOR_Multicast.h"
#include "tao/IORTable/IORTable.h"
#include "tao/ORB_Core.h"
#include "ace/Auto_Ptr.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.h
index 099d473b098..7f5b2e510ca 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/IOR_Multicast.h"
+#include "orbsvcs/orbsvcs/IOR_Multicast.h"
#include "tao/PortableServer/ImplRepoS.h"
#include "tao/IORTable/IORTable.h"
diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
index d170b8fdca1..6551226a03b 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
+++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
@@ -14,8 +14,8 @@
// ============================================================================
-#include "orbsvcs/CosLifeCycleC.h"
-#include "orbsvcs/LifeCycleServiceC.h"
+#include "orbsvcs/orbsvcs/CosLifeCycleC.h"
+#include "orbsvcs/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 f088231c4f2..9fd155d9179 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/CosTradingC.h"
+#include "orbsvcs/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 ebf8a024d32..5a42d04a3cb 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/Trader/Trader.h"
-#include "orbsvcs/Trader/Service_Type_Repository.h"
-#include "orbsvcs/CosLifeCycleC.h"
+#include "orbsvcs/orbsvcs/Trader/Trader.h"
+#include "orbsvcs/orbsvcs/Trader/Service_Type_Repository.h"
+#include "orbsvcs/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 a1e011451b8..b0a3411bbaa 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/LifeCycleServiceC.h"
+#include "orbsvcs/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 2997da242a5..562d97451de 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/LifeCycleServiceS.h"
+#include "orbsvcs/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 c98e8e5c298..b205b691388 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
+++ b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
@@ -1,6 +1,6 @@
#include "Signal_Handler.h"
-#include "orbsvcs/LoadBalancing/LB_LoadManager.h"
+#include "orbsvcs/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 d20dac005fe..7fc036732ac 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/LoadBalancing/LB_CPU_Monitor.h"
-#include "orbsvcs/LoadBalancing/LB_conf.h"
+#include "orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Monitor.h"
+#include "orbsvcs/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 aee41ca5e76..97d44eeb471 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/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
/**
diff --git a/TAO/orbsvcs/LoadBalancer/Push_Handler.h b/TAO/orbsvcs/LoadBalancer/Push_Handler.h
index 7913a399f72..1faa67aaf3b 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/CosLoadBalancingC.h"
+#include "orbsvcs/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 33e76280889..8bcbfcecf2d 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/Naming/Naming_Utils.h"
+#include "orbsvcs/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 e0de0ef0a8e..52af603fc0b 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/CosNotifyChannelAdminC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/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 376efed5b3b..a071c1b0fc1 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
@@ -5,12 +5,14 @@
#include "ace/Get_Opt.h"
#include "ace/Auto_Ptr.h"
#include "ace/Argv_Type_Converter.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "ace/OS_main.h"
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_strings.h"
-ACE_RCSID(Scheduling_Service, Scheduling_Service, "$Id$")
+ACE_RCSID (Scheduling_Service,
+ Scheduling_Service,
+ "$Id$")
// Default Constructor.
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h
index e76f5c63b15..2ed1d8f10f8 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/Sched/Reconfig_Scheduler.h"
+#include "orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h"
#if defined (TAO_USES_STRATEGY_SCHEDULER)
-#include "orbsvcs/Sched/Strategy_Scheduler.h"
+#include "orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h"
#endif /* defined (TAO_USES_STRATEGY_SCHEDULER) */
-#include "orbsvcs/Sched/Config_Scheduler.h"
+#include "orbsvcs/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 3bc63984540..6892d90987a 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/CosNamingC.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
-#include "orbsvcs/Time/TAO_Time_Service_Clerk.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/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 40cbc8237a1..6cc665c12ed 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/CosNamingC.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
-#include "orbsvcs/Time/TAO_Time_Service_Server.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/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 55f5073f798..29d4bd2fef4 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/IOR_Multicast.h"
-#include "orbsvcs/Trader/Trader.h"
-#include "orbsvcs/Trader/Service_Type_Repository.h"
-#include "orbsvcs/Trader/Trading_Loader.h"
+#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"
class Trading_Service;
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
index 60210ad8515..c3661adf5eb 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/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/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 628383b8ed2..520fc37d382 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/CosNamingC.h"
+#include "orbsvcs/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 72c9ebc763b..2161591ffef 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/CosNamingC.h"
+#include "orbsvcs/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 e07d4c843f1..d60f76a6c68 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/Naming/Naming_Utils.h"
+#include "orbsvcs/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 68f393240e7..aeb77be05a1 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/Event/EC_Default_Factory.h"
+#include "orbsvcs/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 72f1bd8224f..6a66feb0f76 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/CosNamingC.h"
+#include "orbsvcs/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 5381540bb2c..22284842ca5 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/RtecEventChannelAdminC.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/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 41da6bcd3b4..f2520c36c0b 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/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/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 a55db26014c..644d57fab98 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/RtecBaseC.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
-#include "orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/RtecBaseC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/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 03b96d3847f..14ffd0da9f9 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/RtecEventChannelAdminC.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/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 73311b2af45..dfd35b67112 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/Event_Utilities.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/CosEventCommS.h"
+#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 "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 ce07097b36f..b8ae2bc3c36 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/RtecEventChannelAdminS.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/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 52c99def13d..38fb66a0291 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/RtecEventChannelAdminC.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/RtecEventCommS.h"
+#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 "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 b1adfc0b0bc..ded678af2d4 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/RtecEventChannelAdminC.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/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 30c3435bdef..0e2a79802c4 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/RtecEventChannelAdminC.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/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 c1ced5cbc08..f62fd70e6af 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/CosEventCommC.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventCommC.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
+#include "orbsvcs/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 413244fc4f4..7bd54f164de 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/CosEventCommC.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventCommC.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
+#include "orbsvcs/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 ce523fed960..0c547769e90 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/CosEventCommC.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventCommC.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
+#include "orbsvcs/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 1687f0374a7..883c5d20dcf 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/Naming/Naming_Utils.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/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 29b213cd31f..bcc3bf9f145 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/CosEventCommC.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventCommC.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
+#include "orbsvcs/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 53f82d338e2..81d992eb24b 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
@@ -1,9 +1,11 @@
// $Id$
#include "Consumer.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
-ACE_RCSID(CosEC_Examples, Consumer, "$Id$")
+ACE_RCSID (CosEC_Examples,
+ Consumer,
+ "$Id$")
int
main (int argc, char* argv[])
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h
index 7156353e483..cf672b12d27 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/CosEventCommS.h"
+#include "orbsvcs/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 b8af55e6e0c..9dbb168736a 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
@@ -1,11 +1,13 @@
// $Id$
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
-ACE_RCSID(CosEC_Simple, Service, "$Id$")
+ACE_RCSID (CosEC_Simple,
+ Service,
+ "$Id$")
const char *ior_output_file = "ec.ior";
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
index d4edd70a152..85d26f07d32 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
@@ -1,10 +1,12 @@
// $Id$
#include "Supplier.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
#include "ace/OS_NS_unistd.h"
-ACE_RCSID(CosEC_Examples, Supplier, "$Id$")
+ACE_RCSID (CosEC_Examples,
+ Supplier,
+ "$Id$")
int
main (int argc, char* argv[])
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h
index 4fdc39bfa08..7771693bd2e 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/CosEventCommS.h"
+#include "orbsvcs/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 f4e00a5dbbb..aa6cea972e4 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
@@ -1,10 +1,12 @@
// $Id$
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/CosTypedEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminC.h"
#include "Country_i.h"
-ACE_RCSID(CosEC_Examples, Consumer, "$Id:")
+ACE_RCSID (CosEC_Examples,
+ Consumer,
+ "$Id$")
int
main (int argc, char* argv[])
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc b/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc
index 4f630718690..d933c1610e7 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc
@@ -3,7 +3,6 @@
project(*Consumer) : event, orbsvcsexe, portableserver {
requires += ec_typed_events
- idlflags += -I$(TAO_ROOT)/orbsvcs
source_files {
Consumer.cpp
Country_i.cpp
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl b/TAO/orbsvcs/examples/CosEC/TypedSimple/Country.idl
index 77c68564272..124de09b122 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/CosTypedEventComm.idl"
+#include "orbsvcs/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 c908d935e80..176a2ecbc31 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
@@ -1,7 +1,7 @@
// $Id$
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/CosTypedEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/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 b06ffc65f92..4e41cac3de1 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/DsLogAdminC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/DsLogAdminC.h"
+#include "orbsvcs/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 48617c8262d..357cced7a5d 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
@@ -1,12 +1,11 @@
#include "Event_Consumer.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
#include "ace/OS_main.h"
ACE_RCSID (Event,
Event_Consumer,
"$Id$")
-
#define NAMING_SERVICE_NAME "NameService"
#define EVENT_TLS_LOG_FACTORY_NAME "EventLogFactory"
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h
index 946299dc55d..0f8339d9e11 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/DsEventLogAdminC.h"
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/DsEventLogAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
+#include "orbsvcs/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 20d8ba4d47c..f518d96a672 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
@@ -1,12 +1,11 @@
#include "Event_Supplier.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
#include "ace/OS_main.h"
ACE_RCSID (Event,
Event_Supplier,
"$Id$")
-
#define NAMING_SERVICE_NAME "NameService"
#define EVENT_TLS_LOG_FACTORY_NAME "EventLogFactory"
#define LOG_EVENT_COUNT 9
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h
index c37b9a5c9df..4a66e3ab074 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/DsEventLogAdminC.h"
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/DsEventLogAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
+#include "orbsvcs/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 4da08b137c3..83a910e565a 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
@@ -1,13 +1,12 @@
#include "Notify_Consumer.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
#include "ace/OS_main.h"
ACE_RCSID (Notify,
Notify_Consumer,
"$Id$")
-
#define NAMING_SERVICE_NAME "NameService"
#define NOTIFY_TLS_LOG_FACTORY_NAME "NotifyLogFactory"
#define LOG_EVENT_COUNT 29
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h
index 3b9cb99b1e5..484963ddf43 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/DsNotifyLogAdminS.h"
-#include "orbsvcs/DsEventLogAdminC.h"
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/CosNotifyCommS.h"
-#include "orbsvcs/CosNamingC.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"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
index e5bb5b49a76..ebf87ba501c 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
@@ -1,13 +1,12 @@
#include "RTEvent_Consumer.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
#include "ace/OS_main.h"
ACE_RCSID (RTEvent,
RTEvent_Consumer,
"$Id$")
-
#define NAMING_SERVICE_NAME "NameService"
#define EVENT_TLS_LOG_FACTORY_NAME "RTEventLogFactory"
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.h
index 5c908495901..cbdeb7b1d80 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/RtecEventCommS.h"
-#include "orbsvcs/RTEventLogAdminC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RTEventLogAdminC.h"
+#include "orbsvcs/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 3b421034a08..ef78ceafc32 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/RtecEventChannelAdminC.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
#include "ace/OS_main.h"
#include "ace/OS_NS_unistd.h"
@@ -8,7 +8,6 @@ ACE_RCSID (RTEvent,
RTEvent_Supplier,
"$Id$")
-
#define NAMING_SERVICE_NAME "NameService"
#define EVENT_TLS_LOG_FACTORY_NAME "RTEventLogFactory"
#define LOG_EVENT_COUNT 29
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.h
index 170a98db896..1d05033b459 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/RtecEventCommS.h"
-#include "orbsvcs/RTEventLogAdminC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RTEventLogAdminC.h"
+#include "orbsvcs/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 e0960aed1a6..ec4101f7ca7 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/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "ace/SString.h"
#if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
index b9b05c2d39e..ff46bc4e5a1 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/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#if defined(_MSC_VER)
#if (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
index e99b3dd65bf..1f6d7a9e796 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
@@ -1,14 +1,16 @@
// $Id$
#include "Consumer.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/CosNamingC.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 "ace/Arg_Shifter.h"
#include "ace/OS_NS_string.h"
-ACE_RCSID(EC_Examples, Consumer, "$Id$")
+ACE_RCSID (EC_Examples,
+ Consumer,
+ "$Id$")
const RtecEventComm::EventSourceID MY_SOURCE_ID = ACE_ES_EVENT_SOURCE_ANY + 1;
const RtecEventComm::EventType MY_EVENT_TYPE = ACE_ES_EVENT_UNDEFINED + 1;
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.h
index c8268e1c3ea..e096cc9d86b 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/RtecEventCommS.h"
+#include "orbsvcs/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 139abf06a19..ad503080423 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
@@ -1,15 +1,17 @@
// $Id$
#include "EC.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 "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 "ace/Arg_Shifter.h"
-ACE_RCSID(EC_Examples, Supplier, "$Id$")
+ACE_RCSID (EC_Examples,
+ Supplier,
+ "$Id$")
static const char* ecname = 0;
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.h
index 2734de1dcd0..ee85894676e 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/RtecEventCommS.h"
+#include "orbsvcs/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 80e61c1e88b..17944dad818 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
@@ -1,15 +1,17 @@
// $Id$
#include "Gateway.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 "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 "ace/Arg_Shifter.h"
#include "ace/Dynamic_Service.h"
-ACE_RCSID(EC_Examples, Supplier, "$Id$")
+ACE_RCSID (EC_Examples,
+ Supplier,
+ "$Id$")
static const char* supplierec = 0;
static const char* consumerec = 0;
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.h
index 6c7d931d988..d54c2519354 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/RtecEventCommS.h"
+#include "orbsvcs/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 440093c6351..ce16ed2237e 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
@@ -1,15 +1,17 @@
// $Id$
#include "Supplier.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/CosNamingC.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 "ace/Arg_Shifter.h"
#include "ace/OS_NS_string.h"
#include "ace/OS_NS_unistd.h"
-ACE_RCSID(EC_Examples, Supplier, "$Id$")
+ACE_RCSID (EC_Examples,
+ Supplier,
+ "$Id$")
const RtecEventComm::EventSourceID MY_SOURCE_ID = ACE_ES_EVENT_SOURCE_ANY + 1;
const RtecEventComm::EventType MY_EVENT_TYPE = ACE_ES_EVENT_UNDEFINED + 1;
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.h
index 98e87ec39d2..65e67be9ed9 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/RtecEventCommS.h"
+#include "orbsvcs/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 8439914f22b..41e999a9416 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/RtecUDPAdminS.h"
+#include "orbsvcs/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 ff393428e06..8d41d2b200d 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp
@@ -1,10 +1,12 @@
// $Id$
#include "Consumer.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
-ACE_RCSID(EC_Examples, Consumer, "$Id$")
+ACE_RCSID (EC_Examples,
+ Consumer,
+ "$Id$")
Consumer::Consumer (void)
: event_count_ (0)
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.h
index 536404b824b..5a8a514e190 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/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
index 79f312618b3..41daa2916a6 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/Event_Service_Constants.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/Event/ECG_Mcast_EH.h"
-#include "orbsvcs/Event/ECG_UDP_Sender.h"
-#include "orbsvcs/Event/ECG_UDP_Receiver.h"
-#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h"
+#include "orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h"
+#include "orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h"
+#include "orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h"
#include "tao/ORB_Core.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
index 2572716d1e8..84a8d5a9f10 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp
@@ -1,10 +1,12 @@
// $Id$
#include "Supplier.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
-ACE_RCSID(EC_Examples, Supplier, "$Id$")
+ACE_RCSID (EC_Examples,
+ Supplier,
+ "$Id$")
Supplier::Supplier (void)
{
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.h
index 7c591f5fdb7..a44b55a18aa 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/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h b/TAO/orbsvcs/examples/RtEC/Schedule/Consumer.h
index bdbdbaad894..e89e7df6977 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/RtecEventCommS.h"
+#include "orbsvcs/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 3a6d4463fa3..71197184d8e 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/Scheduler_Factory.h"
+#include "orbsvcs/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 9567a44a984..90c1711b708 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
@@ -1,13 +1,13 @@
// $Id$
-#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 "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 "Consumer.h"
#include "Supplier.h"
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
index badc65b011d..f5998feb15d 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
@@ -2,7 +2,9 @@
#include "Supplier.h"
-ACE_RCSID(EC_Examples, Supplier, "$Id$")
+ACE_RCSID (EC_Examples,
+ Supplier,
+ "$Id$")
Supplier::Supplier (void)
{
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h
index b0391f7602b..c2a428371a6 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/RtecEventCommS.h"
+#include "orbsvcs/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 ca7c00abed3..18d42999eab 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
@@ -1,11 +1,13 @@
// $Id$
#include "Consumer.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
-ACE_RCSID(EC_Examples, Consumer, "$Id$")
+ACE_RCSID (EC_Examples,
+ Consumer,
+ "$Id$")
int
main (int argc, char* argv[])
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.h
index 19005b96ec1..ebbcb6fa5f9 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/RtecEventCommS.h"
+#include "orbsvcs/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 2d6f2eb5e97..9b4692a69ed 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
@@ -1,12 +1,14 @@
// $Id$
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
#include "ace/Get_Opt.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "ace/OS_NS_stdio.h"
-ACE_RCSID(EC_Examples, Service, "$Id$")
+ACE_RCSID (EC_Examples,
+ Service,
+ "$Id$")
const char *ior_output_file = "ec.ior";
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
index 3157a3b7ec4..a91a5f8ec05 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
@@ -1,12 +1,14 @@
// $Id$
#include "Supplier.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "ace/OS_NS_unistd.h"
-ACE_RCSID(EC_Examples, Supplier, "$Id$")
+ACE_RCSID (EC_Examples,
+ Supplier,
+ "$Id$")
int
main (int argc, char* argv[])
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
index b1fce544ccc..e358500267d 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/RtecEventCommS.h"
+#include "orbsvcs/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 84b7370f322..1c9f650662a 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -27,20 +27,20 @@
#include "ace/SOCK_Acceptor.h"
#include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/AV/AV_export.h"
-#include "orbsvcs/CosPropertyServiceS.h"
-#include "orbsvcs/AVStreamsS.h"
-#include "orbsvcs/Property/CosPropertyService_i.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/AV/AV_Core.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/Null_MediaCtrlS.h"
+#include "orbsvcs/orbsvcs/AV/AV_export.h"
+#include "orbsvcs/orbsvcs/CosPropertyServiceS.h"
+#include "orbsvcs/orbsvcs/AVStreamsS.h"
+#include "orbsvcs/orbsvcs/Property/CosPropertyService_i.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/AV/AV_Core.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/Null_MediaCtrlS.h"
#if defined (TAO_ORBSVCS_HAS_Trader)
-#include "orbsvcs/Trader/Trader.h"
+#include "orbsvcs/orbsvcs/Trader/Trader.h"
#endif /* TAO_ORBSVCS_HAS_Trader */
-#include "orbsvcs/AV/FlowSpec_Entry.h"
+#include "orbsvcs/orbsvcs/AV/FlowSpec_Entry.h"
#define FLOWSPEC_MAX 5
// for the Hash_Map helper classes.
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
index 08597e73734..f97ad1cb0aa 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
@@ -1,22 +1,22 @@
// $Id$
-#include "orbsvcs/AV/AV_Core.h"
-#include "orbsvcs/AV/FlowSpec_Entry.h"
-#include "orbsvcs/AV/Transport.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
-#include "orbsvcs/AV/UDP.h"
-#include "orbsvcs/AV/TCP.h"
-#include "orbsvcs/AV/RTP.h"
-#include "orbsvcs/AV/RTCP.h"
-#include "orbsvcs/AV/sfp.h"
-#include "orbsvcs/AV/default_resource.h"
+#include "orbsvcs/orbsvcs/AV/AV_Core.h"
+#include "orbsvcs/orbsvcs/AV/FlowSpec_Entry.h"
+#include "orbsvcs/orbsvcs/AV/Transport.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/AV/UDP.h"
+#include "orbsvcs/orbsvcs/AV/TCP.h"
+#include "orbsvcs/orbsvcs/AV/RTP.h"
+#include "orbsvcs/orbsvcs/AV/RTCP.h"
+#include "orbsvcs/orbsvcs/AV/sfp.h"
+#include "orbsvcs/orbsvcs/AV/default_resource.h"
#if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS)
-#include "orbsvcs/AV/QoS_UDP.h"
+#include "orbsvcs/orbsvcs/AV/QoS_UDP.h"
#endif /* ACE_HAS_RAPI || ACE_HAS_WINSOCK2_GQOS */
#if defined (ACE_HAS_SCTP)
-#include "orbsvcs/AV/SCTP_SEQ.h"
+#include "orbsvcs/orbsvcs/AV/SCTP_SEQ.h"
#endif // ACE_HAS_SCTP
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
index d6ac2037153..1cc2e78de16 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
@@ -15,8 +15,8 @@
#include /**/ "ace/pre.h"
#include "tao/PortableServer/PortableServer.h"
-#include "orbsvcs/AVStreamsC.h"
-#include "orbsvcs/AV/AV_export.h"
+#include "orbsvcs/orbsvcs/AVStreamsC.h"
+#include "orbsvcs/orbsvcs/AV/AV_export.h"
#include "ace/Singleton.h"
#include "ace/Unbounded_Set.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
index e171286341a..8abf7e851f4 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
@@ -16,7 +16,7 @@
#define TAO_AV_FLOWSPEC_ENTRY_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/AV/AV_export.h"
+#include "orbsvcs/orbsvcs/AV/AV_export.h"
#include "AV_Core.h"
#include "ace/Addr.h"
#include "ace/Containers.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.h b/TAO/orbsvcs/orbsvcs/AV/Policy.h
index 24fd3082914..b26ef80acfb 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Policy.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Policy.h
@@ -18,7 +18,7 @@
#include "ace/Addr.h"
#include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/AV/AV_export.h"
+#include "orbsvcs/orbsvcs/AV/AV_export.h"
struct TAO_AV_frame_info
{
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
index b4420b21ee5..cdc48d2316a 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
@@ -6,12 +6,12 @@
#if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS)
#include "UDP.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/MCast.h"
-#include "orbsvcs/AV/Fill_ACE_QoS.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/MCast.h"
+#include "orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h"
#if !defined (__ACE_INLINE__)
-#include "orbsvcs/AV/QoS_UDP.i"
+#include "orbsvcs/orbsvcs/AV/QoS_UDP.i"
#endif /* __ACE_INLINE__ */
//------------------------------------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h
index ebc49bc6147..702fc27aa90 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h
@@ -29,7 +29,7 @@
#include "ace/QoS/QoS_Decorator.h"
#include "ace/QoS/SOCK_Dgram_Mcast_QoS.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
class TAO_AV_Export TAO_AV_UDP_QoS_Factory : public TAO_AV_Transport_Factory
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.h b/TAO/orbsvcs/orbsvcs/AV/RTCP.h
index 38555b63efd..4465ae7cf25 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.h
@@ -51,11 +51,11 @@
// FUZZ: disable check_for_math_include
#include "ace/OS.h"
#include "ace/Hash_Map_Manager.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/UDP.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/UDP.h"
#include <math.h>
#include <stdlib.h>
-#include "orbsvcs/AV/RTP.h"
+#include "orbsvcs/orbsvcs/AV/RTP.h"
#include "RTCP_Channel.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.h b/TAO/orbsvcs/orbsvcs/AV/RTP.h
index 1af28588edd..a6ef7fef8ed 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTP.h
@@ -50,8 +50,8 @@
#define TAO_AV_RTP_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/AV/AV_export.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/AV/AV_export.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
#define RTP_PT_BVC 22 /* Berkeley video codec */
diff --git a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h
index aa50d43203d..d38e975de83 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h
@@ -12,7 +12,7 @@
#define TAO_AV_DEFAULT_RESOURCE_FCATORY_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.h b/TAO/orbsvcs/orbsvcs/AV/Transport.h
index 8de06427317..8ca19263633 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.h
@@ -22,7 +22,7 @@
#include "ace/Connector.h"
#include "ace/Addr.h"
#include "ace/SOCK_Dgram.h"
-#include "orbsvcs/AV/AV_export.h"
+#include "orbsvcs/orbsvcs/AV/AV_export.h"
#include "FlowSpec_Entry.h"
#include "AV_Core.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp
index e29c8e154ce..4c8b45256dc 100644
--- a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp
@@ -1,6 +1,6 @@
// $Id$
-#include "orbsvcs/AV/default_resource.h"
+#include "orbsvcs/orbsvcs/AV/default_resource.h"
#include "tao/ORB_Core.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.h b/TAO/orbsvcs/orbsvcs/AV/default_resource.h
index 01420bb907f..2867e024e28 100644
--- a/TAO/orbsvcs/orbsvcs/AV/default_resource.h
+++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.h
@@ -13,8 +13,8 @@
#define TAO_AV_DEFAULT_RESOURCE_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Resource_Factory.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Resource_Factory.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.h b/TAO/orbsvcs/orbsvcs/AV/sfp.h
index a038547eefc..efcb350a92b 100644
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.h
+++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h
@@ -16,8 +16,8 @@
#define TAO_AV_SFP_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/AV/AV_export.h"
-#include "orbsvcs/sfpC.h"
+#include "orbsvcs/orbsvcs/AV/AV_export.h"
+#include "orbsvcs/orbsvcs/sfpC.h"
#include "ace/SOCK_Dgram.h"
#include "ace/INET_Addr.h"
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients.h b/TAO/orbsvcs/orbsvcs/Channel_Clients.h
index 51ee8c8e9ac..16b0c45c420 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients.h
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients.h
@@ -18,7 +18,7 @@
#define ACE_CHANNEL_CLIENTS_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/Channel_Clients_T.h"
+#include "orbsvcs/orbsvcs/Channel_Clients_T.h"
#include /**/ "ace/post.h"
#endif /* ACE_CHANNEL_CLIENTS_H */
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
index 0d2a88a1430..695611bf0c5 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
@@ -3,12 +3,14 @@
#ifndef ACE_CHANNEL_CLIENTS_T_C
#define ACE_CHANNEL_CLIENTS_T_C
-#include "orbsvcs/Channel_Clients_T.h"
+#include "orbsvcs/orbsvcs/Channel_Clients_T.h"
-ACE_RCSID(orbsvcs, Channel_Clients_T, "$Id$")
+ACE_RCSID (orbsvcs,
+ Channel_Clients_T,
+ "$Id$")
#if !defined (__ACE_INLINE__)
-#include "orbsvcs/Channel_Clients_T.i"
+#include "orbsvcs/orbsvcs/Channel_Clients_T.i"
#endif /* __ACE_INLINE__ */
template<class TARGET> void
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
index f81af14d074..472a73753f9 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
@@ -25,7 +25,7 @@
#define ACE_CHANNEL_CLIENTS_T_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
// @@ TODO: Add throw specs to this classes.
@@ -83,11 +83,11 @@ private:
};
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Channel_Clients_T.i"
+#include "orbsvcs/orbsvcs/Channel_Clients_T.i"
#endif /* __ACE_INLINE__ */
#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/Channel_Clients_T.cpp"
+#include "orbsvcs/orbsvcs/Channel_Clients_T.cpp"
#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
index 668ee73708b..f84ffd871dd 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
@@ -25,7 +25,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosConcurrencyControlC.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h"
#include "concurrency_export.h"
/// This constant defines the number of lock modes. There is really no
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
index 75bb4e1a88f..12da31cc6df 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
@@ -44,7 +44,7 @@
#include "ace/Token.h"
#include "ace/Unbounded_Queue.h"
-#include "orbsvcs/CosConcurrencyControlS.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlS.h"
#include "concurrency_export.h"
#if defined (lock_held)
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
index b49944528d8..8e052406c9f 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
@@ -20,7 +20,7 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/CosConcurrencyControlS.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlS.h"
#include "concurrency_export.h"
/**
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
index 30f680393cb..bdeee1f5775 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
@@ -23,7 +23,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/Concurrency/Concurrency_Utils.h"
+#include "orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h"
class TAO_Concurrency_Export TAO_Concurrency_Loader : public TAO_Object_Loader
{
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
index 5aaa4d8d70b..88f46386065 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
@@ -11,7 +11,7 @@
#include "ace/streams.h"
-#include "orbsvcs/CosConcurrencyControlC.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h"
#include "tao/debug.h"
#include "Concurrency_Utils.h"
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h
index ac92e019ecb..b343cd6f61c 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h
@@ -22,7 +22,7 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/CosConcurrencyControlC.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h"
#include "CC_LockSetFactory.h"
#include "concurrency_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
index a9299738907..d67ae0bb3ce 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
@@ -12,8 +12,6 @@ project (CosEvent) : ec_typed_events, orbsvcslib, messaging, core, naming {
dynamicflags = TAO_EVENT_BUILD_DLL TAO_NOTIFY_BUILD_DLL
tagchecks += CosEvent
- // Add this include path for precompiled headers
- includes += $(TAO_ROOT)/orbsvcs/orbsvcs
IDL_Files {
CosEventComm.idl
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
index faa5d2b9ac0..c1044726527 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
@@ -6,7 +6,7 @@
#include "CEC_ProxyPushConsumer.h"
#include "CEC_EventChannel.h"
-#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h"
#if ! defined (__ACE_INLINE__)
#include "CEC_ConsumerAdmin.i"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
index 0df20092960..a56cbbed72f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
@@ -15,13 +15,13 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/ESF/ESF_Proxy_Admin.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h"
#include "CEC_ProxyPushSupplier.h"
#include "CEC_ProxyPullSupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
index 3757c04a6f6..07293872b3f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
@@ -22,7 +22,7 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosEvent/event_export.h"
+#include "orbsvcs/orbsvcs/CosEvent/event_export.h"
class TAO_CEC_EventChannel;
class TAO_CEC_ProxyPushSupplier;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
index 87fff75616e..58f079b3cd9 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
@@ -13,12 +13,12 @@
#include "CEC_Reactive_ConsumerControl.h"
#include "CEC_Reactive_SupplierControl.h"
-#include "orbsvcs/ESF/ESF_Immediate_Changes.h"
-#include "orbsvcs/ESF/ESF_Delayed_Changes.h"
-#include "orbsvcs/ESF/ESF_Copy_On_Write.h"
-#include "orbsvcs/ESF/ESF_Copy_On_Read.h"
-#include "orbsvcs/ESF/ESF_Proxy_List.h"
-#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h"
#include "ace/Arg_Shifter.h"
#include "ace/Sched_Params.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
index 1efbdfb9695..b121b22e54d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
@@ -16,7 +16,7 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/CosEventCommC.h"
+#include "orbsvcs/orbsvcs/CosEventCommC.h"
#include "event_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
index 138e22d052f..ac24df18469 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
@@ -28,7 +28,7 @@
#include "tao/Basic_Types.h"
#include "tao/Objref_VarOut_T.h"
-#include "orbsvcs/CosEvent/event_export.h"
+#include "orbsvcs/orbsvcs/CosEvent/event_export.h"
#include "CEC_ProxyPushSupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
index 17f890e1bf1..72f48f342d8 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
@@ -26,7 +26,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
#include "CEC_Defaults.h"
#include "event_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
index 1e6e01dc679..a7f8408d45f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
@@ -18,9 +18,9 @@
#include "CEC_Event_Loader.h"
#include "ace/Dynamic_Service.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h"
#include "ace/Get_Opt.h"
#include "ace/Argv_Type_Converter.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
index 9c5e6aae45a..4d4ca86a992 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
@@ -23,7 +23,7 @@
#include "CEC_TypedEventChannel.h"
#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "ace/Service_Config.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
index 30e6d89e8f1..415ae07b47e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
@@ -15,13 +15,13 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
#include "event_export.h"
class TAO_CEC_EventChannel;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
index e2e399a2aa4..85922eb8922 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
@@ -16,7 +16,7 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
index fbe592a3bc4..aee97b6f167 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
@@ -15,14 +15,14 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
#include "event_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
class TAO_CEC_EventChannel;
class TAO_CEC_Dispatching;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
index eefaaa6a478..be5387963ad 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
@@ -4,8 +4,8 @@
#include "CEC_Dispatching.h"
#include "CEC_EventChannel.h"
#include "CEC_ConsumerControl.h"
-#include "orbsvcs/ESF/ESF_RefCount_Guard.h"
-#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h"
#include "tao/debug.h"
#if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
#include "CEC_TypedEvent.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
index 48357020537..d87dd7977dd 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
@@ -16,10 +16,10 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
#if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
-#include "orbsvcs/CosTypedEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminS.h"
#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
#include "event_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
index 9668fb7418a..f1811d51f40 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
@@ -23,7 +23,7 @@
#include "tao/Objref_VarOut_T.h"
-#include "orbsvcs/CosEvent/event_export.h"
+#include "orbsvcs/orbsvcs/CosEvent/event_export.h"
/**
* @class TAO_CEC_Pulling_Strategy
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
index 8570cfd141e..164e7588496 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
@@ -21,7 +21,7 @@
#include "CEC_ConsumerControl.h"
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
#include "tao/ORB.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
index 5698aa484ef..cf38a4aa8b9 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
@@ -21,7 +21,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
#include "tao/ORB.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
index 89c1c38b0ab..1aefc64bb71 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
@@ -25,7 +25,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
#include "tao/ORB.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
index 1c40b303546..1335ad5b02e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
@@ -4,13 +4,15 @@
#include "CEC_ProxyPushConsumer.h"
#include "CEC_ProxyPullConsumer.h"
#include "CEC_EventChannel.h"
-#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h"
#if ! defined (__ACE_INLINE__)
#include "CEC_SupplierAdmin.i"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(CosEvent, CEC_SupplierAdmin, "$Id$")
+ACE_RCSID (CosEvent,
+ CEC_SupplierAdmin,
+ "$Id$")
TAO_CEC_SupplierAdmin::TAO_CEC_SupplierAdmin (TAO_CEC_EventChannel *ec)
: event_channel_ (ec),
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
index e78cd342550..2fdab582804 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
@@ -19,13 +19,13 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/ESF/ESF_Proxy_Admin.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h"
#include "CEC_ProxyPushConsumer.h"
#include "CEC_ProxyPullConsumer.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
index aeea63ca208..b65cfc52350 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
@@ -28,7 +28,7 @@
#include "tao/Objref_VarOut_T.h"
-#include "orbsvcs/CosEvent/event_export.h"
+#include "orbsvcs/orbsvcs/CosEvent/event_export.h"
class TAO_CEC_EventChannel;
class TAO_CEC_ProxyPushConsumer;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
index aaa087d19a9..9dce04452c9 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
@@ -16,13 +16,13 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/CosTypedEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
#pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/ESF/ESF_Proxy_Admin.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h"
#include "CEC_ProxyPushSupplier.h"
#include "CEC_TypedEvent.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
index 64bcbbb9c6b..6db51475183 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
@@ -25,7 +25,7 @@
#include "CEC_Defaults.h"
#include "event_export.h"
-#include "orbsvcs/CosTypedEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminS.h"
#include "tao/IFR_Client/IFR_BasicC.h"
#include "tao/NVList.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
index 4ee4b165b65..3ae216f6a4b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
@@ -16,13 +16,13 @@
#define TAO_CEC_TYPEDPROXYPUSHCONSUMER_H_
#include /**/ "ace/pre.h"
-#include "orbsvcs/CosTypedEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
#pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
class TAO_CEC_TypedEvent;
class TAO_CEC_TypedEventChannel;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
index 9d55ac7dd1c..7f0d3002bc8 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
@@ -19,13 +19,13 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/CosTypedEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosTypedEventChannelAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
#pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/ESF/ESF_Proxy_Admin.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h"
#include "CEC_TypedProxyPushConsumer.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
index 16acbe0c6c9..6a3c0524ec4 100644
--- a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
@@ -6,8 +6,6 @@ project : orbsvcslib, core, naming, iormanip, portablegroup, messaging, ami {
idlflags += -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=LoadBalancing/LoadBalancing_export.h
dynamicflags = TAO_LOADBALANCING_BUILD_DLL
tagchecks += CosLoadBalancing
- // Add this include path for precompiled headers
- includes += $(TAO_ROOT)/orbsvcs/orbsvcs
avoids += minimum_corba
IDL_Files {
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.mpc b/TAO/orbsvcs/orbsvcs/CosNaming.mpc
index 20b2e2d86a0..86c088dc574 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming.mpc
@@ -6,8 +6,6 @@ project(CosNaming) : orbsvcslib, core, messaging, svc_utils, iortable {
idlflags += -Wb,export_macro=TAO_Naming_Export -Wb,export_include=Naming/naming_export.h
dynamicflags = TAO_NAMING_BUILD_DLL
tagchecks += Naming
- // Add this include path for precompiled headers
- includes += $(TAO_ROOT)/orbsvcs/orbsvcs
libs += TAO_Messaging
after += Messaging
diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
index 93587db64c6..58a6bc0b99c 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
@@ -13,8 +13,6 @@ project(CosNotification) : orbsvcslib, core, svc_utils, etcl, dynamicany, portab
dynamicflags = TAO_NOTIFY_BUILD_DLL TAO_EVENT_BUILD_DLL
tagchecks += Notify
- // Add this include path for precompiled headers
- includes += $(TAO_ROOT)/orbsvcs/orbsvcs
IDL_Files {
CosEventComm.idl
diff --git a/TAO/orbsvcs/orbsvcs/CosTime.mpc b/TAO/orbsvcs/orbsvcs/CosTime.mpc
index c5b7cecee87..5ff59656a4f 100644
--- a/TAO/orbsvcs/orbsvcs/CosTime.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTime.mpc
@@ -6,8 +6,6 @@ project(CosTime) : orbsvcslib, core, naming {
idlflags += -Wb,export_macro=TAO_Time_Export -Wb,export_include=Time/time_export.h
dynamicflags = TAO_TIME_BUILD_DLL
tagchecks += Time
- // Add this include path for precompiled headers
- includes += $(TAO_ROOT)/orbsvcs/orbsvcs
IDL_Files {
TimeService.idl
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
index 0e781c19364..6c49661a2b5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
@@ -1,8 +1,8 @@
// $Id$
#include "ace/Sched_Params.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
#include "Memory_Pools.h"
#include "Dispatching_Modules.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
index 03869de539b..459feed2c99 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h
@@ -23,9 +23,9 @@
#include "ace/Reactor_Notification_Strategy.h"
#include "tao/Timeprobe.h"
-#include "orbsvcs/Event/ReactorTask.h"
-#include "orbsvcs/Event/Event_Manip.h"
-#include "orbsvcs/Event/Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/ReactorTask.h"
+#include "orbsvcs/orbsvcs/Event/Event_Manip.h"
+#include "orbsvcs/orbsvcs/Event/Event_Channel.h"
// ************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
index 6a3a4298e83..cc1ae3e6bd7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
@@ -17,7 +17,7 @@
#include /**/ "ace/pre.h"
#include /**/ "event_export.h"
-#include "orbsvcs/RtecUDPAdminC.h"
+#include "orbsvcs/orbsvcs/RtecUDPAdminC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h
index 533e6ba7391..eb356e86e3c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.h
@@ -13,7 +13,7 @@
#include /**/ "ace/pre.h"
#include /**/ "event_export.h"
-#include "orbsvcs/RtecUDPAdminS.h"
+#include "orbsvcs/orbsvcs/RtecUDPAdminS.h"
#include "EC_Lifetime_Utils.h"
#include "ace/Auto_Ptr.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
index f8441511cf4..ee28910bbf3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
@@ -16,7 +16,7 @@
#include /**/ "event_export.h"
-#include "orbsvcs/RtecUDPAdminS.h"
+#include "orbsvcs/orbsvcs/RtecUDPAdminS.h"
#include "ace/Hash_Map_Manager_T.h"
#include "ace/INET_Addr.h"
#include "ace/Null_Mutex.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
index 66c1779773b..46a9a658c0c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
@@ -1,9 +1,9 @@
// $Id$
-#include "orbsvcs/Event/ECG_Mcast_EH.h"
-#include "orbsvcs/Event/ECG_UDP_Receiver.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Event/EC_Lifetime_Utils_T.h"
+#include "orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h"
+#include "orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h"
#include "ace/Unbounded_Set.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
index 25f55f68033..f62de40073a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
@@ -26,7 +26,7 @@
#include "ace/Array_Base.h"
#include "ace/SOCK_Dgram_Mcast.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
#include /**/ "event_export.h"
#include "ECG_Adapters.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
index 502b3a555d9..b71c9fbe8bf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
@@ -12,7 +12,7 @@
#define TAO_ECG_SIMPLE_ADDRESS_SERVER_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/RtecUDPAdminS.h"
+#include "orbsvcs/orbsvcs/RtecUDPAdminS.h"
#include "EC_Lifetime_Utils_T.h"
#include "ace/INET_Addr.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
index d48156a0dab..205d7301521 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
@@ -1,14 +1,16 @@
// $Id$
-#include "orbsvcs/Event/ECG_UDP_Receiver.h"
-#include "orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
#include "ace/SString.h"
#if !defined(__ACE_INLINE__)
#include "ECG_UDP_Receiver.i"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, ECG_UDP_Receiver, "$Id$")
+ACE_RCSID (Event,
+ ECG_UDP_Receiver,
+ "$Id$")
// ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
index 3e055f083e6..bc50426ae70 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
@@ -37,13 +37,13 @@
#define TAO_ECG_UDP_RECEIVER_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/RtecUDPAdminS.h"
+#include "orbsvcs/orbsvcs/RtecUDPAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
#include /**/ "event_export.h"
#include "ECG_Adapters.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
index 166a8ee00fc..cdbf6908e32 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
@@ -9,14 +9,16 @@
*
*/
-#include "orbsvcs/Event/ECG_UDP_Sender.h"
-#include "orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
#if !defined(__ACE_INLINE__)
#include "ECG_UDP_Sender.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, ECG_UDP_Sender, "$Id$")
+ACE_RCSID (Event,
+ ECG_UDP_Sender,
+ "$Id$")
// ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
index 00b1a6181b2..ee872d01530 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
@@ -38,14 +38,14 @@
#define TAO_ECG_UDP_SENDER_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/RtecUDPAdminS.h"
+#include "orbsvcs/orbsvcs/RtecUDPAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include /**/ "event_export.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
#include "EC_Lifetime_Utils.h"
#include "EC_Lifetime_Utils_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
index 7eb7b9fac4f..6bfc17ea60f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
@@ -15,8 +15,8 @@
#include "EC_Reactive_SupplierControl.h"
#include "EC_Event_Channel_Base.h" // @@ MSVC 6 bug
-#include "orbsvcs/ESF/ESF_Proxy_List.h"
-#include "orbsvcs/ESF/ESF_Delayed_Changes.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
index b1b7b1ca222..193b672ec46 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
@@ -1,6 +1,6 @@
// $Id$
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
#include "EC_Basic_Filter_Builder.h"
#include "EC_Type_Filter.h"
#include "EC_Conjunction_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
index d026218286d..1b846220c81 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
@@ -4,15 +4,17 @@
#include "EC_ProxySupplier.h"
#include "EC_ProxyConsumer.h"
#include "EC_Event_Channel_Base.h"
-#include "orbsvcs/ESF/ESF_Peer_Workers.h"
-#include "orbsvcs/ESF/ESF_Peer_Admin.h"
-#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h"
#if ! defined (__ACE_INLINE__)
#include "EC_ConsumerAdmin.i"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_ConsumerAdmin, "$Id$")
+ACE_RCSID (Event,
+ EC_ConsumerAdmin,
+ "$Id$")
TAO_EC_ConsumerAdmin::TAO_EC_ConsumerAdmin (TAO_EC_Event_Channel_Base *ec)
: TAO_ESF_Peer_Admin<TAO_EC_Event_Channel_Base,TAO_EC_ProxyPushSupplier,RtecEventChannelAdmin::ProxyPushSupplier,TAO_EC_ProxyPushConsumer> (ec)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
index 60b5edadb24..909dad88229 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
@@ -23,7 +23,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/ESF/ESF_Peer_Admin.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h"
#include /**/ "event_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
index 61adaf515d7..9d33bbecd68 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
@@ -19,13 +19,13 @@
#include "EC_Reactive_ConsumerControl.h"
#include "EC_Reactive_SupplierControl.h"
-#include "orbsvcs/ESF/ESF_Proxy_List.h"
-#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.h"
-#include "orbsvcs/ESF/ESF_Immediate_Changes.h"
-#include "orbsvcs/ESF/ESF_Copy_On_Read.h"
-#include "orbsvcs/ESF/ESF_Copy_On_Write.h"
-#include "orbsvcs/ESF/ESF_Delayed_Changes.h"
-#include "orbsvcs/ESF/ESF_Delayed_Command.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
index 853b7e04a93..a14c68925e1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
@@ -15,7 +15,7 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
index dfbe23bfd05..d028e06a00d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
@@ -14,7 +14,7 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
index 54ea96405e4..bae7d4eb094 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
@@ -17,7 +17,7 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/RtecEventCommC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommC.h"
#include /**/ "event_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
index 113c5a7b1ad..067e33340cf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
@@ -24,7 +24,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/RtecEventCommC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommC.h"
#include /**/ "event_export.h"
#include "ace/Task.h"
#include "ace/Message_Block.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
index 44d548e8693..dd0799e5752 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
@@ -27,7 +27,7 @@
#include "EC_Defaults.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
template<class> class TAO_ESF_Worker;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
index ac2f8c4988c..123a78382a0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
@@ -17,7 +17,7 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/RtecEventCommC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommC.h"
#include /**/ "event_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
index 33c8c9cfb7a..be40d293ce0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
@@ -17,7 +17,7 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
#include /**/ "event_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
index 0a7b44ea438..a97cd55b4ce 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
@@ -1,8 +1,10 @@
// $Id$
-#include "orbsvcs/Event/EC_Gateway.h"
+#include "orbsvcs/orbsvcs/Event/EC_Gateway.h"
-ACE_RCSID(Event, EC_Gateway, "$Id$")
+ACE_RCSID (Event,
+ EC_Gateway,
+ "$Id$")
TAO_EC_Gateway::TAO_EC_Gateway (void)
: handle_ (0)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
index ff55b4ca46f..a8863961edb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
@@ -19,8 +19,8 @@
#include /**/ "event_export.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
-#include "orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
/**
* @class TAO_EC_Gateway
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
index 91e25f95e96..6202e72db2c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.cpp
@@ -1,9 +1,9 @@
// $Id$
-#include "orbsvcs/Event/EC_Gateway_IIOP.h"
-#include "orbsvcs/Event/ECG_Defaults.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h"
+#include "orbsvcs/orbsvcs/Event/ECG_Defaults.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
#include "EC_Gateway_IIOP_Factory.h"
#include "ECG_ConsumerEC_Control.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
index 06f2d805dfa..058fc1b4696 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h
@@ -22,9 +22,9 @@
#include /**/ "event_export.h"
#include "EC_Gateway.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/Channel_Clients.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/Channel_Clients.h"
#include "ace/Map_Manager.h"
#include "ace/Null_Mutex.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
index eb368de2dbb..8e4347a7bc7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
@@ -1,9 +1,9 @@
// $Id$
-#include "orbsvcs/Event/EC_Gateway_IIOP_Factory.h"
-#include "orbsvcs/Event/ECG_Defaults.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h"
+#include "orbsvcs/orbsvcs/Event/ECG_Defaults.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
#include "ace/Dynamic_Service.h"
#include "ace/Arg_Shifter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
index 0817bfcfa33..80835d4dde4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
@@ -1,9 +1,11 @@
// $Id$
#include "EC_Gateway_Sched.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
-ACE_RCSID(Event, EC_Gateway_sched, "$Id$")
+ACE_RCSID (Event,
+ EC_Gateway_sched,
+ "$Id$")
TAO_EC_Gateway_Sched::TAO_EC_Gateway_Sched (void)
: TAO_EC_Gateway_IIOP ()
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
index 3ab5e935271..c207596ae00 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h
@@ -19,7 +19,7 @@
#include /**/ "ace/pre.h"
#include "EC_Gateway_IIOP.h"
-#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
#include "sched_event_export.h"
// ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
index 7894eba09c9..b1a36867648 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
@@ -5,8 +5,8 @@
#include "EC_ProxySupplier.h"
#include "EC_QOS_Info.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
#include "tao/ORB_Constants.h"
#include "ace/Sched_Params.h"
@@ -18,7 +18,9 @@
#include "EC_Kokyu_Dispatching.i"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Kokyu_Dispatching, "$Id$")
+ACE_RCSID (Event,
+ EC_Kokyu_Dispatching,
+ "$Id$")
TAO_EC_Kokyu_Dispatching::TAO_EC_Kokyu_Dispatching (TAO_EC_Event_Channel_Base *ec, int sched_policy, int sched_scope)
:allocator_ (0),
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
index ec54bc03226..abd145b2b3f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
@@ -25,7 +25,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
#include "rtkokyu_event_export.h"
#include "ace/Thread_Manager.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
index 62d433eb367..0dc7d4e18a0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
@@ -5,7 +5,7 @@
#include "EC_Kokyu_Scheduling.h"
#include "EC_Kokyu_Filter_Builder.h"
#include "EC_Event_Channel_Base.h"
-#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
#include "ace/Arg_Shifter.h"
#include "ace/Sched_Params.h"
@@ -15,7 +15,9 @@
#include "EC_Kokyu_Factory.i"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Kokyu_Factory, "$Id$")
+ACE_RCSID (Event,
+ EC_Kokyu_Factory,
+ "$Id$")
TAO_EC_Kokyu_Factory::~TAO_EC_Kokyu_Factory (void)
{
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
index 55d64cdb2c9..5c1cd2b04d7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter.h
@@ -22,7 +22,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
#include "rtkokyu_event_export.h"
#include "ace/SString.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
index c0490f4cf17..fd9ebe4715b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
@@ -1,7 +1,7 @@
// $Id$
#include "EC_Kokyu_Filter.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
#include "EC_Kokyu_Filter_Builder.h"
#include "EC_Type_Filter.h"
#include "EC_Conjunction_Filter.h"
@@ -14,7 +14,9 @@
#include "EC_Kokyu_Filter_Builder.i"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Kokyu_Filter_Builder, "$Id$")
+ACE_RCSID (Event,
+ EC_Kokyu_Filter_Builder,
+ "$Id$")
const char* designator (long dsgn)
{
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
index 5eb6ef5dc35..f07a37c374c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
@@ -23,7 +23,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
#include "rtkokyu_event_export.h"
/**
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
index e9df4b4298e..841bd6656c7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
@@ -14,8 +14,8 @@
#include "EC_ConsumerControl.h"
#include "EC_SupplierControl.h"
#include "EC_Event_Channel_Base.h" // @@ MSVC 6 bug
-#include "orbsvcs/ESF/ESF_Proxy_List.h"
-#include "orbsvcs/ESF/ESF_Immediate_Changes.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
index 3149420a6f1..6b0af4e85dd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
@@ -6,7 +6,7 @@
#include "EC_ProxyConsumer.h"
#include "EC_ConsumerAdmin.h"
#include "EC_SupplierAdmin.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
#include "ace/Auto_Ptr.h"
#if ! defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
index 5bca0bf2172..6d33cfea8c6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
@@ -20,7 +20,7 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
@@ -30,7 +30,7 @@
#include "ace/RB_Tree.h"
#include "ace/Map_Manager.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
#include /**/ "event_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
index 1eb2794a909..e0add81915f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
@@ -7,9 +7,9 @@
#include "EC_Scheduling_Strategy.h"
#include "EC_QOS_Info.h"
-#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
#if ! defined (__ACE_INLINE__)
#include "EC_Per_Supplier_Filter.i"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
index ed97744f809..8a3879662f4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
@@ -1,6 +1,6 @@
// $Id$
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
#include "EC_Prefix_Filter_Builder.h"
#include "EC_Type_Filter.h"
#include "EC_Conjunction_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
index 53f7634ce00..ade0f194676 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
@@ -5,8 +5,8 @@
#include "EC_Event_Channel_Base.h"
#include "EC_QOS_Info.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
#include "ace/Sched_Params.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
index 717fad35865..b8156a664e1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
@@ -22,7 +22,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
#include "sched_event_export.h"
#include "ace/Thread_Manager.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
index a8a1fee8960..45bed1bbf9c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
@@ -22,7 +22,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
#include "sched_event_export.h"
/**
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
index 75718ee9895..82a0162f440 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
@@ -19,7 +19,7 @@
#include /**/ "event_export.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
index ea22992bf90..00d0b81e4a6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
@@ -8,8 +8,8 @@
#include "EC_Scheduling_Strategy.h"
#include "EC_ConsumerControl.h"
#include "EC_SupplierAdmin.h"
-#include "orbsvcs/ESF/ESF_RefCount_Guard.h"
-#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h"
#include "ace/Reverse_Lock_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
index 552383c96d9..590d5c61190 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
@@ -17,7 +17,7 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
#include "EC_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
index 0fbc4fe9290..25a37802392 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
@@ -17,7 +17,7 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/RtecBaseC.h"
+#include "orbsvcs/orbsvcs/RtecBaseC.h"
#include /**/ "event_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
index a470864444f..06929bcf071 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
@@ -23,7 +23,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
#include "tao/ORB.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
index c08e3d05705..f1885974944 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
@@ -19,7 +19,7 @@
#include "EC_SupplierControl.h"
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
index 0199dec1957..92a0da41ec3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
@@ -5,7 +5,7 @@
#include "EC_Priority_Scheduling.h"
#include "EC_Sched_Filter_Builder.h"
#include "EC_Event_Channel_Base.h"
-#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
#include "ace/Arg_Shifter.h"
#include "ace/Sched_Params.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
index c1093401be5..f556b0f1d8b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
@@ -22,7 +22,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
#include "sched_event_export.h"
#include "ace/SString.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
index 6b2815e4897..5e153f1bcb1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
@@ -1,7 +1,7 @@
// $Id$
#include "EC_Sched_Filter.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
#include "EC_Sched_Filter_Builder.h"
#include "EC_Type_Filter.h"
#include "EC_Conjunction_Filter.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
index 29c94f4f892..b89992dcba1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
@@ -19,8 +19,8 @@
#include /**/ "event_export.h"
-#include "orbsvcs/RtecBaseC.h"
-#include "orbsvcs/RtecEventCommC.h"
+#include "orbsvcs/orbsvcs/RtecBaseC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
index 39d04fec297..585fd0076e3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
@@ -4,9 +4,9 @@
#include "EC_ProxyConsumer.h"
#include "EC_ProxySupplier.h"
#include "EC_Event_Channel_Base.h"
-#include "orbsvcs/ESF/ESF_Peer_Workers.h"
-#include "orbsvcs/ESF/ESF_Peer_Admin.h"
-#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h"
#if ! defined (__ACE_INLINE__)
#include "EC_SupplierAdmin.i"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
index 91572785bc2..47956d2f32c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
@@ -23,7 +23,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/ESF/ESF_Peer_Admin.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h"
#include /**/ "event_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
index b4318075078..0d80ad03c9e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
@@ -17,8 +17,8 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/RtecEventCommC.h"
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/RtecEventCommC.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
#include /**/ "event_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
index 88a25804797..534752a9eaf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
@@ -17,7 +17,7 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
#include /**/ "event_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
index faf3f9e13c5..dba117af1c6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
@@ -4,14 +4,16 @@
#include "EC_Timeout_Generator.h"
#include "EC_Event_Channel_Base.h"
#include "EC_ProxySupplier.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
#if ! defined (__ACE_INLINE__)
#include "EC_Timeout_Filter.i"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Timeout_Filter, "$Id$")
+ACE_RCSID (Event,
+ EC_Timeout_Filter,
+ "$Id$")
TAO_EC_Timeout_Filter::TAO_EC_Timeout_Filter (
TAO_EC_Event_Channel_Base *event_channel,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
index 40552d214d2..fdbe46377ab 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
@@ -2,13 +2,15 @@
#include "EC_Timeout_Generator.h"
#include "EC_Timeout_Filter.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
#if ! defined (__ACE_INLINE__)
#include "EC_Timeout_Generator.i"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, EC_Timeout_Generator, "$Id$")
+ACE_RCSID (Event,
+ EC_Timeout_Generator,
+ "$Id$")
TAO_EC_Timeout_Generator::~TAO_EC_Timeout_Generator (void)
{
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
index ad193b971af..f037d3df588 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
@@ -1,8 +1,10 @@
// $Id$
-#include "orbsvcs/Event/EC_UDP_Admin.h"
+#include "orbsvcs/orbsvcs/Event/EC_UDP_Admin.h"
-ACE_RCSID(Event, EC_UDP_Admin, "$Id$")
+ACE_RCSID (Event,
+ EC_UDP_Admin,
+ "$Id$")
TAO_EC_Simple_AddrServer::TAO_EC_Simple_AddrServer (CORBA::UShort port)
: port_ (port)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
index 5cccfec538c..89588a49864 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
@@ -16,7 +16,7 @@
#define TAO_EC_UDP_ADMIN_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/RtecUDPAdminS.h"
+#include "orbsvcs/orbsvcs/RtecUDPAdminS.h"
#include /**/ "event_export.h"
/**
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
index 65bbe15ddd5..9360d98f57e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
@@ -2,15 +2,15 @@
#include "ace/Service_Config.h"
#include "ace/Auto_Ptr.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/Event_Utilities.h"
-
-#include "orbsvcs/Event/Dispatching_Modules.h"
-#include "orbsvcs/Event/Memory_Pools.h"
-#include "orbsvcs/Event/EC_Gateway.h"
-#include "orbsvcs/Event/Module_Factory.h"
-#include "orbsvcs/Event/Event_Manip.h"
-#include "orbsvcs/Event/Event_Channel.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+
+#include "orbsvcs/orbsvcs/Event/Dispatching_Modules.h"
+#include "orbsvcs/orbsvcs/Event/Memory_Pools.h"
+#include "orbsvcs/orbsvcs/Event/EC_Gateway.h"
+#include "orbsvcs/orbsvcs/Event/Module_Factory.h"
+#include "orbsvcs/orbsvcs/Event/Event_Manip.h"
+#include "orbsvcs/orbsvcs/Event/Event_Channel.h"
#if !defined (__ACE_INLINE__)
#include "Event_Channel.i"
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
index 9be9bd0ef25..c6812a94ff2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
@@ -40,11 +40,11 @@
#include "tao/Timeprobe.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/Event/Local_ESTypes.h"
-#include "orbsvcs/Event/Timer_Module.h"
-#include "orbsvcs/Event/ReactorTask.h"
-#include "orbsvcs/Event/Event_Manip.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Event/Local_ESTypes.h"
+#include "orbsvcs/orbsvcs/Event/Timer_Module.h"
+#include "orbsvcs/orbsvcs/Event/ReactorTask.h"
+#include "orbsvcs/orbsvcs/Event/Event_Manip.h"
// ************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp
index 0d8e97cb479..de495fe73e4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.cpp
@@ -8,7 +8,7 @@
//
// ============================================================================
-#include "orbsvcs/Event/Event_Manip.h"
+#include "orbsvcs/orbsvcs/Event/Event_Manip.h"
#if !defined (__ACE_INLINE__)
#include "Event_Manip.i"
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h
index b78511867b5..b087dc2ce4a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Manip.h
@@ -21,7 +21,7 @@
#define TAO_EC_EVENT_MANIP_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/RtecEventCommC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommC.h"
#include "old_event_export.h"
/**
diff --git a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
index 46252134318..a7490392d68 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Local_ESTypes.h
@@ -22,15 +22,15 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/Event_Service_Constants.h"
-
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/RtecSchedulerC.h"
-#include "orbsvcs/RtecSchedulerS.h"
-#include "orbsvcs/RtecEventCommC.h"
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerS.h"
+#include "orbsvcs/orbsvcs/RtecEventCommC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
#define ACE_DEFAULT_EVENT_CHANNEL_TYPE 0
diff --git a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp
index 961f11a3074..b35af5eb52f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp
@@ -1,13 +1,15 @@
// $Id$
-#include "orbsvcs/Event/Dispatching_Modules.h"
-#include "orbsvcs/Event/Timer_Module.h"
-#include "orbsvcs/Event/Event_Channel.h"
-#include "orbsvcs/Event/Module_Factory.h"
+#include "orbsvcs/orbsvcs/Event/Dispatching_Modules.h"
+#include "orbsvcs/orbsvcs/Event/Timer_Module.h"
+#include "orbsvcs/orbsvcs/Event/Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/Module_Factory.h"
#include "tao/ORB_Core.h"
-ACE_RCSID(Event, Module_Factory, "$Id$")
+ACE_RCSID (Event,
+ Module_Factory,
+ "$Id$")
TAO_Module_Factory::~TAO_Module_Factory (void)
{
diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
index f08038fa0a8..cc9677c430c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
@@ -1,7 +1,7 @@
// $Id$
#include "ace/Sched_Params.h"
-#include "orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
#include "RT_Task.h"
#include "Debug_Macros.h"
#include "Event_Channel.h"
@@ -15,7 +15,9 @@
#include "tao/Timeprobe.h"
#include "ace/OS_NS_errno.h"
-ACE_RCSID(Event, RT_Task, "$Id$")
+ACE_RCSID (Event,
+ RT_Task,
+ "$Id$")
#if defined (ACE_ENABLE_TIMEPROBES)
diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.h b/TAO/orbsvcs/orbsvcs/Event/RT_Task.h
index 6bb34db4910..9cbf1d10a7e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.h
@@ -26,7 +26,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
#include "old_event_export.h"
/**
diff --git a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp
index 8ea1e243627..ca449ff4800 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp
@@ -2,11 +2,13 @@
#include "ace/High_Res_Timer.h"
#include "tao/Timeprobe.h"
-#include "orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
#include "ReactorTask.h"
-ACE_RCSID(Event, ReactorTask, "$Id$")
+ACE_RCSID (Event,
+ ReactorTask,
+ "$Id$")
#if defined (ACE_ENABLE_TIMEPROBES)
diff --git a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp
index 05c3f23f6d3..de8d73e8625 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp
@@ -2,7 +2,7 @@
#include "ace/Functor.h"
-#include "orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
#include "ReactorTask.h"
#include "Timer_Module.h"
@@ -10,7 +10,9 @@
#include "Timer_Module.i"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Event, Timer_Module, "$Id$")
+ACE_RCSID (Event,
+ Timer_Module,
+ "$Id$")
#include "tao/Timeprobe.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h
index 2b93e920c66..e28f0cc74ea 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.h
@@ -13,8 +13,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Event/RT_Task.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event/RT_Task.h"
class ACE_Command_Base;
diff --git a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h
index 075adda129a..2c97ce537d8 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h
+++ b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h
@@ -23,7 +23,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
/// This is the number of events a consumer can subscribe to.
const int ACE_ES_MAX_SUBSCRIPTIONS = 32;
diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
index 47864187fe4..29b41b32d45 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
@@ -1,15 +1,17 @@
// $Id$
-#include "orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
#include "ace/Log_Msg.h"
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_string.h"
#if !defined (__ACE_INLINE__)
-#include "orbsvcs/Event_Utilities.i"
+#include "orbsvcs/orbsvcs/Event_Utilities.i"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(orbsvcs, Event_Utilities, "$Id$")
+ACE_RCSID (orbsvcs,
+ Event_Utilities,
+ "$Id$")
ACE_ConsumerQOS_Factory::
ACE_ConsumerQOS_Factory (TAO_EC_Event_Initializer initializer)
diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.h b/TAO/orbsvcs/orbsvcs/Event_Utilities.h
index 9bc493d5ea3..2af9e013a46 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.h
@@ -16,8 +16,8 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
#include "Event/event_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/FTRT_GroupManager.idl b/TAO/orbsvcs/orbsvcs/FTRT_GroupManager.idl
index 3290d1f2225..fd253ce9fec 100644
--- a/TAO/orbsvcs/orbsvcs/FTRT_GroupManager.idl
+++ b/TAO/orbsvcs/orbsvcs/FTRT_GroupManager.idl
@@ -13,9 +13,9 @@
#ifndef TAO_FTRT_GROUPMANAGER_IDL
#define TAO_FTRT_GROUPMANAGER_IDL
-#include "orbsvcs/RtecEventChannelAdmin.idl"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdmin.idl"
#include "orb.idl"
-#include "orbsvcs/CosNaming.idl"
+#include "orbsvcs/orbsvcs/CosNaming.idl"
#include "FTRT.idl"
module FTRT
diff --git a/TAO/orbsvcs/orbsvcs/FT_CORBA.idl b/TAO/orbsvcs/orbsvcs/FT_CORBA.idl
index 144c2290bbe..64c0009937c 100644
--- a/TAO/orbsvcs/orbsvcs/FT_CORBA.idl
+++ b/TAO/orbsvcs/orbsvcs/FT_CORBA.idl
@@ -11,18 +11,18 @@
// FT_Replica.idl
// The next include is TAO specific.
-#include "orbsvcs/FT_CORBA_ORB.idl"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORB.idl"
#define FT_USES_PORTABLE_GROUP
#ifdef FT_USES_PORTABLE_GROUP
-# include "orbsvcs/PortableGroup.idl"
+# include "orbsvcs/orbsvcs/PortableGroup.idl"
#else // FT_USES_PORTABLE_GROUP
-#include "orbsvcs/CosNaming.idl" // 98-10-19.idl
+#include "orbsvcs/orbsvcs/CosNaming.idl" // 98-10-19.idl
#endif // FT_USES_PORTABLE_GROUP
-#include "orbsvcs/CosNotification.idl" // from telecom/98-11-03.idl
-#include "orbsvcs/CosNotifyFilter.idl"
+#include "orbsvcs/orbsvcs/CosNotification.idl" // from telecom/98-11-03.idl
+#include "orbsvcs/orbsvcs/CosNotifyFilter.idl"
#pragma prefix "omg.org"
diff --git a/TAO/orbsvcs/orbsvcs/FT_FaultDetectorFactory.idl b/TAO/orbsvcs/orbsvcs/FT_FaultDetectorFactory.idl
index b783eb46ace..194b6183e5f 100644
--- a/TAO/orbsvcs/orbsvcs/FT_FaultDetectorFactory.idl
+++ b/TAO/orbsvcs/orbsvcs/FT_FaultDetectorFactory.idl
@@ -22,9 +22,9 @@
#pragma prefix "omg.org"
-#include "orbsvcs/FT_CORBA.idl"
-#include "orbsvcs/FT_Replica.idl"
-#include "orbsvcs/PortableGroup.idl"
+#include "orbsvcs/orbsvcs/FT_CORBA.idl"
+#include "orbsvcs/orbsvcs/FT_Replica.idl"
+#include "orbsvcs/orbsvcs/PortableGroup.idl"
module FT
{
diff --git a/TAO/orbsvcs/orbsvcs/FT_Notifier.idl b/TAO/orbsvcs/orbsvcs/FT_Notifier.idl
index bb1d839f388..de0e071b58a 100644
--- a/TAO/orbsvcs/orbsvcs/FT_Notifier.idl
+++ b/TAO/orbsvcs/orbsvcs/FT_Notifier.idl
@@ -17,16 +17,16 @@
///////////////////////////////
// TAO specific includes
-#include "orbsvcs/FT_CORBA_ORB.idl"
-#include "orbsvcs/FT_Replica.idl"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORB.idl"
+#include "orbsvcs/orbsvcs/FT_Replica.idl"
// end of TAO specific includes
///////////////////////////////
-#include "orbsvcs/CosNaming.idl" // 98-10-19.idl
-#include "orbsvcs/CosNotification.idl" // from telecom/98-11-03.idl
+#include "orbsvcs/orbsvcs/CosNaming.idl" // 98-10-19.idl
+#include "orbsvcs/orbsvcs/CosNotification.idl" // from telecom/98-11-03.idl
// added to OMG version:
-#include "orbsvcs/CosNotifyFilter.idl"
+#include "orbsvcs/orbsvcs/CosNotifyFilter.idl"
#pragma prefix "omg.org"
diff --git a/TAO/orbsvcs/orbsvcs/FT_ReplicationManager.idl b/TAO/orbsvcs/orbsvcs/FT_ReplicationManager.idl
index 8f36d6b135a..73d47a48b52 100644
--- a/TAO/orbsvcs/orbsvcs/FT_ReplicationManager.idl
+++ b/TAO/orbsvcs/orbsvcs/FT_ReplicationManager.idl
@@ -15,10 +15,10 @@
#ifndef _FT_REPLICATION_MANAGER_IDL_
#define _FT_REPLICATION_MANAGER_IDL_
-#include "orbsvcs/PortableGroup.idl"
-#include "orbsvcs/FT_CORBA.idl"
-#include "orbsvcs/FT_Replica.idl"
-#include "orbsvcs/FT_Notifier.idl"
+#include "orbsvcs/orbsvcs/PortableGroup.idl"
+#include "orbsvcs/orbsvcs/FT_CORBA.idl"
+#include "orbsvcs/orbsvcs/FT_Replica.idl"
+#include "orbsvcs/orbsvcs/FT_Notifier.idl"
#pragma prefix "omg.org"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
index 0f890ec2312..a02b8ba4a14 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
@@ -5,14 +5,14 @@
#include "FT_ClientORBInitializer.h"
#include "FT_ClientPolicyFactory.h"
#include "FT_ClientRequest_Interceptor.h"
-#include "orbsvcs/FT_CORBA_ORBC.h"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
#include "tao/Exception.h"
#include "tao/ORB_Constants.h"
-
ACE_RCSID (FaultTolerance,
FT_ClientORBInitializer,
"$Id$")
+
void
TAO_FT_ClientORBInitializer::pre_init (
PortableInterceptor::ORBInitInfo_ptr
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
index 9d1b47c983c..1f86d5f03dc 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
@@ -4,11 +4,13 @@
#include "FT_ClientPolicyFactory.h"
#include "FT_ClientPolicy_i.h"
-#include "orbsvcs/FT_CORBA_ORBC.h"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
#include "tao/PolicyC.h"
-ACE_RCSID (FaultTolerance, FT_ClientPolicyFactory, "$Id$")
+ACE_RCSID (FaultTolerance,
+ FT_ClientPolicyFactory,
+ "$Id$")
CORBA::Policy_ptr
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
index f9e93824f1c..48a3e1bdea8 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
@@ -14,7 +14,7 @@
#define TAO_FT_CLIENTPOLICY_I_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/FT_CORBA_ORBC.h"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
#if defined(_MSC_VER)
#if (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
index 94d4b522b89..a80b43b1978 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
@@ -24,7 +24,7 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "tao/IORManipulation/IORManip_Loader.h"
-#include "orbsvcs/FT_CORBA_ORBC.h"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
#include "tao/IOPC.h"
#include "FT_ORB_Utils_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
index 728f608a449..fd8e7e29908 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
@@ -6,7 +6,7 @@
#include "FT_ServerPolicyFactory.h"
#include "FT_ServerRequest_Interceptor.h"
#include "tao/ORB_Constants.h"
-#include "orbsvcs/FT_CORBA_ORBC.h"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
#include "tao/Exception.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
index f692225702f..126a9b4d1b0 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
@@ -4,11 +4,13 @@
#include "FT_ServerPolicyFactory.h"
#include "FT_ServerPolicy_i.h"
-#include "orbsvcs/FT_CORBA_ORBC.h"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
#include "tao/PolicyC.h"
-ACE_RCSID (FaultTolerance, FT_ServerPolicyFactory, "$Id$")
+ACE_RCSID (FaultTolerance,
+ FT_ServerPolicyFactory,
+ "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
index c2fcc4cab2a..5441291f6fc 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
@@ -14,7 +14,7 @@
#define TAO_FT_SERVERPOLICY_I_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/FT_CORBA_ORBC.h"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
#if defined(_MSC_VER)
#if (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
index 825103312ad..4142bccf5dc 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
@@ -5,7 +5,7 @@
#include "tao/ORB_Constants.h"
#include "tao/DynamicC.h"
#include "tao/Typecode.h"
-#include "orbsvcs/FT_CORBA_ORBC.h"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
#include "ace/Log_Msg.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
index b4f496ea24f..8d6d3873e53 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
@@ -21,7 +21,7 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "tao/Service_Callbacks.h"
-#include "orbsvcs/FT_CORBA_ORBC.h"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
class TAO_Profile;
class TAO_MProfile;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
index 5daddacf7de..ae09f35cd4e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
@@ -6,7 +6,6 @@ project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent, naming {
idlflags += -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=FtRtEvent/Utils/ftrtevent_export.h
dynamicflags = TAO_FTRTEVENT_BUILD_DLL
tagchecks = FtRtEvent
- includes += $(TAO_ROOT)/orbsvcs/orbsvcs
IDL_Files {
idlflags += -GC
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h
index d91a131a635..3a019954100 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h
@@ -15,7 +15,7 @@
#include "UpdateableHandler.h"
#include "Replication_Strategy.h"
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h"
#include "ace/Task.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h
index da132b47708..d7ef25c58eb 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h
@@ -15,7 +15,7 @@
#include "ace/Task.h"
#include "tao/PortableServer/PortableServerC.h"
-#include "orbsvcs/FTRT_GroupManagerC.h"
+#include "orbsvcs/orbsvcs/FTRT_GroupManagerC.h"
#include "Replication_Strategy.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
index fa2c3cf0dbd..bc27837b85d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
@@ -1,7 +1,7 @@
// $Id$
-#include "orbsvcs/Event/EC_ProxyConsumer.h"
-#include "orbsvcs/Event/EC_Event_Channel_Base.h"
+#include "orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h"
#include "FTEC_ConsumerAdmin.h"
#include "FTEC_ProxySupplier.h"
#include "ProxySupplierStateWorker.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h
index 267162a8b4b..78cd609596a 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h
@@ -17,7 +17,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/Event/EC_ConsumerAdmin.h"
+#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h"
#include "FT_ProxyAdmin_T.h"
#include "ProxySupplierStateWorker.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
index ff7d20f47ff..961289f2e6e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
@@ -13,7 +13,7 @@
#define FTEC_EVENT_CHANNEL_H
#include "ftrtec_export.h"
-#include "orbsvcs/FtRtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
index afc2072487d..d60aaeabf19 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.cpp
@@ -11,7 +11,7 @@
#include "FT_ProxyAdmin_Base.h"
#include "IOGR_Maker.h"
#include "Replication_Service.h"
-#include "orbsvcs/FtRtecEventCommC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventCommC.h"
ACE_RCSID (EventChannel,
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
index 4ddb93d6450..2f021715f21 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
@@ -13,8 +13,8 @@
#define TAO_FTEC_EVENT_CHANNEL_H
#include "ace/Synch_T.h"
-#include "orbsvcs/Event/EC_Event_Channel_Base.h"
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h"
#include "FTEC_Factory.h"
#include "FTEC_Group_Manager.h"
#include "IOGR_Maker.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp
index b46188a9458..f49851fc591 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp
@@ -1,5 +1,5 @@
// $Id$
-#include "orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
#include "FTEC_Event_Channel.h"
#include "FTEC_Factory.h"
#include "FTEC_ProxySupplier.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h
index d253716dba1..f66743e06b8 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h
@@ -12,7 +12,7 @@
#ifndef FTEC_FACTORY_H
#define FTEC_FACTORY_H
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h
index 9fd05992ef1..a8557ae4cdb 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h
@@ -13,7 +13,7 @@
#ifndef TAO_FTEC_GROUP_MANAGER_H
#define TAO_FTEC_GROUP_MANAGER_H
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h"
#include "FTEC_Fault_Listener.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
index 0522671688a..71555d8e463 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
@@ -12,9 +12,9 @@
#ifndef TAO_FTEC_PROXYCONSUMER_H
#define TAO_FTEC_PROXYCONSUMER_H
-#include "orbsvcs/Event/EC_Default_ProxyConsumer.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h"
#include "ace/SString.h"
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h"
#include "Request_Context_Repository.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h
index a1ca15aeaff..00214efb221 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h
@@ -12,9 +12,9 @@
#ifndef TAO_FTEC_PROXYSUPPLIER_H
#define TAO_FTEC_PROXYSUPPLIER_H
-#include "orbsvcs/Event/EC_Default_ProxySupplier.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h"
#include "ace/SString.h"
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h"
#include "Request_Context_Repository.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
index b67a0fe6a3a..c78245ef4d0 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
@@ -1,7 +1,7 @@
// $Id$
-#include "orbsvcs/Event/EC_ProxySupplier.h"
-#include "orbsvcs/Event/EC_Event_Channel_Base.h"
+#include "orbsvcs/orbsvcs/Event/EC_ProxySupplier.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h"
#include "FTEC_SupplierAdmin.h"
#include "FTEC_ProxyConsumer.h"
#include "tao/Stub.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h
index 8f26116b2e3..86cabee49b7 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h
@@ -23,8 +23,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/Event/EC_SupplierAdmin.h"
-//#include "event_export.h"
+#include "orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h"
class TAO_FTEC_Event_Channel_Impl;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h
index 01d02f86e00..a3b2cb066fd 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h
@@ -15,7 +15,7 @@
#include /**/ "ace/pre.h"
#include "tao/corba.h"
#include "tao/PortableServer/Servant_Base.h"
-#include "orbsvcs/FtRtecEventCommC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventCommC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h
index 10d93e3705d..bdee43cd7a7 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h
@@ -16,7 +16,7 @@
#include "ace/Task.h"
#include "ace/Reactor.h"
-#include "orbsvcs/FTRT_GroupManagerC.h"
+#include "orbsvcs/orbsvcs/FTRT_GroupManagerC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
index 0794962b43d..7dd9f6360cb 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
@@ -9,7 +9,7 @@
#include "tao/Object_KeyC.h"
#include "tao/ORB_Constants.h"
-#include "orbsvcs/FTRTC.h"
+#include "orbsvcs/orbsvcs/FTRTC.h"
ACE_RCSID (EventChannel,
ForwardCtrlServerInterceptor,
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
index deecbb2d9a8..b1611c963f1 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp
@@ -1,6 +1,6 @@
// $Id$
-#include "orbsvcs/FT_CORBA_ORBC.h"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
#include "FtEventServiceInterceptor.h"
#include "Request_Context_Repository.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
index 2261bf78954..e78859db173 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
@@ -16,7 +16,7 @@
#include "tao/PortableInterceptorC.h"
#include "tao/LocalObject.h"
#include "tao/ORB.h"
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
index 3ee00248d93..e4fd4275ce7 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
@@ -13,7 +13,7 @@
#ifndef GROUPINFOPUBLISHER_H
#define GROUPINFOPUBLISHER_H
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h"
#include "tao/PortableServer/PortableServerC.h"
#include "ace/Vector_T.h"
#include "ace/Singleton.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
index ec573287867..00f77dcd87a 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.cpp
@@ -9,7 +9,7 @@
#include "tao/Tagged_Components.h"
#include <algorithm>
#include "../Utils/resolve_init.h"
-#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
+#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h"
#include "GroupInfoPublisher.h"
ACE_RCSID (EventChannel,
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h
index 99619a369d3..a34c696e523 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h
@@ -13,7 +13,7 @@
#ifndef IOGR_MAKER_H
#define IOGR_MAKER_H
-#include "orbsvcs/FT_CORBA_ORBC.h"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
#include "tao/IORManipulation/IORManipulation.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h
index 0fb06766859..d5c4578016e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h
@@ -14,9 +14,9 @@
#define IDENTIFICATION_SERVICE_H
#include "ace/Service_Object.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/FTRTC.h"
-#include "orbsvcs/FtRtecEventCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/FTRTC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventCommC.h"
#include "ftrtec_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp
index 7869ab38378..a9c60538ae2 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp
@@ -1,8 +1,8 @@
// $Id$
#include "ProxyConsumerStateWorker.h"
-#include "orbsvcs/Event/EC_Event_Channel_Base.h"
-#include "orbsvcs/Event/EC_ProxySupplier.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h"
+#include "orbsvcs/orbsvcs/Event/EC_ProxySupplier.h"
ACE_RCSID (EventChannel,
ProxyConsumerStateWorker,
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h
index 772fd16538e..1de276bb2c6 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h
@@ -13,8 +13,8 @@
#ifndef PROXYCONSUMERSTATEWORKER_H
#define PROXYCONSUMERSTATEWORKER_H
-#include "orbsvcs/Event/EC_SupplierAdmin.h"
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
#include "FTEC_ProxyConsumer.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp
index cb455699293..0a0e2d732a0 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.cpp
@@ -1,9 +1,9 @@
// $Id$
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h"
#include "ProxySupplierStateWorker.h"
-#include "orbsvcs/Event/EC_Event_Channel_Base.h"
-#include "orbsvcs/Event/EC_ProxyConsumer.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h"
+#include "orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h"
ACE_RCSID (EventChannel,
ProxySupplierStateWorker,
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h
index aa6681719de..01158edeb08 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h
@@ -13,8 +13,8 @@
#ifndef PROXYSUPPLIERSTATEWORKER_H
#define PROXYSUPPLIERSTATEWORKER_H
-#include "orbsvcs/Event/EC_ConsumerAdmin.h"
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
#include "FTEC_ProxySupplier.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
index 167f74699a6..ace8f3bbed0 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
@@ -13,7 +13,7 @@
#ifndef REPLCATION_SERVICE_H
#define REPLCATION_SERVICE_H
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h"
#include "FTEC_Become_Primary_Listener.h"
#include "tao/PortableInterceptorC.h"
#include "ace/Service_Object.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h
index 9bf56d85384..e3bbb090024 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h
@@ -12,7 +12,7 @@
#ifndef REPLICATION_STRATEGY_H
#define REPLICATION_STRATEGY_H
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h"
#include "tao/PortableInterceptorC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h
index 158b43ea297..f8aa835afa9 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h
@@ -13,7 +13,7 @@
#ifndef REQUEST_CONTEXT_REPOSITORY_H
#define REQUEST_CONTEXT_REPOSITORY_H
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h"
#include "tao/PortableInterceptorC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
index 154b952b0be..c0f8b926cd3 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
@@ -1,7 +1,7 @@
// $Id$
#include "Set_Update_Interceptor.h"
-#include "orbsvcs/FTRTC.h"
+#include "orbsvcs/orbsvcs/FTRTC.h"
#include "Request_Context_Repository.h"
#include "tao/IOP_IORA.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h
index a1ba493264f..07f61e9e461 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h
@@ -12,7 +12,7 @@
#ifndef UPDATEABLEHANDLER_H
#define UPDATEABLEHANDLER_H
-#include "orbsvcs/FTRTS.h"
+#include "orbsvcs/orbsvcs/FTRTS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h
index 73e98ec3053..9ae5e678483 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h
@@ -13,8 +13,8 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
namespace TAO_FTRTEC
{
diff --git a/TAO/orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl b/TAO/orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl
index 866640ef114..234f59d2480 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl
+++ b/TAO/orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl
@@ -13,7 +13,7 @@
#ifndef TAO_FTRTEC_EVENTCHANNELADMIN_IDL
#define TAO_FTRTEC_EVENTCHANNELADMIN_IDL
-#include "orbsvcs/RtecEventChannelAdmin.idl"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdmin.idl"
#include "FTRT.idl"
#include "FTRT_GroupManager.idl"
#include "FtRtecEventComm.idl"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtecEventComm.idl b/TAO/orbsvcs/orbsvcs/FtRtecEventComm.idl
index a1406158952..6d44c9ba90b 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtecEventComm.idl
+++ b/TAO/orbsvcs/orbsvcs/FtRtecEventComm.idl
@@ -13,7 +13,7 @@
#ifndef FTRTECEVNETCOMM_H
#define FTRTECEVNETCOMM_H
-#include "orbsvcs/RtecEventComm.idl"
+#include "orbsvcs/orbsvcs/RtecEventComm.idl"
module FtRtecEventComm {
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
index 38ddd489e3a..f4aa04e4953 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
@@ -7,7 +7,7 @@
#include "orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h"
#include "orbsvcs/orbsvcs/IFRService/Options.h"
#include "orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h"
-#include "orbsvcs/IOR_Multicast.h"
+#include "orbsvcs/orbsvcs/IOR_Multicast.h"
#include "tao/IORTable/IORTable.h"
#include "tao/ORB_Core.h"
#include "tao/default_ports.h"
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
index 863106d7487..9d26c3665cb 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
@@ -23,7 +23,7 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/svc_utils_export.h"
+#include "orbsvcs/orbsvcs/svc_utils_export.h"
#include "tao/ORB.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Monitor.h
index 39a031df043..29a45069bd3 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Monitor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Monitor.h
@@ -22,7 +22,7 @@
# pragma once
# endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
/**
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
index 4d960d74884..224294591bc 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
@@ -15,13 +15,13 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/LoadBalancing/LoadBalancing_export.h"
+#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/LB_ORTC.h"
+#include "orbsvcs/orbsvcs/LB_ORTC.h"
#include "ace/Service_Object.h"
#include "ace/Service_Config.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
index fd3240d0bcd..374198c8aac 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
@@ -1,6 +1,6 @@
#include "LB_ClientRequestInterceptor.h"
-#include "orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
ACE_RCSID (LoadBalancing,
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h
index 0f290d8412b..166d3037734 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h
@@ -15,13 +15,13 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/LoadBalancing/LoadBalancing_export.h"
+#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/LB_ORTC.h"
+#include "orbsvcs/orbsvcs/LB_ORTC.h"
#include "ace/Service_Object.h"
#include "ace/Service_Config.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
index 7252318027a..537a3dcbdaf 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
@@ -19,7 +19,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
#include "tao/LocalObject.h"
#include "tao/IORInterceptor/IORInterceptorC.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
index 9252ffaf438..a7aae0fb547 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
@@ -2,7 +2,7 @@
#include "LB_LoadMap.h"
#include "LB_Random.h"
-#include "orbsvcs/PortableGroup/PG_conf.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h"
#include "tao/debug.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
index 478b6d22b63..0ae1886cd3b 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h
@@ -22,7 +22,7 @@
# pragma once
# endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
#include "ace/Synch_Traits.h"
#include "ace/Thread_Mutex.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
index 5c356ef3b41..bec59e2725f 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
@@ -16,13 +16,13 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
#pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
class TAO_LoadBalancing_Export TAO_LB_LoadAlert
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp
index 78eeeb187f6..8b4effbc06d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp
@@ -1,5 +1,5 @@
#include "LB_LoadAlertInfo.h"
-#include "orbsvcs/PortableGroup/PG_Operators.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Operators.h"
ACE_RCSID (LoadBalancing,
LB_LoadAlertInfo,
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h
index 6736448e92c..069c924c021 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h
@@ -22,7 +22,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
/**
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h
index 620ec2d3acb..de57de3dc2a 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h
@@ -24,8 +24,8 @@
#include "LB_LoadAlertInfo.h"
-#include "orbsvcs/PortableGroup/PG_Location_Hash.h"
-#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h"
#include "ace/Hash_Map_Manager_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
index 0768f411ac2..00ca3154c3d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
@@ -13,7 +13,7 @@
#ifndef TAO_LB_LOAD_ALERT_REPLY_HANDLER_H
#define TAO_LB_LOAD_ALERT_REPLY_HANDLER_H
-#include "orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h
index ebfbb3b6cb7..1ca35de22bf 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h
@@ -16,16 +16,16 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
-#include "orbsvcs/PortableGroup/PG_Location_Hash.h"
-#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h"
#include "ace/Hash_Map_Manager_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
index f05c271a8ad..77d5639dda6 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
@@ -6,8 +6,8 @@
#include "LB_LeastLoaded.h"
#include "LB_conf.h"
-#include "orbsvcs/PortableGroup/PG_Property_Utils.h"
-#include "orbsvcs/PortableGroup/PG_conf.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h"
#include "tao/Messaging/Messaging.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
index 33bb74dbde7..008485d6a1d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h
@@ -16,7 +16,7 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
#pragma once
@@ -28,11 +28,11 @@
#include "LB_LoadListMap.h"
#include "LB_Pull_Handler.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
-#include "orbsvcs/PortableGroup/PG_PropertyManager.h"
-#include "orbsvcs/PortableGroup/PG_GenericFactory.h"
-#include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h"
class TAO_LoadBalancing_Export TAO_LB_LoadManager
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h
index 6e5778f4a55..1ff00d58bc6 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h
@@ -16,16 +16,16 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
-#include "orbsvcs/PortableGroup/PG_Location_Hash.h"
-#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h"
#include "ace/Hash_Map_Manager_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h
index b99c5437779..9bda59cc806 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h
@@ -16,13 +16,13 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
#include "ace/Functor.h"
#include "ace/Hash_Map_Manager_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h
index 02b8f12adeb..46dd23539e5 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h
@@ -16,14 +16,14 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
#pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/PortableGroup/PG_Location_Hash.h"
-#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h"
#include "ace/Hash_Map_Manager_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
index 245fc0552b1..9f59c099b0f 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
@@ -2,7 +2,7 @@
#include "LB_IORInterceptor.h"
#include "LB_ServerRequestInterceptor.h"
-#include "orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
index d7bab7a8e98..6ca2b5b8597 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
@@ -15,7 +15,7 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/LB_ORTC.h"
+#include "orbsvcs/orbsvcs/LB_ORTC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
@@ -28,7 +28,7 @@
#pragma warning(disable:4250)
#endif /* _MSC_VER */
-#include "orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
#include "ace/Array_Base.h"
#include "ace/Hash_Map_Manager_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
index 2f03027c78a..7eb9eb88c72 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
@@ -16,7 +16,7 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
# if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
index 6e8c1db4288..82e408654ff 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
@@ -2,7 +2,7 @@
#include "LB_RoundRobin.h"
-#include "orbsvcs/PortableGroup/PG_conf.h"
+#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h"
#include "tao/debug.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
index c244a697157..934e92a7d1c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
@@ -22,9 +22,9 @@
# pragma once
# endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/LoadBalancing/LB_Location_Index_Map.h"
+#include "orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h"
-#include "orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
/**
* @class TAO_LB_RoundRobin_Strategy
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
index 83bf95a76f0..9d6f39e6fb5 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
@@ -1,11 +1,9 @@
-#include "orbsvcs/Log/BasicLogFactory_i.h"
-
+#include "orbsvcs/orbsvcs/Log/BasicLogFactory_i.h"
ACE_RCSID (Log,
BasicLogFactory_i,
"$Id$")
-
TAO_BasicLogFactory_i::TAO_BasicLogFactory_i (void)
{
}
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
index ddc42d07cdb..bc0f66de571 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.h
@@ -19,14 +19,14 @@
#define TAO_TLS_BASICLOGFACTORY_I_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/Log/LogMgr_i.h"
-#include "orbsvcs/Log/BasicLog_i.h"
+#include "orbsvcs/orbsvcs/Log/LogMgr_i.h"
+#include "orbsvcs/orbsvcs/Log/BasicLog_i.h"
// This is to remove "inherits via dominance" warnings from MSVC.
// MSVC is being a little too paranoid.
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
index 672d9b51f3a..17499a8b671 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
@@ -1,13 +1,11 @@
-#include "orbsvcs/Log/BasicLog_i.h"
-
-#include "orbsvcs/Log/LogMgr_i.h"
+#include "orbsvcs/orbsvcs/Log/BasicLog_i.h"
+#include "orbsvcs/orbsvcs/Log/LogMgr_i.h"
ACE_RCSID (Log,
BasicLog_i,
"$Id$")
-
TAO_BasicLog_i::TAO_BasicLog_i (TAO_LogMgr_i &logmgr_i,
DsLogAdmin::LogMgr_ptr factory,
DsLogAdmin::LogId id,
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
index 79ad3c33366..b6f837e2de6 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
@@ -21,13 +21,13 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/Log/Log_i.h"
+#include "orbsvcs/orbsvcs/Log/Log_i.h"
#include "log_export.h"
// This is to remove "inherits via dominance" warnings from MSVC.
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
index e77340ecb05..f00ce56edef 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
@@ -1,13 +1,11 @@
-#include "orbsvcs/Log/EventLog_i.h"
-#include "orbsvcs/Log/LogMgr_i.h"
-#include "orbsvcs/Log/LogNotification.h"
-
+#include "orbsvcs/orbsvcs/Log/EventLog_i.h"
+#include "orbsvcs/orbsvcs/Log/LogMgr_i.h"
+#include "orbsvcs/orbsvcs/Log/LogNotification.h"
ACE_RCSID (Log,
EventLogConsumer,
"$Id$")
-
TAO_Event_LogConsumer::TAO_Event_LogConsumer (TAO_EventLog_i *log)
: log_ (log)
{
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h
index ccff8564687..933bcc1c2e4 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h
@@ -19,16 +19,16 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/DsEventLogAdminS.h"
-#include "orbsvcs/Log/Log_i.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/DsEventLogAdminS.h"
+#include "orbsvcs/orbsvcs/Log/Log_i.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
#include "eventlog_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
index afde13e5ffe..08550f254e5 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
@@ -1,13 +1,12 @@
-#include "orbsvcs/Log/EventLogFactory_i.h"
-#include "orbsvcs/Log/LogNotification.h"
-#include "orbsvcs/Log/EventLogNotification.h"
+#include "orbsvcs/orbsvcs/Log/EventLogFactory_i.h"
+#include "orbsvcs/orbsvcs/Log/LogNotification.h"
+#include "orbsvcs/orbsvcs/Log/EventLogNotification.h"
#include "ace/Auto_Ptr.h"
ACE_RCSID (Log,
EventLogFactory_i,
"$Id$")
-
TAO_EventLogFactory_i::TAO_EventLogFactory_i (void)
{
TAO_CEC_Default_Factory::init_svcs ();
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h
index 37e9f9fb39c..8c708aeefed 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h
@@ -20,17 +20,17 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/DsEventLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsEventLogAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/DsLogAdminS.h"
-#include "orbsvcs/Log/LogMgr_i.h"
-#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/Log/LogMgr_i.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h"
#include "EventLog_i.h"
#if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
index 1861943b1d0..9dfb1fa5c5a 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
@@ -1,13 +1,12 @@
-#include "orbsvcs/Log/LogNotification.h"
-#include "orbsvcs/Log/EventLogNotification.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Log/LogNotification.h"
+#include "orbsvcs/orbsvcs/Log/EventLogNotification.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
#include "tao/debug.h"
ACE_RCSID (Log,
EventLogNotification,
"$Id$")
-
TAO_EventLogNotification::TAO_EventLogNotification (CosEventChannelAdmin::EventChannel_ptr ec)
: TAO_LogNotification (), event_channel_ (CosEventChannelAdmin::EventChannel::_duplicate (ec))
{
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
index ae29afa6b24..582b9eaa533 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
@@ -20,16 +20,16 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/DsEventLogAdminS.h"
-#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
-#include "orbsvcs/CosEventCommS.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/DsEventLogAdminS.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
#if defined(_MSC_VER)
#if (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
index ebabb0e3771..76e5f3afd74 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
@@ -1,13 +1,11 @@
-#include "orbsvcs/Log/EventLog_i.h"
-#include "orbsvcs/Log/LogMgr_i.h"
-#include "orbsvcs/Log/LogNotification.h"
-
+#include "orbsvcs/orbsvcs/Log/EventLog_i.h"
+#include "orbsvcs/orbsvcs/Log/LogMgr_i.h"
+#include "orbsvcs/orbsvcs/Log/LogNotification.h"
ACE_RCSID (Log,
EventLog_i,
"$Id$")
-
TAO_EventLog_i::TAO_EventLog_i (TAO_LogMgr_i &logmgr_i,
DsLogAdmin::LogMgr_ptr factory,
TAO_EventLogFactory_i *event_log_factory,
diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
index 5f1329741ee..f4fb4b15618 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.h
@@ -20,17 +20,17 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/DsEventLogAdminS.h"
-#include "orbsvcs/Log/Log_i.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/Log/EventLogConsumer.h"
+#include "orbsvcs/orbsvcs/DsEventLogAdminS.h"
+#include "orbsvcs/orbsvcs/Log/Log_i.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/Log/EventLogConsumer.h"
#include "eventlog_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
index bb649851235..ac4780e1dcc 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
@@ -1,14 +1,13 @@
#include "Iterator_i.h"
-#include "orbsvcs/Log/Log_Constraint_Interpreter.h"
-#include "orbsvcs/Log/Log_Constraint_Visitors.h"
-#include "orbsvcs/DsLogAdminC.h"
+#include "orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h"
+#include "orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h"
+#include "orbsvcs/orbsvcs/DsLogAdminC.h"
ACE_RCSID (Log,
Iterator_i,
"$Id$")
-
TAO_Iterator_i::TAO_Iterator_i (TAO_LogRecordStore::LOG_RECORD_STORE &store,
CORBA::ULong start,
const char *constraint,
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
index d4bfe613ca9..e192849618c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
@@ -19,13 +19,13 @@
#define TAO_TLS_ITERATOR_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/Log/LogRecordStore.h"
+#include "orbsvcs/orbsvcs/Log/LogRecordStore.h"
// This is to remove "inherits via dominance" warnings from MSVC.
// MSVC is being a little too paranoid.
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
index 66a80494fb7..111c961ecb6 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
@@ -18,13 +18,13 @@
#define TAO_TLS_LOGMGR_I_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/Log/Log_i.h"
+#include "orbsvcs/orbsvcs/Log/Log_i.h"
#include "log_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
index 0092e5e79f5..697e70aa687 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.cpp
@@ -1,6 +1,6 @@
-#include "orbsvcs/Log/LogNotification.h"
+#include "orbsvcs/orbsvcs/Log/LogNotification.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
#include "tao/debug.h"
#include "ace/OS_NS_sys_time.h"
@@ -8,7 +8,6 @@ ACE_RCSID (Log,
LogNotification,
"$Id$")
-
TAO_LogNotification::TAO_LogNotification (void)
{
// No-Op.
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h
index 99f08b0e7a6..763ddace35c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h
@@ -18,13 +18,13 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/DsLogNotificationS.h"
+#include "orbsvcs/orbsvcs/DsLogNotificationS.h"
#include "log_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
index 84864387f6f..74038ad3d20 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
@@ -1,15 +1,14 @@
-#include "orbsvcs/Log/LogRecordStore.h"
+#include "orbsvcs/orbsvcs/Log/LogRecordStore.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Log/Log_Constraint_Interpreter.h"
-#include "orbsvcs/Log/Log_Constraint_Visitors.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h"
+#include "orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h"
#include "ace/OS_NS_sys_time.h"
ACE_RCSID (Log,
LogRecordStore,
"$Id$")
-
TAO_LogRecordStore::TAO_LogRecordStore (CORBA::ULongLong max_size,
DsLogAdmin::LogId logid,
CORBA::ULong max_rec_list_len)
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
index 14fb7f5c398..c016786c432 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
@@ -19,13 +19,13 @@
#define TAO_LOG_RECORD_STORE_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/DsLogAdminC.h"
+#include "orbsvcs/orbsvcs/DsLogAdminC.h"
#include "ace/Containers.h"
#include "ace/Hash_Map_Manager.h"
#include "ace/Null_Mutex.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
index 9d077d162e4..e365b351982 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h
@@ -19,14 +19,14 @@
#define TAO_LOG_CONSTRAINT_INTERPRETER_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/ETCL/ETCL_Interpreter.h"
+#include "orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/ETCL/ETCL_Constraint.h"
-#include "orbsvcs/DsLogAdminC.h"
+#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h"
+#include "orbsvcs/orbsvcs/DsLogAdminC.h"
#include "log_export.h"
class TAO_Log_Constraint_Visitor;
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
index feca5d3d7ac..118957d882e 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
@@ -1,7 +1,7 @@
#include "Log_Constraint_Visitors.h"
-#include "orbsvcs/ETCL/ETCL_Constraint.h"
-#include "orbsvcs/ETCL/ETCL_y.h"
+#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h"
+#include "orbsvcs/orbsvcs/ETCL/ETCL_y.h"
#include "tao/DynamicAny/DynArray_i.h"
#include "tao/DynamicAny/DynSequence_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
index 2cb65f58b6f..4a4866e222f 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
@@ -26,8 +26,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/ETCL/ETCL_Constraint_Visitor.h"
-#include "orbsvcs/DsLogAdminC.h"
+#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h"
+#include "orbsvcs/orbsvcs/DsLogAdminC.h"
#include "tao/Typecode.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
index f34180947a0..9a0e87618f4 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
@@ -1,9 +1,9 @@
-#include "orbsvcs/Log/Log_i.h"
+#include "orbsvcs/orbsvcs/Log/Log_i.h"
-#include "orbsvcs/Log/Iterator_i.h"
-#include "orbsvcs/Log/Log_Constraint_Interpreter.h"
-#include "orbsvcs/Log/Log_Constraint_Visitors.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Log/Iterator_i.h"
+#include "orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.h"
+#include "orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
#include "tao/debug.h"
#include "ace/OS_NS_stdio.h"
@@ -13,7 +13,6 @@ ACE_RCSID (Log,
Log_i,
"$Id$")
-
#define QUERY_LANG_SUPPORTED_BY_LOG "TCL"
TAO_Log_i::TAO_Log_i (DsLogAdmin::LogMgr_ptr factory,
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.h b/TAO/orbsvcs/orbsvcs/Log/Log_i.h
index 9024075a59b..2181e2d7e72 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h
@@ -20,14 +20,14 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/Log/LogRecordStore.h"
+#include "orbsvcs/orbsvcs/Log/LogRecordStore.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/Log/LogNotification.h"
-#include "orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/Log/LogNotification.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
#include "ace/Reactor.h"
#include "log_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
index 4f21dd41ff2..7a79e1680f7 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
@@ -1,13 +1,11 @@
-#include "orbsvcs/Log/NotifyLog_i.h"
-#include "orbsvcs/Log/LogMgr_i.h"
-#include "orbsvcs/Log/LogNotification.h"
+#include "orbsvcs/orbsvcs/Log/NotifyLog_i.h"
+#include "orbsvcs/orbsvcs/Log/LogMgr_i.h"
+#include "orbsvcs/orbsvcs/Log/LogNotification.h"
ACE_RCSID (Log,
NotifyLogConsumer,
"$Id$")
-
-
TAO_Notify_LogConsumer::TAO_Notify_LogConsumer (TAO_NotifyLog_i *log)
: log_ (log)
{
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h
index d7f8a0086ee..d20ae88f2dd 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h
@@ -18,14 +18,14 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/DsNotifyLogAdminS.h"
-#include "orbsvcs/Log/Log_i.h"
+#include "orbsvcs/orbsvcs/DsNotifyLogAdminS.h"
+#include "orbsvcs/orbsvcs/Log/Log_i.h"
#include "notifylog_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
index 19a3c63016c..e5119599284 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
@@ -1,12 +1,11 @@
-#include "orbsvcs/Log/NotifyLogFactory_i.h"
-#include "orbsvcs/Log/LogNotification.h"
-#include "orbsvcs/Log/NotifyLogNotification.h"
+#include "orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h"
+#include "orbsvcs/orbsvcs/Log/LogNotification.h"
+#include "orbsvcs/orbsvcs/Log/NotifyLogNotification.h"
ACE_RCSID (Log,
NotifyLogFactory_i,
"$Id$")
-
TAO_NotifyLogFactory_i::TAO_NotifyLogFactory_i (void)
{
// No-Op.
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
index a6ad82cca03..f887c674f94 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
@@ -18,14 +18,14 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/DsNotifyLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsNotifyLogAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/DsLogAdminS.h"
-#include "orbsvcs/Log/LogMgr_i.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/Log/LogMgr_i.h"
#include "NotifyLog_i.h"
#if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
index 60c373dc256..8c161bff3ff 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
@@ -1,13 +1,12 @@
-#include "orbsvcs/Log/LogNotification.h"
-#include "orbsvcs/Log/NotifyLogNotification.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Log/LogNotification.h"
+#include "orbsvcs/orbsvcs/Log/NotifyLogNotification.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
#include "tao/debug.h"
ACE_RCSID (Log,
NotifyLogNotification,
"$Id$")
-
TAO_NotifyLogNotification::TAO_NotifyLogNotification (CosNotifyChannelAdmin::EventChannel_ptr ec)
: TAO_LogNotification (), event_channel_ (CosNotifyChannelAdmin::EventChannel::_duplicate (ec))
{
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h
index c9b47b2f773..0dc5d4997e5 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h
@@ -20,16 +20,16 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/DsNotifyLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsNotifyLogAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "notifylog_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
index ca1b22a7c92..20bc3f9ea0a 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
@@ -1,12 +1,11 @@
-#include "orbsvcs/Log/NotifyLog_i.h"
-#include "orbsvcs/Log/LogMgr_i.h"
-#include "orbsvcs/Log/LogNotification.h"
+#include "orbsvcs/orbsvcs/Log/NotifyLog_i.h"
+#include "orbsvcs/orbsvcs/Log/LogMgr_i.h"
+#include "orbsvcs/orbsvcs/Log/LogNotification.h"
ACE_RCSID (Log,
NotifyLog_i,
"$Id$")
-
#define CA_FILTER "threshold > 10"
#define TCL_GRAMMAR "TCL"
diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
index 39d6d275cab..63fbb632bd0 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
@@ -19,15 +19,15 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/DsNotifyLogAdminS.h"
-#include "orbsvcs/Log/Log_i.h"
-#include "orbsvcs/Log/NotifyLogConsumer.h"
+#include "orbsvcs/orbsvcs/DsNotifyLogAdminS.h"
+#include "orbsvcs/orbsvcs/Log/Log_i.h"
+#include "orbsvcs/orbsvcs/Log/NotifyLogConsumer.h"
#include "notifylog_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp b/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp
index f61709079ea..bf08953799a 100644
--- a/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp
@@ -3,7 +3,7 @@
#include "ace/OS_NS_fcntl.h"
#include "ace/OS_NS_sys_time.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
#include "ace/OS_NS_fcntl.h"
#include "ace/OS_NS_sys_time.h"
@@ -11,7 +11,6 @@ ACE_RCSID (Log,
PersistStore,
"$Id$")
-
TAO_PersistStore::TAO_PersistStore (CORBA::ULongLong max_size,
CORBA::ULong max_rec_list_len)
: maxid_ (0),
diff --git a/TAO/orbsvcs/orbsvcs/Log/PersistStore.h b/TAO/orbsvcs/orbsvcs/Log/PersistStore.h
index 1d84b0bb64d..883b65d21a9 100644
--- a/TAO/orbsvcs/orbsvcs/Log/PersistStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/PersistStore.h
@@ -17,14 +17,14 @@
#define TAO_PERSIST_STORE_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
#include "tao/Typecode.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/DsLogAdminC.h"
+#include "orbsvcs/orbsvcs/DsLogAdminC.h"
#include "ace/Mutex.h"
#define PERSIST_LOG_DEFAULT_MAX_REC_LIST_LEN 250
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
index 1594722db32..69a8009f059 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
@@ -1,16 +1,16 @@
-#include "orbsvcs/Log/RTEventLog_i.h"
-#include "orbsvcs/Log/LogMgr_i.h"
-#include "orbsvcs/Log/LogNotification.h"
+#include "orbsvcs/orbsvcs/Log/RTEventLog_i.h"
+#include "orbsvcs/orbsvcs/Log/LogMgr_i.h"
+#include "orbsvcs/orbsvcs/Log/LogNotification.h"
#include "orbsvcs/orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/Event/EC_Dispatching.h"
-#include "orbsvcs/Event/EC_ConsumerAdmin.h"
-#include "orbsvcs/Event/EC_SupplierAdmin.h"
-#include "orbsvcs/Event/EC_Timeout_Generator.h"
-#include "orbsvcs/Event/EC_ObserverStrategy.h"
-#include "orbsvcs/Event/EC_ConsumerControl.h"
-#include "orbsvcs/Event/EC_SupplierControl.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Dispatching.h"
+#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h"
+#include "orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h"
+#include "orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h"
+#include "orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h"
+#include "orbsvcs/orbsvcs/Event/EC_ConsumerControl.h"
+#include "orbsvcs/orbsvcs/Event/EC_SupplierControl.h"
#include "ace/Dynamic_Service.h"
ACE_RCSID (Log,
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h
index c98e8042cc5..1fd91e51bca 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h
@@ -19,15 +19,15 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/RTEventLogAdminS.h"
-#include "orbsvcs/Log/Log_i.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/RTEventLogAdminS.h"
+#include "orbsvcs/orbsvcs/Log/Log_i.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
#include "orbsvcs/orbsvcs/Event/EC_Factory.h"
#include "orbsvcs/orbsvcs/Event/EC_Defaults.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
index 022ff15dfb6..12d794c9a4f 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
@@ -1,25 +1,25 @@
-#include "orbsvcs/Log/RTEventLogFactory_i.h"
-#include "orbsvcs/Log/LogNotification.h"
-#include "orbsvcs/Log/RTEventLogNotification.h"
-#include "orbsvcs/Event/EC_ConsumerAdmin.h"
-#include "orbsvcs/Event/EC_ProxySupplier.h"
-#include "orbsvcs/Event/EC_ProxyConsumer.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/ESF/ESF_Peer_Workers.h"
-#include "orbsvcs/ESF/ESF_Peer_Admin.h"
-#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
-#include "orbsvcs/Event/EC_ConsumerAdmin.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Sched/Config_Scheduler.h"
-#include "orbsvcs/Event/Module_Factory.h"
-#include "orbsvcs/Event/Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h"
+#include "orbsvcs/orbsvcs/Log/LogNotification.h"
+#include "orbsvcs/orbsvcs/Log/RTEventLogNotification.h"
+#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h"
+#include "orbsvcs/orbsvcs/Event/EC_ProxySupplier.h"
+#include "orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h"
+#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Sched/Config_Scheduler.h"
+#include "orbsvcs/orbsvcs/Event/Module_Factory.h"
+#include "orbsvcs/orbsvcs/Event/Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
#include "ace/Auto_Ptr.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_ConsumerAdmin.i"
+#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i"
#endif /* __ACE_INLINE__ */
ACE_RCSID (Log,
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
index 42b25823cbb..5be76ec71b9 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
@@ -18,17 +18,17 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/RTEventLogAdminS.h"
+#include "orbsvcs/orbsvcs/RTEventLogAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/DsLogAdminS.h"
-#include "orbsvcs/Log/LogMgr_i.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
-#include "orbsvcs/RtecSchedulerS.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/Log/LogMgr_i.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerS.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "RTEventLog_i.h"
#include "rteventlog_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
index 69e37bd5da0..5d4a3788101 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
@@ -1,22 +1,22 @@
-#include "orbsvcs/Log/LogNotification.h"
-#include "orbsvcs/Log/RTEventLogNotification.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Log/LogNotification.h"
+#include "orbsvcs/orbsvcs/Log/RTEventLogNotification.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
#include "tao/debug.h"
#include "orbsvcs/orbsvcs/Event_Utilities.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/ESF/ESF_Peer_Workers.h"
-#include "orbsvcs/ESF/ESF_Peer_Admin.h"
-#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
-#include "orbsvcs/Event/EC_ProxySupplier.h"
-#include "orbsvcs/Event/EC_Dispatching.h"
-#include "orbsvcs/Event/EC_Filter_Builder.h"
-#include "orbsvcs/Event/EC_QOS_Info.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Scheduling_Strategy.h"
-#include "orbsvcs/Event/EC_ConsumerControl.h"
-#include "orbsvcs/ESF/ESF_RefCount_Guard.h"
-#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h"
+#include "orbsvcs/orbsvcs/Event/EC_ProxySupplier.h"
+#include "orbsvcs/orbsvcs/Event/EC_Dispatching.h"
+#include "orbsvcs/orbsvcs/Event/EC_Filter_Builder.h"
+#include "orbsvcs/orbsvcs/Event/EC_QOS_Info.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h"
+#include "orbsvcs/orbsvcs/Event/EC_ConsumerControl.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h"
ACE_RCSID (Log,
RTEventLogNotification,
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h
index b6f1718cbce..2ae3fd2ad6c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h
@@ -20,18 +20,18 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/Event/EC_ConsumerAdmin.h"
+#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/RTEventLogAdminS.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/Event/EC_ProxySupplier.h"
-#include "orbsvcs/Event/EC_ProxyConsumer.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/RTEventLogAdminS.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/Event/EC_ProxySupplier.h"
+#include "orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h"
#include "rteventlog_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
index a16c944ae9f..68d87cd2f20 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
@@ -1,16 +1,16 @@
-#include "orbsvcs/Log/RTEventLog_i.h"
-#include "orbsvcs/Log/LogMgr_i.h"
-#include "orbsvcs/Log/LogNotification.h"
+#include "orbsvcs/orbsvcs/Log/RTEventLog_i.h"
+#include "orbsvcs/orbsvcs/Log/LogMgr_i.h"
+#include "orbsvcs/orbsvcs/Log/LogNotification.h"
#include "orbsvcs/orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/Event/EC_Dispatching.h"
-#include "orbsvcs/Event/EC_ConsumerAdmin.h"
-#include "orbsvcs/Event/EC_SupplierAdmin.h"
-#include "orbsvcs/Event/EC_Timeout_Generator.h"
-#include "orbsvcs/Event/EC_ObserverStrategy.h"
-#include "orbsvcs/Event/EC_ConsumerControl.h"
-#include "orbsvcs/Event/EC_SupplierControl.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Dispatching.h"
+#include "orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h"
+#include "orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h"
+#include "orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h"
+#include "orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h"
+#include "orbsvcs/orbsvcs/Event/EC_ConsumerControl.h"
+#include "orbsvcs/orbsvcs/Event/EC_SupplierControl.h"
#include "ace/Dynamic_Service.h"
ACE_RCSID (Log,
diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
index 38ca6d987c4..622b25ff925 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
@@ -18,18 +18,18 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/DsLogAdminS.h"
+#include "orbsvcs/orbsvcs/DsLogAdminS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/RTEventLogAdminS.h"
-#include "orbsvcs/Log/Log_i.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/RTEventLogAdminS.h"
+#include "orbsvcs/orbsvcs/Log/Log_i.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
#include "orbsvcs/orbsvcs/Event/EC_Factory.h"
#include "orbsvcs/orbsvcs/Event/EC_Defaults.h"
-#include "orbsvcs/Log/RTEventLogConsumer.h"
+#include "orbsvcs/orbsvcs/Log/RTEventLogConsumer.h"
#include "rteventlog_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Entries.h
index 52e5a30a266..cf534ad740a 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Entries.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.h
@@ -23,7 +23,7 @@
#include "ace/SString.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "naming_export.h"
/**
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
index f113da90784..e500888109e 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
@@ -15,7 +15,7 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/CosNamingS.h"
+#include "orbsvcs/orbsvcs/CosNamingS.h"
#include "naming_export.h"
#include "ace/Null_Mutex.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
index 601ad73e463..624b0a15949 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
@@ -22,7 +22,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
class TAO_Naming_Export TAO_Naming_Loader : public TAO_Object_Loader
{
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
index d39eff95551..ef52f76ecb9 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
@@ -6,7 +6,7 @@
#include "Storable_Naming_Context.h"
#include "Storable_Naming_Context_Activator.h"
#include "Flat_File_Persistence.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "tao/debug.h"
#include "tao/default_ports.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h
index ff2daa322c5..e4d0d92e235 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h
@@ -21,8 +21,8 @@
#include /**/ "ace/pre.h"
#include "tao/ORB.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/IOR_Multicast.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/IOR_Multicast.h"
#include "Naming_Context_Interface.h"
#include "nsconf.h"
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h
index 3fdb726a8f7..be0f287ba2b 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h
@@ -16,7 +16,7 @@
#include /**/ "ace/pre.h"
#include "ace/Hash_Map_With_Allocator_T.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "naming_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
index 46e84e728d2..03f89c49d2b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
@@ -9,7 +9,7 @@ ACE_RCSID (Notify,
TAO_Notify_Admin,
"$Id$")
-#include "orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
#include "Container_T.h"
#include "Proxy.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
index 7f4e438926b..74b0ec9f268 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
@@ -6,9 +6,11 @@
#include "AdminProperties.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (Notify, TAO_Notify_AdminProperties, "$Id$")
+ACE_RCSID (Notify,
+ TAO_Notify_AdminProperties,
+ "$Id$")
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
TAO_Notify_AdminProperties::TAO_Notify_AdminProperties (void)
: max_global_queue_length_ (CosNotification::MaxQueueLength, 0)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
index 6ca5f07e18c..69e19fce382 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
@@ -23,7 +23,7 @@
#include "../Event.h"
#include "../EventType.h"
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
class TAO_Notify_Consumer;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
index c77cd8cee30..b5c7b0d5851 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h
@@ -20,7 +20,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
#include "../ProxyConsumer_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
index 459ef789a3b..bcdfce8aa9b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h
@@ -20,7 +20,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
#include "../ProxySupplier_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
index b252dc3e9a8..ff9acc4b10c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
@@ -20,7 +20,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
#include "../ProxyConsumer_T.h"
#if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
index fc1fd3d8d6d..b876b5246f7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.h
@@ -20,8 +20,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/Event_ForwarderS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/Event_ForwarderS.h"
#include "../ProxySupplier_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
index e2244944d34..fd1ee695630 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
@@ -6,10 +6,12 @@
#include "PushConsumer.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (Notify, TAO_Notify_PushConsumer, "$Id$")
+ACE_RCSID (Notify,
+ TAO_Notify_PushConsumer,
+ "$Id$")
#include "ace/Refcounted_Auto_Ptr.h"
-#include "orbsvcs/CosEventCommC.h"
+#include "orbsvcs/orbsvcs/CosEventCommC.h"
#include "../Event.h"
TAO_Notify_PushConsumer::TAO_Notify_PushConsumer (TAO_Notify_ProxySupplier* proxy)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
index 98e48b52381..5186338831e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
@@ -19,7 +19,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
#include "../Consumer.h"
/**
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
index 8cdf891d598..9beba8f8d00 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.h
@@ -20,7 +20,7 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
#include "../Supplier.h"
class TAO_Notify_ProxyConsumer;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
index 06f1da252e4..42440bbb117 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
@@ -12,7 +12,7 @@ ACE_RCSID (Notify,
#include "ace/Message_Queue.h"
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
#include "Method_Request.h"
#include "Notify_Extensions.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
index 8f3cfb3dcb6..6466f362956 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
@@ -22,7 +22,7 @@
#include "ace/Message_Queue.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
#include "Property.h"
#include "Property_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Builder.h b/TAO/orbsvcs/orbsvcs/Notify/Builder.h
index e42cc2ad59f..d5c959508d3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.h
@@ -22,8 +22,8 @@
#include "tao/PortableServer/PortableServer.h"
-#include "orbsvcs/CosNotifyChannelAdminC.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
#include "AdminProperties.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
index 9b18e9335e7..f7ff532b790 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
@@ -20,8 +20,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
#include "Peer.h"
#include "Event.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
index 842fb2ea5ae..3f9a5f08608 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
@@ -6,10 +6,12 @@
#include "ConsumerAdmin.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(RT_Notify, TAO_Notify_ConsumerAdmin, "$Id$")
+ACE_RCSID (RT_Notify,
+ TAO_Notify_ConsumerAdmin,
+ "$Id$")
#include "ace/Auto_Ptr.h"
-#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h"
#include "Subscription_Change_Worker.h"
#include "Proxy.h"
#include "EventChannel.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
index 0f41aaa9f68..394f43568b0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
@@ -20,7 +20,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/NotifyExtS.h"
+#include "orbsvcs/orbsvcs/NotifyExtS.h"
#include "Admin.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
index f3dddbcffe4..e469099bfa1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
@@ -9,8 +9,8 @@
#include "Factory.h"
#include "POA_Helper.h"
-#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
-#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h"
#if ! defined (__ACE_INLINE__)
#include "Container_T.inl"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h
index 23604de6421..59a953d6a46 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.h
@@ -20,7 +20,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h"
/**
* @class TAO_Notify_Container_T
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
index b47f0329c09..ea9648aea7e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
@@ -8,10 +8,12 @@
#include "ace/Arg_Shifter.h"
#include "ace/Dynamic_Service.h"
#include "tao/ORB_Core.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
#include "tao/debug.h"
-ACE_RCSID(Notify, TAO_CosNotify_Service, "$Id$")
+ACE_RCSID (Notify,
+ TAO_CosNotify_Service,
+ "$Id$")
TAO_CosNotify_Service::TAO_CosNotify_Service (void)
: factory_ (0)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
index 3fb6d39a784..4dc6a1be779 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
@@ -6,10 +6,12 @@
#include "Default_Factory.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Notify, TAO_Notify_Default_Factory, "$Id$")
+ACE_RCSID (Notify,
+ TAO_Notify_Default_Factory,
+ "$Id$")
-#include "orbsvcs/ESF/ESF_Proxy_List.h"
-#include "orbsvcs/ESF/ESF_Copy_On_Write.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h"
#include "EventChannelFactory.h"
#include "EventChannel.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
index d3056151c25..8f7f4c667bf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
@@ -22,7 +22,7 @@
#include "ace/Containers_T.h"
#include "ace/Hash_Map_Manager.h"
#include "ace/Atomic_Op.h"
-#include "orbsvcs/CosNotifyFilterS.h"
+#include "orbsvcs/orbsvcs/CosNotifyFilterS.h"
#include "Notify_Constraint_Interpreter.h"
#include "ace/Null_Mutex.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
index 0f5cebe080c..f51d07eaf29 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.h
@@ -20,7 +20,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosNotifyFilterS.h"
+#include "orbsvcs/orbsvcs/CosNotifyFilterS.h"
#include "FilterFactory.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp
index 4c06515781f..60fbdcbec72 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp
@@ -6,10 +6,12 @@
#include "Event.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Notify, TAO_Notify_Event, "$Id$")
+ACE_RCSID (Notify,
+ TAO_Notify_Event,
+ "$Id$")
#include "tao/debug.h"
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
TAO_Notify_Event::TAO_Notify_Event (void)
:priority_ (CosNotification::Priority, CosNotification::DefaultPriority),
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.h b/TAO/orbsvcs/orbsvcs/Notify/Event.h
index d931edf6a9a..595e666c059 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.h
@@ -23,9 +23,9 @@
#include "ace/Copy_Disabled.h"
#include "ace/Refcounted_Auto_Ptr.h"
-#include "orbsvcs/Event_ForwarderS.h"
-#include "orbsvcs/CosNotifyFilterC.h"
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/Event_ForwarderS.h"
+#include "orbsvcs/orbsvcs/CosNotifyFilterC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
#include "Property.h"
#include "Property_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
index eaac0a7ce8c..b2fcdf3618c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
@@ -20,7 +20,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
#include "Object.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
index 3f5c1745c4f..21db8d744e0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
@@ -20,8 +20,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/NotifyExtS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/NotifyExtS.h"
#include "Object.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventType.h b/TAO/orbsvcs/orbsvcs/Notify/EventType.h
index d540c62b7cb..43b31a8a7fa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.h
@@ -20,7 +20,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
/**
* @class TAO_Notify_EventType
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
index 317891d5dde..05bd7babae0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
@@ -20,7 +20,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
#include "tao/orbconf.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
index 4017259de03..a9b78c54179 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.cpp
@@ -9,9 +9,11 @@
#include "Event_Map_Entry_T.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Notify, TAO_Notify_Event_Map_Entry_T, "$Id$")
+ACE_RCSID (Notify,
+ TAO_Notify_Event_Map_Entry_T,
+ "$Id$")
-#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h"
#include "Properties.h"
#include "Factory.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
index 77de698806d..bad6e640cac 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.cpp
@@ -4,7 +4,7 @@
#define TAO_Notify_EVENT_MAP_T_C
#include "Event_Map_T.h"
-#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h"
#include "Event_Map_Entry_T.h"
#include "Properties.h"
#include "Factory.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
index 1ac91e18473..7f7eb146061 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
@@ -15,7 +15,7 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/CosNotifyFilterS.h"
+#include "orbsvcs/orbsvcs/CosNotifyFilterS.h"
#include "ace/Hash_Map_Manager.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h
index a5123bdbd1b..9fcf4aa8c7f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.h
@@ -19,8 +19,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
#include "Container_T.h"
#include "Object.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
index 4668713446d..e2c29af3b0d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
@@ -19,7 +19,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
#include "Method_Request.h"
#include "ProxyConsumer.h"
#include "Consumer_Map.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h
index 2b7d34f2044..9f99375103e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup_T.h
@@ -19,7 +19,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
#include "ProxySupplier.h"
/**
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
index d580f0533bb..6d38a1e3013 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
@@ -15,14 +15,14 @@
#define TAO_NOTIFY_CONSTRAINT_INTERPRETER_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/ETCL/ETCL_Interpreter.h"
+#include "orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/ETCL/ETCL_Constraint.h"
-#include "orbsvcs/CosNotifyFilterC.h"
+#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h"
+#include "orbsvcs/orbsvcs/CosNotifyFilterC.h"
#include "notify_export.h"
class TAO_Notify_Constraint_Visitor;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
index f09e05f8428..e85fcf9fb81 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
@@ -1,8 +1,8 @@
/* $Id$ */
#include "Notify_Constraint_Visitors.h"
-#include "orbsvcs/ETCL/ETCL_Constraint.h"
-#include "orbsvcs/ETCL/ETCL_y.h"
+#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h"
+#include "orbsvcs/orbsvcs/ETCL/ETCL_y.h"
#include "tao/Any_Unknown_IDL_Type.h"
#include "tao/DynamicAny/DynArray_i.h"
#include "tao/DynamicAny/DynSequence_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
index bea7eb79521..c97c326b4ed 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
@@ -22,8 +22,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/ETCL/ETCL_Constraint_Visitor.h"
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/ETCL/ETCL_Constraint_Visitor.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
#include "tao/Typecode.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
index c26c63b15f1..21fdb8359bc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
@@ -13,7 +13,7 @@
#define NOTIFY_EVENTCHANNELFACTORY_I_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
#include "notify_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.h b/TAO/orbsvcs/orbsvcs/Notify/Object.h
index f13e1fc8999..216dcb9cd8c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.h
@@ -22,7 +22,7 @@
#include "tao/PortableServer/Servant_Base.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
#include "QoSProperties.h"
#include "AdminProperties.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.h b/TAO/orbsvcs/orbsvcs/Notify/Peer.h
index 345d8878c1b..710dd3e1202 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Peer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.h
@@ -19,7 +19,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
#include "EventTypeSeq.h"
class TAO_Notify_Proxy;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
index 316807f8174..466b5bd076a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
@@ -1,14 +1,16 @@
// $Id$
#include "Properties.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
#include "tao/debug.h"
#if ! defined (__ACE_INLINE__)
#include "Properties.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID (Notify, TAO_Notify_Properties, "$Id$")
+ACE_RCSID (Notify,
+ TAO_Notify_Properties,
+ "$Id$")
TAO_Notify_Properties::TAO_Notify_Properties (void)
: factory_ (0)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.h b/TAO/orbsvcs/orbsvcs/Notify/Properties.h
index bd2e2b2bfdf..4312c83598b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.h
@@ -24,7 +24,7 @@
#include "tao/ORB.h"
#include "tao/PortableServer/PortableServer.h"
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
class TAO_Notify_Factory;
class TAO_Notify_Builder;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property.h b/TAO/orbsvcs/orbsvcs/Notify/Property.h
index a9243b79afa..f551b53c1a7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property.h
@@ -23,7 +23,7 @@
#include "tao/orbconf.h"
#include "tao/TimeBaseC.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
template <class LOCK, class TYPE> class ACE_Atomic_Op;
template <class TYPE> class TAO_Notify_Property_T;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h
index 4b5a4011f9d..72554b0170d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h
@@ -20,7 +20,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
#include "ace/Hash_Map_Manager.h"
#include "ace/SString.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h
index 4bf764c8693..7c9b35196fe 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h
@@ -20,7 +20,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
class TAO_Notify_PropertySeq;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
index 0b68a0246f5..7f1e5373018 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
@@ -22,7 +22,7 @@
#include "ace/SString.h"
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
class TAO_Notify_PropertySeq;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
index 489d5cbe077..523c572b0a7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
@@ -22,7 +22,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
#include "Refcountable_Guard_T.h"
#include "Event.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
index 8b772111525..641aab7f7b1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
@@ -22,7 +22,7 @@
#include "Event.h"
#include "Proxy.h"
#include "Refcountable_Guard_T.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
class TAO_Notify_Consumer;
class TAO_Notify_ConsumerAdmin;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
index 3cee18256d8..3850565c129 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
@@ -7,14 +7,16 @@
#include "ETCL_FilterFactory.h"
#include "RT_POA_Helper.h"
#include "Properties.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
#include "Object.h"
#if ! defined (__ACE_INLINE__)
#include "RT_Builder.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(RT_Notify, TAO_Notify_RT_Builder, "$Id$")
+ACE_RCSID (RT_Notify,
+ TAO_Notify_RT_Builder,
+ "$Id$")
TAO_Notify_RT_Builder::TAO_Notify_RT_Builder (void)
{
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
index b79f19e657a..6c049c0713e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
@@ -3,7 +3,7 @@
#include "RT_POA_Helper.h"
#include "tao/RTCORBA/RTCORBA.h"
#include "tao/debug.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
#include "RT_Properties.h"
#include "ace/SString.h"
@@ -11,7 +11,9 @@
#include "RT_POA_Helper.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(RT_Notify, TAO_Notify_RT_POA_Helper, "$Id$")
+ACE_RCSID (RT_Notify,
+ TAO_Notify_RT_POA_Helper,
+ "$Id$")
TAO_Notify_RT_POA_Helper::~TAO_Notify_RT_POA_Helper ()
{
diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
index 24b3491f52c..85bcdecd998 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
@@ -20,7 +20,7 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "POA_Helper.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
/**
* @class TAO_Notify_RT_POA_Helper
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
index 408564117f7..356bbde952f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
@@ -19,8 +19,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
#include "Container_T.h"
/**
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
index 41436ff95e5..df79f19069f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h
@@ -20,7 +20,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
#include "../ProxyConsumer_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
index cfa34eb40e2..a7066dabf1c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h
@@ -20,7 +20,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
#include "../ProxySupplier_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
index b5680908d22..ef22534d68a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
@@ -19,7 +19,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
#include "../Supplier.h"
class TAO_Notify_ProxyConsumer;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.h b/TAO/orbsvcs/orbsvcs/Notify/Service.h
index cd615f00b6e..06536f80d13 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Service.h
@@ -22,7 +22,7 @@
#include "ace/Service_Object.h"
#include "ace/Service_Config.h"
#include "ace/Service_Object.h"
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
#include "tao/PortableServer/PortableServer.h"
/**
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
index 7a7922b960c..c964fdc8937 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
@@ -20,7 +20,7 @@
#include "../Event.h"
#include "../EventType.h"
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
/**
* @class TAO_Notify_StructuredEvent_No_Copy
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
index 4d28b27bdd6..44e4bca20fa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
@@ -20,7 +20,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
#include "../ProxyConsumer_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
index a5d01450dc4..5defb977f07 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
@@ -20,8 +20,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/Event_ForwarderS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/Event_ForwarderS.h"
#include "../ProxySupplier_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
index 98257c8c2bd..36f6f7f8096 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
@@ -19,7 +19,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
#include "../Consumer.h"
class TAO_Notify_ProxySupplier;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
index 8d7cd70a311..65e95c3d175 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
@@ -19,7 +19,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
#include "../Supplier.h"
class TAO_Notify_ProxyConsumer;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h
index 8a377d1a06a..5763746a3c0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h
@@ -19,8 +19,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosNotificationC.h"
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Worker.h"
class TAO_Notify_Proxy;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h
index 64fea3a6bd4..8494f431b98 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h
@@ -21,7 +21,7 @@
#include "Peer.h"
-#include "orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
class TAO_Notify_ProxyConsumer;
/**
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
index 4d8b242a3ca..5df0e4487eb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
@@ -6,9 +6,11 @@
#include "SupplierAdmin.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(RT_Notify, TAO_Notify_SupplierAdmin, "$Id$")
+ACE_RCSID (RT_Notify,
+ TAO_Notify_SupplierAdmin,
+ "$Id$")
-#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
+#include "orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h"
#include "Builder.h"
#include "Proxy.h"
#include "EventChannel.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
index 0b58745597c..c9ae1a3ff5d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
@@ -20,7 +20,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/NotifyExtS.h"
+#include "orbsvcs/orbsvcs/NotifyExtS.h"
#include "Admin.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
index da03189be1b..eaa82e6fa23 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
@@ -16,7 +16,7 @@
#include /**/ "ace/pre.h"
#include "portablegroup_export.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
#pragma once
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
index 281efdaa45a..16efa83de3e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
@@ -31,7 +31,7 @@ namespace TAO
/////////////////////////////////
// Includes needed by this header
#include "portablegroup_export.h"
-#include <orbsvcs/PortableGroupS.h>
+#include <orbsvcs/orbsvcs/PortableGroupS.h>
#include <ace/Hash_Map_Manager.h>
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h
index 09df905cf90..0306516228c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h
@@ -24,7 +24,7 @@
#include "PG_Factory_Set.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
#include "ace/Hash_Map_Manager_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h
index 3bca619031f..f02e4ef24d7 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h
@@ -22,7 +22,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
#include "ace/Array_Base.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
index 8123d3d3828..2f9cd627c70 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
@@ -25,7 +25,7 @@
#include "PG_Factory_Map.h"
#include "portablegroup_export.h"
#include "tao/PortableServer/PortableServerC.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
#include "ace/Null_Mutex.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
index 810f444574a..a4ed36858b7 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
@@ -13,7 +13,7 @@
#include "PG_Group_Factory.h"
#include "PG_Property_Utils.h"
#include "PG_conf.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
#include "PG_Object_Group.h"
#include <orbsvcs/orbsvcs/PortableGroup/PG_Utils.h>
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
index e5b47d0434c..5ee17c6fe25 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
@@ -24,7 +24,7 @@
#include "ace/Hash_Map_Manager.h"
#include "portablegroup_export.h"
#include "tao/PortableServer/PortableServerC.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
#include "PG_Object_Group_Manipulator.h"
//////////////////
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h
index 224daf9c011..afeb6b0f0e3 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h
@@ -24,7 +24,7 @@
#include "PG_Operators.h"
#include "portablegroup_export.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
/**
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h
index 105ef25e6db..e79eee61713 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h
@@ -23,7 +23,7 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "portablegroup_export.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
#include "ace/ACE.h"
/**
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h
index 61d201f69d2..6e4b41019aa 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.h
@@ -25,7 +25,7 @@
#include "PG_Location_Hash.h"
#include "PG_Location_Equal_To.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
#include "ace/Array_Base.h"
#include "ace/Hash_Map_Manager_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h
index d9f49f30c6b..d7df1dca430 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h
@@ -22,7 +22,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
#include "ace/Unbounded_Set.h"
/**
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h
index 573430ccf66..ca507057adb 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.h
@@ -16,7 +16,7 @@
#include /**/ "ace/pre.h"
#include "portablegroup_export.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
#pragma once
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
index e07dd41754e..3a95a39877f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
@@ -514,14 +514,20 @@ TAO_PG_ObjectGroupManager::get_object_group_ref_from_id (
this->lock_,
PortableGroup::ObjectGroup::_nil ());
- if (this->object_group_map_.find (group_id, group_entry) != 0)
- ACE_THROW_RETURN (PortableGroup::ObjectGroupNotFound (),
- PortableGroup::ObjectGroup::_nil ());
+ if (this->object_group_map_.find (ACE_U64_TO_U32 (group_id),
+ group_entry)
+ != 0)
+ {
+ ACE_THROW_RETURN (PortableGroup::ObjectGroupNotFound (),
+ PortableGroup::ObjectGroup::_nil ());
+ }
}
if (group_entry == 0)
- ACE_THROW_RETURN (CORBA::INTERNAL (),
- PortableGroup::ObjectGroup::_nil ());
+ {
+ ACE_THROW_RETURN (CORBA::INTERNAL (),
+ PortableGroup::ObjectGroup::_nil ());
+ }
return
PortableGroup::ObjectGroup::_duplicate (group_entry->object_group.in ());
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
index 962a9a1232a..8a3610bf7b4 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
@@ -17,7 +17,7 @@
#include /**/ "ace/pre.h"
#include "portablegroup_export.h"
-#include "orbsvcs/PortableGroupS.h"
+#include "orbsvcs/orbsvcs/PortableGroupS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
#pragma once
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h
index f33a0e344cd..4fc25b4d1ab 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.h
@@ -24,7 +24,7 @@
#include "PG_MemberInfo.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
#include "tao/PortableServer/Key_Adapters.h"
#include "tao/PortableServer/PortableServerC.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
index 013336c057d..737209c50f5 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
@@ -9,8 +9,8 @@
#include <ace/Vector_T.h>
#include <tao/debug.h>
#include <tao/PortableServer/ORB_Manager.h>
-#include <orbsvcs/PortableGroup/PG_Operators.h> // Borrow operator == on CosNaming::Name
-#include <orbsvcs/PortableGroup/PG_Utils.h>
+#include <orbsvcs/orbsvcs/PortableGroup/PG_Operators.h> // Borrow operator == on CosNaming::Name
+#include <orbsvcs/orbsvcs/PortableGroup/PG_Utils.h>
#define TODO int todo;
//#define TODO
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
index 51ec24ae9b1..56c928ccf91 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
@@ -37,7 +37,7 @@ namespace TAO
/////////////////////////////////
// Includes needed by this header
-#include <orbsvcs/PortableGroupC.h>
+#include <orbsvcs/orbsvcs/PortableGroupC.h>
#include <tao/PortableServer/PortableServer.h>
#include <ace/Hash_Map_Manager_T.h>
#include "PG_Location_Hash.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
index febbee25e61..1411062912e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
@@ -68,7 +68,7 @@ TAO::PG_Object_Group_Manipulator::create_object_group (
// Create a reference for the ObjectGroup
CORBA::Object_var object_group =
- this->poa_->create_reference_with_id (group_id,
+ this->poa_->create_reference_with_id (ACE_U64_TO_U32 (group_id),
type_id
ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (CORBA::Object::_nil ());
@@ -90,7 +90,9 @@ TAO::PG_Object_Group_Manipulator::create_object_group (
}
void
-TAO::PG_Object_Group_Manipulator::init (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa ACE_ENV_ARG_DECL)
+TAO::PG_Object_Group_Manipulator::init (CORBA::ORB_ptr orb,
+ PortableServer::POA_ptr poa
+ ACE_ENV_ARG_DECL)
{
ACE_ASSERT (CORBA::is_nil (this->orb_.in ()) && !CORBA::is_nil (orb));
this->orb_ = CORBA::ORB::_duplicate (orb);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h
index 0dcd056438c..3efa0733b9b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h
@@ -15,7 +15,7 @@
#define TAO_PG_OBJECT_GROUP_MANIPULATOR_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/PortableGroupS.h"
+#include "orbsvcs/orbsvcs/PortableGroupS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
#pragma once
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h
index aa3e765a21f..d069f4a7e56 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.h
@@ -23,7 +23,7 @@
#pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
/// Global CosNaming::Name equality operator.
/**
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h
index ab5a4e56242..10f9475fde2 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h
@@ -12,8 +12,8 @@
//=============================================================================
#ifndef TAO_PG_PROPERTIES_ENCODER_H
#define TAO_PG_PROPERTIES_ENCODER_H
-#include "orbsvcs/PortableGroupS.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/PortableGroupS.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "portablegroup_export.h"
#include "ace/Vector_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
index 3d49398a974..bcb172e10ed 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h
@@ -24,7 +24,7 @@
#include "PG_Default_Property_Validator.h"
#include "portablegroup_export.h"
-#include "orbsvcs/PortableGroupS.h"
+#include "orbsvcs/orbsvcs/PortableGroupS.h"
#include "ace/Functor.h"
#include "ace/Hash_Map_Manager_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
index 5308926aa7e..1832bc50fec 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
@@ -18,10 +18,11 @@
//=============================================================================
#ifndef TAO_PG_PROPERTY_SET
#define TAO_PG_PROPERTY_SET
-#include "portablegroup_export.h"
-#include <orbsvcs/PortableGroupS.h>
#include /**/ "ace/pre.h"
-#include <orbsvcs/CosNamingC.h>
+
+#include "portablegroup_export.h"
+#include <orbsvcs/orbsvcs/PortableGroupS.h>
+#include <orbsvcs/orbsvcs/CosNamingC.h>
#include <ace/Hash_Map_Manager.h>
#include <ace/SString.h>
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h
index ca02b71a413..f92ee4608d3 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h
@@ -23,7 +23,7 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "portablegroup_export.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
namespace TAO_PG
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h
index c204b7e7a23..e06cb37338a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h
@@ -13,7 +13,8 @@
#ifndef TAO_PORTABLEGROUP_UTILS_H
#define TAO_PORTABLEGROUP_UTILS_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/PortableGroupC.h"
+
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h
index dcb0e3d5a5e..cb517a5b7fb 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h
@@ -22,7 +22,7 @@
#pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
#ifndef TAO_PG_MAX_OBJECT_GROUPS // @@ why create arbitrary limits?
/// The maximum number of object groups to be managed by the
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h
index f1bb0a0dadf..a5468f224ab 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h
@@ -23,7 +23,7 @@
#include "portablegroup_export.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
// Forward references
class PortableGroup_Request_Dispatcher;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
index e98a74c367d..53defa5a3b8 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h
@@ -23,7 +23,7 @@
#include "ace/Hash_Map_Manager_T.h"
#include "portablegroup_export.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
#include "tao/Object_KeyC.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
index 58fd1774e9d..193c860653b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
@@ -11,10 +11,12 @@
#include "tao/debug.h"
#include "tao/target_specification.h"
-#include "orbsvcs/miopC.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/miopC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
-ACE_RCSID(tao, UIPMC_Profile, "$Id$")
+ACE_RCSID (PortableGroup,
+ UIPMC_Profile,
+ "$Id$")
#if !defined (__ACE_INLINE__)
# include "UIPMC_Profile.i"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
index d36affa5d6a..718e2189352 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.h
@@ -26,7 +26,7 @@
#include "tao/Object_KeyC.h"
#include "tao/target_specification.h"
-#include "orbsvcs/PortableGroupC.h"
+#include "orbsvcs/orbsvcs/PortableGroupC.h"
#include "UIPMC_Endpoint.h"
#include "portablegroup_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
index 9c41f65d18b..944367edb2b 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
@@ -13,7 +13,7 @@
//
// ============================================================================
-#include "orbsvcs/Property/CosPropertyService_i.h"
+#include "orbsvcs/orbsvcs/Property/CosPropertyService_i.h"
#include "ace/ACE.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
index 5885ce6d841..a90e6e60509 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
@@ -15,13 +15,13 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/Property/property_export.h"
+#include "orbsvcs/orbsvcs/Property/property_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosPropertyServiceS.h"
+#include "orbsvcs/orbsvcs/CosPropertyServiceS.h"
#include "ace/Hash_Map_Manager.h"
#include "ace/Null_Mutex.h"
diff --git a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc
index 81866c6afd4..e1b45cba4e8 100644
--- a/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc
@@ -6,7 +6,6 @@ project(RTCORBAEvent) : orbsvcslib, core, rtevent, naming, svc_utils, iortable,
idlflags += -Wb,export_macro=TAO_Naming_Export -Wb,export_include=naming_export.h
dynamicflags = TAO_RTCORBAEVENT_BUILD_DLL
tagchecks += RTCORBAEvent
- includes += $(TAO_ROOT)/orbsvcs/orbsvcs
IDL_Files {
}
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h
index dd082d74960..927ea184ddb 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h
@@ -40,8 +40,8 @@
#endif /* _MSC_VER */
#include "ace/SString.h"
-#include <orbsvcs/RTCosSchedulingC.h>
-#include <orbsvcs/RTCosScheduling/RTCosScheduling_export.h>
+#include <orbsvcs/orbsvcs/RTCosSchedulingC.h>
+#include <orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_export.h>
#include "tao/RTCORBA/Priority_Mapping_Manager.h"
#include "tao/PortableInterceptorC.h"
#include "tao/RTCORBA/Linear_Priority_Mapping.h"
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
index e14252adbee..68736e46743 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
@@ -28,8 +28,8 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "ace/SString.h"
-#include <orbsvcs/RTCosSchedulingS.h>
-#include <orbsvcs/RTCosScheduling/RTCosScheduling_export.h>
+#include <orbsvcs/orbsvcs/RTCosSchedulingS.h>
+#include <orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_export.h>
#include "RTCosScheduling_PCP_Manager.h"
#include "tao/PortableInterceptorC.h"
#include "tao/LocalObject.h"
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.mpc b/TAO/orbsvcs/orbsvcs/RTEvent.mpc
index 89ef82a8023..e13f8ba70e9 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent.mpc
@@ -7,7 +7,6 @@ project(RTEvent) : orbsvcslib, core, svc_utils, messaging, portableserver {
dynamicflags = TAO_RTEVENT_BUILD_DLL
tagchecks += RTEvent
// Add this include path for precompiled headers
- includes += $(TAO_ROOT)/orbsvcs/orbsvcs
IDL_Files {
RtecDefaultEventData.idl
diff --git a/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc b/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc
index 6f77d8d9817..9a3f8bace39 100644
--- a/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc
@@ -5,7 +5,6 @@ project(RTKokyuEvent) : orbsvcslib, core, rtevent, rtsched, naming, svc_utils, p
sharedname = TAO_RTKokyuEvent
dynamicflags = TAO_RTKOKYUEVENT_BUILD_DLL
tagchecks += RTKokyuEvent
- includes += $(TAO_ROOT)/orbsvcs/orbsvcs
IDL_Files {
}
diff --git a/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc b/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc
index 53637b046e2..c26cd0a708b 100644
--- a/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTOLDEvent.mpc
@@ -5,8 +5,6 @@ project(RTOLDEvent) : orbsvcslib, core, rtevent, rtsched, naming, svc_utils, por
sharedname = TAO_RTOLDEvent
dynamicflags = TAO_RTOLDEVENT_BUILD_DLL
tagchecks += RTOLDEvent
- // Add this include path for precompiled headers
- includes += $(TAO_ROOT)/orbsvcs/orbsvcs
IDL_Files {
}
diff --git a/TAO/orbsvcs/orbsvcs/RTSched.mpc b/TAO/orbsvcs/orbsvcs/RTSched.mpc
index 27e3a5d0f27..20115b618b3 100644
--- a/TAO/orbsvcs/orbsvcs/RTSched.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTSched.mpc
@@ -6,8 +6,6 @@ project(RTSched) : orbsvcslib, core, naming, svc_utils, portableserver {
idlflags += -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=Sched/sched_export.h
dynamicflags = TAO_RTSCHED_BUILD_DLL
tagchecks += Sched
- // Add this include path for precompiled headers
- includes += $(TAO_ROOT)/orbsvcs/orbsvcs
IDL_Files {
RtecScheduler.idl
diff --git a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc
index 457a14b484a..f64fb728058 100644
--- a/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc
@@ -5,7 +5,6 @@ project(RTSchedEvent) : orbsvcslib, core, rtevent, rtsched, naming, svc_utils, p
sharedname = TAO_RTSchedEvent
dynamicflags = TAO_RTSCHEDEVENT_BUILD_DLL
tagchecks += RTSchedEvent
- includes += $(TAO_ROOT)/orbsvcs/orbsvcs
IDL_Files {
}
diff --git a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc
index 7a99a65fc09..19b32966954 100644
--- a/TAO/orbsvcs/orbsvcs/RT_Notification.mpc
+++ b/TAO/orbsvcs/orbsvcs/RT_Notification.mpc
@@ -6,7 +6,6 @@ project(RT_Notification) : orbsvcslib, core, svc_utils, dynamicany, portableserv
idlflags += -Wb,export_macro=TAO_RT_Notify_Export -Wb,export_include=Notify/rt_notify_export.h
dynamicflags = TAO_RT_NOTIFY_BUILD_DLL
tagchecks += RT_Notify
- includes += $(TAO_ROOT)/orbsvcs/orbsvcs
IDL_Files {
}
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
index b5fac3b2054..e9294e59c15 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
@@ -1,14 +1,16 @@
// $Id$
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Runtime_Scheduler.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Runtime_Scheduler.h"
#include "ace/OS_NS_string.h"
#if defined (__ACE_INLINE__)
#include "orbsvcs/Runtime_Scheduler.i"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(orbsvcs, Runtime_Scheduler, "$Id$")
+ACE_RCSID (orbsvcs,
+ Runtime_Scheduler,
+ "$Id$")
// Constructor. Initialize the data from the POD_RT_Info array.
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
index b2d5ed34061..87ca3f44cb0 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
@@ -18,9 +18,9 @@
#define ACE_RUNTIME_SCHEDULER_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/RtecSchedulerS.h"
-#include "orbsvcs/Sched/sched_export.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerS.h"
+#include "orbsvcs/orbsvcs/Sched/sched_export.h"
class TAO_RTSched_Export ACE_Runtime_Scheduler : public POA_RtecScheduler::Scheduler
{
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index a1bd57f1ae8..57be42611e4 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -4,8 +4,8 @@
//
// ============================================================================
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
#include "Config_Scheduler.h"
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
index abf9af35069..42500375d5b 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
@@ -11,15 +11,15 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/RtecSchedulerS.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerS.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
#include "sched_export.h"
#if defined (TAO_USES_STRATEGY_SCHEDULER)
-#include "orbsvcs/Sched/Strategy_Scheduler.h"
+#include "orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h"
#else
-#include "orbsvcs/Sched/Scheduler_Generic.h"
+#include "orbsvcs/orbsvcs/Sched/Scheduler_Generic.h"
#endif /* defined (TAO_USES_STRATEGY_SCHEDULER) */
class TAO_RTSched_Export ACE_Config_Scheduler
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
index c54b3b02ff4..30b55097419 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
@@ -22,7 +22,7 @@
#include "Reconfig_Sched_Utils.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
index c093698b2aa..63faf495740 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
@@ -24,8 +24,8 @@
#include "ace/config-all.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/RtecSchedulerS.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerS.h"
#include "sched_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h
index 4e46f2f8a63..98b1e11baa8 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h
@@ -23,8 +23,8 @@
#include "ace/Hash_Map_Manager.h"
#include "ace/RB_Tree.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/RtecSchedulerS.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerS.h"
#include "Reconfig_Sched_Utils.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
index 0c636478e59..731c22ef249 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
@@ -19,7 +19,7 @@
#define TAO_RECONFIG_SCHEDULER_T_C
#include "Reconfig_Scheduler_T.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
#include "ace/Auto_Ptr.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
index 7ac64f24bc2..8e33d7f6661 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
@@ -22,8 +22,8 @@
#include /**/ "ace/pre.h"
#include "sched_export.h"
-#include "orbsvcs/RtecSchedulerC.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
#include "ace/Containers.h"
//////////////////////
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
index 9619eceb420..26d5d0cfba0 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
@@ -17,7 +17,7 @@
// ============================================================================
#include "ace/Sched_Params.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
#include "Scheduler.h"
#include "ace/OS_NS_stdio.h"
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
index abb37fc6cee..5403d9013c6 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.h
@@ -33,8 +33,8 @@
#include "ace/SString.h"
#include "ace/Unbounded_Set.h"
-#include "orbsvcs/RtecSchedulerC.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
#include "sched_export.h"
class TAO_RTSched_Export ACE_Scheduler
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
index 9b8dd1d68af..bc42c024c84 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
@@ -23,7 +23,9 @@
#include "Strategy_Scheduler.i"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Sched, Strategy_Scheduler, "$Id$")
+ACE_RCSID (Sched,
+ Strategy_Scheduler,
+ "$Id$")
//////////////////////////////////////////////
// Helper function type definition for sort //
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index 9b169d85ff7..fef9bfd0158 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -4,13 +4,13 @@
#include "ace/Singleton.h"
#include "ace/Null_Mutex.h"
-#include "orbsvcs/Runtime_Scheduler.h"
-#include "orbsvcs/Sched/Reconfig_Scheduler.h"
-#include "orbsvcs/Sched/Reconfig_Sched_Utils.h"
-#include "orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Runtime_Scheduler.h"
+#include "orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h"
+#include "orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Scheduler_Factory.i"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.i"
#endif /* __ACE_INLINE__ */
ACE_RCSID(orbsvcs,
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
index 08b2fcb20c8..3260b6b53bd 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
@@ -24,9 +24,9 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/RtecSchedulerC.h"
-#include "orbsvcs/Sched/sched_export.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/Sched/sched_export.h"
class TAO_Reconfig_Scheduler_Entry;
struct TAO_RT_Info_Tuple;
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp
index 047c3920210..5ae71bb106e 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp
@@ -2,11 +2,13 @@
#include "ace/OS.h"
-#include "orbsvcs/Scheduler_Utilities.h"
+#include "orbsvcs/orbsvcs/Scheduler_Utilities.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Scheduler_Utilities.i"
+#include "orbsvcs/orbsvcs/Scheduler_Utilities.i"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(orbsvcs, Scheduler_Utilities, "$Id$")
+ACE_RCSID (orbsvcs,
+ Scheduler_Utilities,
+ "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h
index beda9ed5551..546c517114b 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h
@@ -18,13 +18,13 @@
#define ACE_SCHEDULER_UTILITIES_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/Sched/sched_export.h"
+#include "orbsvcs/orbsvcs/Sched/sched_export.h"
class TAO_RTSched_Export ACE_RT_Info : public RtecScheduler::RT_Info
{
diff --git a/TAO/orbsvcs/orbsvcs/Security.idl b/TAO/orbsvcs/orbsvcs/Security.idl
index 6008412f861..1473c95af23 100644
--- a/TAO/orbsvcs/orbsvcs/Security.idl
+++ b/TAO/orbsvcs/orbsvcs/Security.idl
@@ -6,10 +6,8 @@
#ifndef _SECURITY_IDL_
#define _SECURITY_IDL_
-#include <tao/Services.pidl>
#include <tao/TimeBase.pidl>
#include <orb.idl>
-#include <tao/OctetSeq.pidl>
#pragma prefix "omg.org"
diff --git a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h
index 2720bdc0634..64edd020121 100644
--- a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h
@@ -22,7 +22,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/SecurityLevel2C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel2C.h"
#include "tao/LocalObject.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.h b/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.h
index 70a6c5d45de..cc871c40a40 100644
--- a/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/InvocationCredentialsPolicy.h
@@ -22,7 +22,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/SecurityLevel2C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel2C.h"
#include "tao/LocalObject.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.h b/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.h
index 1f452e62398..b7e7549e266 100644
--- a/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/MechanismPolicy.h
@@ -22,7 +22,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/SecurityLevel2C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel2C.h"
#include "tao/LocalObject.h"
/**
diff --git a/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.h b/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.h
index 706e2d9276b..e8cb8b03dae 100644
--- a/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.h
+++ b/TAO/orbsvcs/orbsvcs/Security/PrincipalAuthenticator.h
@@ -22,7 +22,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/SecurityReplaceableC.h"
+#include "orbsvcs/orbsvcs/SecurityReplaceableC.h"
#include "tao/LocalObject.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h
index 74d0f51f932..30fbe55eb1c 100644
--- a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h
@@ -22,7 +22,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/SecurityLevel2C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel2C.h"
#include "tao/LocalObject.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SecurityManager.h
index c8096e3866a..720caa7c68a 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SecurityManager.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SecurityManager.h
@@ -22,7 +22,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/SecurityLevel2C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel2C.h"
#include "tao/LocalObject.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
index 47c8a2c93d0..ffd37e4e84b 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h
@@ -21,7 +21,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/SecurityLevel2C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel2C.h"
#include "tao/ORB_Core.h"
#include "tao/LocalObject.h"
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
index 9804fe73606..01fc12d4061 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
@@ -22,7 +22,7 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "security_export.h"
-#include "orbsvcs/SecurityLevel2C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel2C.h"
/**
* @class TAO_Security_Current_Impl
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
index 4ec68728480..4fde1773bdf 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
@@ -6,7 +6,7 @@ ACE_RCSID (Security,
Security_PolicyFactory,
"$Id$")
-#include "orbsvcs/SecurityLevel2C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel2C.h"
#include "QOPPolicy.h"
#include "EstablishTrustPolicy.h"
diff --git a/TAO/orbsvcs/orbsvcs/SecurityLevel1.idl b/TAO/orbsvcs/orbsvcs/SecurityLevel1.idl
index 8dbf1e7de7f..38534a3432e 100644
--- a/TAO/orbsvcs/orbsvcs/SecurityLevel1.idl
+++ b/TAO/orbsvcs/orbsvcs/SecurityLevel1.idl
@@ -6,7 +6,7 @@
#ifndef _SECURITY_LEVEL_1_IDL_
#define _SECURITY_LEVEL_1_IDL_
-#include <Security.idl>
+#include <orbsvcs/orbsvcs/Security.idl>
#pragma prefix "omg.org"
diff --git a/TAO/orbsvcs/orbsvcs/SecurityLevel2.idl b/TAO/orbsvcs/orbsvcs/SecurityLevel2.idl
index 6e3afcecb33..ca3cfaa0d08 100644
--- a/TAO/orbsvcs/orbsvcs/SecurityLevel2.idl
+++ b/TAO/orbsvcs/orbsvcs/SecurityLevel2.idl
@@ -6,7 +6,7 @@
#ifndef _SECURITY_LEVEL_2_IDL_
#define _SECURITY_LEVEL_2_IDL_
-#include <SecurityLevel1.idl>
+#include <orbsvcs/orbsvcs/SecurityLevel1.idl>
#pragma prefix "omg.org"
diff --git a/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl b/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl
index ef94e39a313..f8b157cc92a 100644
--- a/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl
+++ b/TAO/orbsvcs/orbsvcs/SecurityReplaceable.idl
@@ -5,7 +5,7 @@
#ifndef _SECURITY_REPLACEABLE_IDL_
#define _SECURITY_REPLACEABLE_IDL_
-#include <SecurityLevel2.idl>
+#include <orbsvcs/orbsvcs/SecurityLevel2.idl>
#include <tao/IOP.pidl>
#pragma prefix "omg.org"
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
index eef1f946440..3e2146b3b4f 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
@@ -19,7 +19,7 @@
#include /**/ "ace/pre.h"
#include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/TimeServiceS.h"
+#include "orbsvcs/orbsvcs/TimeServiceS.h"
#include "TAO_UTO.h"
#include "time_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
index 9b4d444b128..4a5da1e566d 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
@@ -19,9 +19,9 @@
#include /**/ "ace/pre.h"
#include "ace/Reactor.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
-#include "orbsvcs/TimeServiceS.h"
+#include "orbsvcs/orbsvcs/TimeServiceS.h"
#include "Timer_Helper.h"
#include "time_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
index f83b3cb5701..f7436e726a6 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
@@ -18,7 +18,7 @@
#define TAO_TIME_SERVICE_SERVER_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/TimeServiceS.h"
+#include "orbsvcs/orbsvcs/TimeServiceS.h"
#include "time_export.h"
/**
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
index b705d2244d8..9614194039a 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
@@ -18,7 +18,7 @@
#define TAO_UTO_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/TimeServiceS.h"
+#include "orbsvcs/orbsvcs/TimeServiceS.h"
#include "time_export.h"
/**
diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h
index 5e89f43785d..b38dd4eae8b 100644
--- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.h
@@ -27,7 +27,7 @@
#include "ace/Containers.h"
#include "time_export.h"
-#include "orbsvcs/TimeServiceS.h"
+#include "orbsvcs/orbsvcs/TimeServiceS.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
index b0ee99afdbb..8525b8d0d87 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
@@ -1,9 +1,9 @@
// $Id$
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
#if !defined (__ACE_INLINE__)
-# include "orbsvcs/Time_Utilities.i"
+# include "orbsvcs/orbsvcs/Time_Utilities.i"
#endif /* __ACE_INLINE__ */
ACE_RCSID(orbsvcs, Time_Utilities, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.h b/TAO/orbsvcs/orbsvcs/Time_Utilities.h
index 86759d4ae66..e49836bd728 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.h
@@ -18,8 +18,8 @@
#define ORBSVCS_TIME_UTILITIES_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/TimeBaseC.h"
-#include "orbsvcs/svc_utils_export.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/svc_utils_export.h"
#include "ace/OS_NS_time.h"
class TAO_Svc_Utils_Export ORBSVCS_Time
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
index 71cb7398e55..0a5d53706ef 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
@@ -19,8 +19,8 @@
#include "Constraint_Visitors.h"
#include "Interpreter.h"
-#include "orbsvcs/CosTradingS.h"
-#include "orbsvcs/CosTradingReposS.h"
+#include "orbsvcs/orbsvcs/CosTradingS.h"
+#include "orbsvcs/orbsvcs/CosTradingReposS.h"
class TAO_Constraint_Evaluator;
class TAO_Constraint_Validator;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
index f144238a869..1d4b312fd84 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
@@ -19,7 +19,7 @@
#include "tao/Basic_Types.h"
-#include "orbsvcs/Trader/trading_export.h"
+#include "orbsvcs/orbsvcs/Trader/trading_export.h"
#if defined(_MSC_VER)
#if (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
index 24134bc57bd..0484d4330b5 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
@@ -15,8 +15,8 @@
#define TAO_CONSTRAINT_VISITOR_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/Trader/Interpreter_Utils.h"
-#include "orbsvcs/Trader/trading_export.h"
+#include "orbsvcs/orbsvcs/Trader/Interpreter_Utils.h"
+#include "orbsvcs/orbsvcs/Trader/trading_export.h"
#include "ace/Containers.h"
class TAO_DynSequence_i;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h
index ed3a4589d16..b667227be47 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h
@@ -17,7 +17,7 @@
#include "Constraint_Nodes.h"
#include "Constraint_Visitors.h"
-#include "orbsvcs/Trader/trading_export.h"
+#include "orbsvcs/orbsvcs/Trader/trading_export.h"
class TAO_Constraint_Evaluator;
class TAO_Constraint_Validator;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
index a8f71973a35..e8127f3b976 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
@@ -21,7 +21,7 @@
#include "tao/Typecode.h"
#include "tao/CORBA_String.h"
-#include "orbsvcs/Trader/trading_export.h"
+#include "orbsvcs/orbsvcs/Trader/trading_export.h"
// = Classes to deal with the ACE_Hash_Map_Manager.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
index 1d081b73d0f..c5961a6b146 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
@@ -25,10 +25,10 @@
#include "ace/Containers.h"
-#include "orbsvcs/CosTradingS.h"
-#include "orbsvcs/CosTradingReposS.h"
-#include "orbsvcs/CosTradingDynamicS.h"
-#include "orbsvcs/Trader/trading_export.h"
+#include "orbsvcs/orbsvcs/CosTradingS.h"
+#include "orbsvcs/orbsvcs/CosTradingReposS.h"
+#include "orbsvcs/orbsvcs/CosTradingDynamicS.h"
+#include "orbsvcs/orbsvcs/Trader/trading_export.h"
#if defined(_MSC_VER)
#if (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h
index cb27e1c038f..ff646edb63f 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h
@@ -17,7 +17,7 @@
#include "Constraint_Visitors.h"
#include "Trader.h"
#include "Trader_Utils.h"
-#include "orbsvcs/CosTradingC.h"
+#include "orbsvcs/orbsvcs/CosTradingC.h"
class TAO_Trading_Export TAO_Trader_Constraint_Validator : public TAO_Constraint_Validator
{
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
index ff59d355062..fb86bce35f1 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
@@ -24,9 +24,9 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/IOR_Multicast.h"
-#include "orbsvcs/Trader/Trader.h"
-#include "orbsvcs/Trader/Service_Type_Repository.h"
+#include "orbsvcs/orbsvcs/IOR_Multicast.h"
+#include "orbsvcs/orbsvcs/Trader/Trader.h"
+#include "orbsvcs/orbsvcs/Trader/Service_Type_Repository.h"
class TAO_Trading_Export TAO_Trading_Loader : public TAO_Object_Loader
{
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/ORBInitializer.cpp
index c87697bb7d1..e043721e26d 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/ORBInitializer.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/ORBInitializer.cpp
@@ -1,18 +1,15 @@
#include "ORBInitializer.h"
#include "ServerRequestInterceptor.h"
-#include "orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h"
-
-#include "orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
#include "tao/ORB_Constants.h"
-
ACE_RCSID (LoadBalancing,
ORBInitializer,
"$Id$")
-
ORBInitializer::ORBInitializer (void)
: load_alert_ (),
interceptor_ (0)
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/ORBInitializer.h b/TAO/orbsvcs/performance-tests/LoadBalancing/ORBInitializer.h
index d089c75ee9e..773e034dace 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/ORBInitializer.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/ORBInitializer.h
@@ -16,7 +16,7 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/LoadBalancing/LB_LoadAlert.h"
+#include "orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/RPS_Monitor.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/RPS_Monitor.cpp
index 945086ea8ea..98e05f8b9ff 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/RPS_Monitor.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/RPS_Monitor.cpp
@@ -7,7 +7,6 @@ ACE_RCSID (LoadBalancing,
RPS_Monitor,
"$Id$")
-
RPS_Monitor::RPS_Monitor (ServerRequestInterceptor * interceptor)
: location_ (1),
interceptor_ (interceptor),
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/RPS_Monitor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/RPS_Monitor.h
index 062735c6789..9eb4bbd955f 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/RPS_Monitor.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/RPS_Monitor.h
@@ -16,13 +16,12 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
# if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
# endif /* ACE_LACKS_PRAGMA_ONCE */
-
class ServerRequestInterceptor;
/**
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/ServerRequestInterceptor.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/ServerRequestInterceptor.cpp
index 8deb50cae85..f3d4df0e2d3 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/ServerRequestInterceptor.cpp
@@ -4,7 +4,6 @@ ACE_RCSID (LoadBalancing,
ServerRequestInterceptor,
"$Id$")
-
ServerRequestInterceptor::ServerRequestInterceptor (void)
: request_count_ (0)
{
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp
index e0916710392..1170b52ea40 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp
@@ -14,7 +14,9 @@
#include "ace/Get_Opt.h"
#include "ace/Auto_Ptr.h"
-ACE_RCSID(TAO_PERF_RTEC_Federated_Roundtrip, server, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC_Federated_Roundtrip,
+ server,
+ "$Id$")
const char *ior_output_file = "test.ior";
int iterations = 10000;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
index a8604ec6581..4c5c942cff7 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.cpp
@@ -4,7 +4,9 @@
#include "Roundtrip.h"
#include "ace/High_Res_Timer.h"
-ACE_RCSID(TAO_RTEC_Perf_RTCORBA_Baseline, Roundtrip, "$Id$")
+ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Baseline,
+ Roundtrip,
+ "$Id$")
Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp
index 20a6985ee68..588500cd29e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp
@@ -14,7 +14,9 @@
#include "ace/Get_Opt.h"
#include "ace/Auto_Ptr.h"
-ACE_RCSID(TAO_PERF_RTEC_RTCORBA_Baseline, server, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC_RTCORBA_Baseline,
+ server,
+ "$Id$")
const char *ior_output_file = "test.ior";
int use_rt_corba = 0;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
index 211dcd53624..ceb24833702 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp
@@ -5,7 +5,9 @@
#include "Implicit_Deactivator.h"
#include "ace/OS_NS_time.h"
-ACE_RCSID(TAO_RTEC_Perf_RTCORBA_Callback, Callback, "$Id$")
+ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Callback,
+ Callback,
+ "$Id$")
Callback::Callback (int iterations,
PortableServer::POA_ptr poa)
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
index de016ae92a1..5c7627717eb 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp
@@ -4,7 +4,9 @@
#include "Session.h"
#include "Implicit_Deactivator.h"
-ACE_RCSID(TAO_RTEC_Perf_RTCORBA_Callback, Session, "$Id$")
+ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Callback,
+ Session,
+ "$Id$")
Session::Session (Test::Callback_ptr cb,
PortableServer::POA_ptr poa)
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
index 1d7fb7af9e2..735a8d0ec84 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp
@@ -5,7 +5,9 @@
#include "Session.h"
#include "Servant_var.h"
-ACE_RCSID(TAO_RTEC_Perf_RTCORBA_Callback, Session_Factory, "$Id$")
+ACE_RCSID (TAO_RTEC_Perf_RTCORBA_Callback,
+ Session_Factory,
+ "$Id$")
Session_Factory::Session_Factory (CORBA::ORB_ptr orb,
PortableServer::POA_ptr poa)
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
index 0cc7d5e1854..fecdc263dd7 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp
@@ -25,7 +25,9 @@
#include "ace/Task.h"
#include "ace/Barrier.h"
-ACE_RCSID(TAO_PERF_RTEC_RTCORBA_Baseline, client, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC_RTCORBA_Baseline,
+ client,
+ "$Id$")
class Roundtrip_Task : public ACE_Task_Base
{
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp
index b4beae21924..8e9bdc29558 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp
@@ -17,7 +17,9 @@
#include "ace/Get_Opt.h"
#include "ace/Auto_Ptr.h"
-ACE_RCSID(TAO_PERF_RTEC_RTCORBA_Baseline, server, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC_RTCORBA_Baseline,
+ server,
+ "$Id$")
const char *ior_output_file = "test.ior";
int use_rt_corba = 0;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
index 98f69950197..c61cd9640f8 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/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
#include "tao/PortableServer/PortableServer.h"
#include "tao/RTPortableServer/RTPortableServer.h"
@@ -19,7 +19,9 @@
#include "ace/Get_Opt.h"
#include "ace/Auto_Ptr.h"
-ACE_RCSID(TAO_PERF_RTEC_Roundtrip, server, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC_Roundtrip,
+ server,
+ "$Id$")
const char *ior_output_file = "test.ior";
int use_rt_corba = 0;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp
index 4cf9fa7a02c..2298e5bec85 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp
@@ -13,7 +13,9 @@
#include "ace/Task.h"
#include "ace/Barrier.h"
-ACE_RCSID(TAO_RTEC_PERF_TCP_Baseline, client, "$Id$")
+ACE_RCSID (TAO_RTEC_PERF_TCP_Baseline,
+ client,
+ "$Id$")
char const * hi_endpoint = "localhost:12345";
char const * lo_endpoint = "localhost:23456";
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp
index c9c6c9c699f..d3885f26a0d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp
@@ -11,7 +11,9 @@
#include "ace/TP_Reactor.h"
#include "ace/Get_Opt.h"
-ACE_RCSID(TAO_PERF_RTEC_TCP_Baseline, server, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC_TCP_Baseline,
+ server,
+ "$Id$")
int use_rt = 0;
int nthreads = 1;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp
index 4c06d23febc..7daaf4ae6b4 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp
@@ -13,7 +13,9 @@
#include "Client_Group.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, Client_Group, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ Client_Group,
+ "$Id$")
void
Client_Group::init (CORBA::Long experiment_id,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp
index c3d112526fd..9f32c911ff2 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp
@@ -13,7 +13,9 @@
#include "Client_Pair.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, Client_Pair, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ Client_Pair,
+ "$Id$")
void
Client_Pair::init (CORBA::Long experiment_id,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
index 989e98510b2..63ff884f656 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
@@ -8,10 +8,12 @@
#include "Consumer.h"
#include "Implicit_Deactivator.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
#include "ace/OS_NS_unistd.h"
-ACE_RCSID(TAO_PERF_RTEC, Consumer, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ Consumer,
+ "$Id$")
Consumer::Consumer (CORBA::Long experiment_id,
CORBA::Long event_type,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h
index 9a982381130..fb105da7511 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/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/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 1d721d1f04d..3b5b84d224d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
@@ -12,14 +12,16 @@
#include "Auto_Functor.h"
#include "Auto_Disconnect.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
#include "ace/High_Res_Timer.h"
#include "ace/Sample_History.h"
#include "ace/Basic_Stats.h"
#include "ace/Auto_Ptr.h"
-ACE_RCSID (TAO_RTEC_Perf, Control, "$Id$")
+ACE_RCSID (TAO_RTEC_Perf,
+ Control,
+ "$Id$")
Control::Control (size_t peers_expected,
size_t iterations,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp
index 0b5c98dee66..220c8c3957c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp
@@ -12,7 +12,9 @@
#include "EC_Destroyer.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, EC_Destroyer, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ EC_Destroyer,
+ "$Id$")
EC_Destroyer::EC_Destroyer (RtecEventChannelAdmin::EventChannel_ptr ec)
: ec_ (RtecEventChannelAdmin::EventChannel::_duplicate (ec))
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
index d974b324e85..314a668cc30 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
@@ -10,7 +10,9 @@
#include "Auto_Disconnect.h"
#include "Implicit_Deactivator.h"
-ACE_RCSID(TAO_RTEC_Perf, Loopback, "$Id$")
+ACE_RCSID (TAO_RTEC_Perf,
+ Loopback,
+ "$Id$")
Loopback::Loopback (CORBA::Long experiment_id,
CORBA::Long base_event_type,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
index 314cf22f3ff..cb7693306f9 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
@@ -8,9 +8,11 @@
#include "Loopback_Consumer.h"
#include "Implicit_Deactivator.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
-ACE_RCSID(PERF_RTEC, Loopback_Consumer, "$Id$")
+ACE_RCSID (PERF_RTEC,
+ Loopback_Consumer,
+ "$Id$")
Loopback_Consumer::
Loopback_Consumer (CORBA::Long experiment_id,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h
index b3e05ea1c10..ba25bc40a16 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/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp
index 31d321f45c8..5a0c80aed0c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp
@@ -13,7 +13,9 @@
#include "Loopback_Pair.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, Loopback_Pair, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ Loopback_Pair,
+ "$Id$")
void
Loopback_Pair::init (CORBA::Long experiment_id,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
index 7bdb98d3fad..1e516958c44 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
@@ -9,7 +9,9 @@
#include "Loopback_Supplier.h"
#include "Implicit_Deactivator.h"
-ACE_RCSID(TAO_PERF_RTEC, Loopback_Supplier, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ Loopback_Supplier,
+ "$Id$")
Loopback_Supplier::Loopback_Supplier (CORBA::Long experiment_id,
CORBA::Long response_type,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h
index 084c2bd1341..75bfd1cb88f 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/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp
index 2e4014a4abc..a2ee9263b1f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp
@@ -12,7 +12,9 @@
#include "ORB_Holder.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, ORB_Holder, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ ORB_Holder,
+ "$Id$")
ORB_Holder::ORB_Holder (int &argc, char *argv[],
const char *orb_id
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.cpp
index 8bb8641e37c..2071b0a718e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.cpp
@@ -11,4 +11,6 @@
#include "ORB_Shutdown.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, ORB_Shutdown, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ ORB_Shutdown,
+ "$Id$")
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp
index 0a7b8bc11d1..92b8dce40c6 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp
@@ -12,7 +12,9 @@
#include "ORB_Task.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, ORB_Task, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ ORB_Task,
+ "$Id$")
ORB_Task::ORB_Task (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp
index bbbdfaf530c..fe7f8de472c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp
@@ -12,7 +12,9 @@
#include "ORB_Task_Activator.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, ORB_Task_Activator, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ ORB_Task_Activator,
+ "$Id$")
ORB_Task_Activator::~ORB_Task_Activator (void)
{
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
index 6ba6924c48b..906dacdfdcd 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
@@ -15,10 +15,12 @@
#include "Auto_Disconnect.h"
#include "Loopback.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Gateway_IIOP.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h"
-ACE_RCSID (TAO_RTEC_Perf, Peer_Base, "$Id$")
+ACE_RCSID (TAO_RTEC_Perf,
+ Peer_Base,
+ "$Id$")
Peer_Base::Peer_Base (CORBA::ORB_ptr orb,
RTServer_Setup &rtserver_setup
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h
index 3733441998b..aaed29be88d 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/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
index 6ef03eec91f..bbb980bde7b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
@@ -14,7 +14,9 @@
#include "PriorityBand_Setup.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, PriorityBand_Setup, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ PriorityBand_Setup,
+ "$Id$")
PriorityBand_Setup::PriorityBand_Setup (CORBA::ORB_ptr orb,
const RTCORBA_Setup &rtcorba_setup
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp
index 29d8ceb304a..b5c6d99ae37 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp
@@ -16,7 +16,9 @@
#include "RTCORBA_Setup.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, RTCORBA_Setup, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ RTCORBA_Setup,
+ "$Id$")
RTCORBA_Setup::RTCORBA_Setup (CORBA::ORB_ptr orb,
const RT_Class &rtclass,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp
index 21e0f13b0bb..6e3d06125f6 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp
@@ -16,7 +16,9 @@
#include "RTClient_Setup.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, RTClient_Setup, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ RTClient_Setup,
+ "$Id$")
RTClient_Setup::RTClient_Setup (int use_rt_corba,
CORBA::ORB_ptr orb,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp
index 4929d57a20f..f5516c30508 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp
@@ -9,13 +9,15 @@
#include "RTEC_Initializer.h"
#include "RTCORBA_Setup.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/Event/EC_RTCORBA_Factory.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 "ace/Dynamic_Service.h"
-ACE_RCSID(TAO_PERF_RTEC, RTEC_Initializer, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ RTEC_Initializer,
+ "$Id$")
TAO_EC_Event_Channel *
RTEC_Initializer::create (PortableServer::POA_ptr consumer_poa,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp
index 2e96154abf0..fdaaee06d30 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp
@@ -17,7 +17,9 @@
#include "RTPOA_Setup.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, RTPOA_Setup, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ RTPOA_Setup,
+ "$Id$")
RTPOA_Setup::RTPOA_Setup (CORBA::ORB_ptr orb,
const RTCORBA_Setup &rtcorba_setup
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp
index c37b85c196a..609f8f7b314 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp
@@ -16,7 +16,9 @@
#include "RTServer_Setup.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, RTServer_Setup, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ RTServer_Setup,
+ "$Id$")
RTServer_Setup::RTServer_Setup (int use_rt_corba,
CORBA::ORB_ptr orb,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp
index 4e4260a89f9..096d2f09cbd 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/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
#include "ace/Barrier.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.cpp
index b6ae6a906f9..04111b2b80c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.cpp
@@ -12,7 +12,9 @@
#include "Send_Task_Stopper.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, Send_Task_Stopper, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ Send_Task_Stopper,
+ "$Id$")
Send_Task_Stopper::~Send_Task_Stopper (void)
{
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
index d6c3307dc82..11c14e80232 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
@@ -9,7 +9,9 @@
#include "Supplier.h"
#include "Implicit_Deactivator.h"
-ACE_RCSID(TAO_PERF_RTEC, Supplier, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ Supplier,
+ "$Id$")
Supplier::Supplier (CORBA::Long experiment_id,
CORBA::Long event_type,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h
index 6a04b5f7049..cc3878a8be1 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/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
index 062159545b6..594837f3152 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
@@ -13,7 +13,9 @@
#include "SyncScope_Setup.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, SyncScope_Setup, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ SyncScope_Setup,
+ "$Id$")
SyncScope_Setup::SyncScope_Setup (CORBA::ORB_ptr orb,
Messaging::SyncScope value
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
index f27b97eef2f..3c67f88ee21 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h
@@ -18,9 +18,9 @@
//
// ============================================================================
-#include "orbsvcs/Naming/Naming_Utils.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
#include "tao/PortableServer/PortableServer.h"
class Endpoint_Addresses
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
index de4512bf7da..ec98f79d6bd 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
@@ -2,7 +2,7 @@
#include "distributer.h"
#include "ace/Get_Opt.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
typedef ACE_Singleton<Distributer, ACE_Null_Mutex> DISTRIBUTER;
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
index 319f6287193..a2218860dff 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h
@@ -19,9 +19,9 @@
// ============================================================================
#include "Connection_Manager.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
class Distributer_Receiver_Callback : public TAO_AV_Callback
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
index 8d9638f4d2e..8c32988eae7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h
@@ -19,9 +19,9 @@
// ============================================================================
#include "Connection_Manager.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
class Receiver_Callback : public TAO_AV_Callback
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
index b4392ed9a4c..371cf9087fd 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h
@@ -19,9 +19,9 @@
// ============================================================================
#include "Connection_Manager.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
index 9d9316756e3..fdf5eca12f6 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
@@ -18,11 +18,11 @@
//
// ============================================================================
-#include "orbsvcs/Naming/Naming_Utils.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
class Receiver_Callback : public TAO_AV_Callback
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
index af864915393..38c4f0fc664 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
@@ -18,10 +18,10 @@
//
// ============================================================================
-#include "orbsvcs/Naming/Naming_Utils.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
class Sender_Callback : public TAO_AV_Callback
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
index 1908c9fc033..666894ccecf 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h
@@ -21,9 +21,9 @@
#ifndef CONNECTION_MANAGER_H
#define CONNECTION_MANAGER_H
-#include "orbsvcs/Naming/Naming_Utils.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
#include "tao/PortableServer/PortableServer.h"
class Connection_Manager
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
index 7c6383e799c..4dbf363f16d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
@@ -3,8 +3,8 @@
#include "distributer.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
-#include "orbsvcs/AV/FlowSpec_Entry.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/AV/FlowSpec_Entry.h"
#include "tao/Strategies/advanced_resource.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
index ab6f4753a14..fc9205c72c2 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h
@@ -19,9 +19,9 @@
// ============================================================================
#include "Connection_Manager.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
class Signal_Handler : public ACE_Event_Handler
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
index 19a9c673b8c..1870574ee10 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h
@@ -19,9 +19,9 @@
// ============================================================================
#include "Connection_Manager.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
class Signal_Handler : public ACE_Event_Handler
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
index 6b5e8ef9e76..5d9d4971e62 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h
@@ -19,9 +19,9 @@
// ============================================================================
#include "Connection_Manager.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
class Signal_Handler : public ACE_Event_Handler
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h
index 132c98f1af8..b780e067d95 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h
@@ -6,12 +6,12 @@
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Flows_T.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Transport.h"
-#include "orbsvcs/AV/sfp.h"
-#include "orbsvcs/AV/MCast.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Flows_T.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Transport.h"
+#include "orbsvcs/orbsvcs/AV/sfp.h"
+#include "orbsvcs/orbsvcs/AV/MCast.h"
class Client;
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h
index 8ce2dc595c5..58bbe6da8a7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h
@@ -3,14 +3,14 @@
#include "ace/Get_Opt.h"
#include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Flows_T.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Transport.h"
-#include "orbsvcs/AV/sfp.h"
-#include "orbsvcs/AV/MCast.h"
-#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Flows_T.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Transport.h"
+#include "orbsvcs/orbsvcs/AV/sfp.h"
+#include "orbsvcs/orbsvcs/AV/MCast.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
class Server;
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
index f02e89b5532..f995c2764d0 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
@@ -1,14 +1,16 @@
// $Id$
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/FlowSpec_Entry.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/FlowSpec_Entry.h"
#include "tao/PortableServer/PortableServer.h"
#include "tao/Strategies/advanced_resource.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
#include "ace/INET_Addr.h"
-ACE_RCSID(Latency, ping, "$Id$")
+ACE_RCSID (Latency,
+ ping,
+ "$Id$")
const char *ping_ior = CORBA::string_dup ("file://ping.ior");
const char *pong_ior = CORBA::string_dup ("file://pong.ior");
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
index f1625d58f14..07801f4a170 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
@@ -1,14 +1,16 @@
// $Id$
#include "ping.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
#include "tao/ORB.h"
#include "tao/Strategies/advanced_resource.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
#include "ace/Stats.h"
-ACE_RCSID(Latency, ping, "$Id$")
+ACE_RCSID (Latency,
+ ping,
+ "$Id$")
const char *ior_output_file = "ping.ior";
const char *protocol = "RTP/UDP";
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.h b/TAO/orbsvcs/tests/AVStreams/Latency/ping.h
index 88e6fc31b97..0567cc3f821 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.h
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.h
@@ -16,9 +16,9 @@
#ifndef TAO_PING_H
#define TAO_PING_H
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Policy.h"
-#include "orbsvcs/AV/Flows_T.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/AV/Flows_T.h"
#include "ace/OS_NS_time.h"
class Ping_Recv_Callback : public TAO_AV_Callback
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
index 6fe53fe2f92..6153f46b0e6 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
@@ -1,7 +1,7 @@
// $Id$
#include "pong.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
#include "tao/PortableServer/PortableServer.h"
#include "tao/Strategies/advanced_resource.h"
#include "tao/ORB.h"
@@ -10,7 +10,9 @@
#include "ace/High_Res_Timer.h"
#include "ace/Stats.h"
-ACE_RCSID(Latency, ping, "$Id$")
+ACE_RCSID (Latency,
+ ping,
+ "$Id$")
const char *ior_output_file = "pong.ior";
const char *protocol = "RTP/UDP";
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.h b/TAO/orbsvcs/tests/AVStreams/Latency/pong.h
index 92d90adaad4..c8527c9f6f1 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.h
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.h
@@ -16,9 +16,9 @@
#ifndef TAO_PONG_H
#define TAO_PONG_H
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Policy.h"
-#include "orbsvcs/AV/Flows_T.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/AV/Flows_T.h"
class Pong_Recv_Callback : public TAO_AV_Callback
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
index 9528a063a2a..8af242724c9 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h
@@ -11,10 +11,10 @@
*/
//=============================================================================
-#include "orbsvcs/Naming/Naming_Utils.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
// = AVStreams calls this class when data shows up from a sender.
class Receiver_Callback : public TAO_AV_Callback
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
index 4a199dd1922..0be17acd796 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h
@@ -10,10 +10,10 @@
*/
//=============================================================================
-#include "orbsvcs/Naming/Naming_Utils.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
// = Defines application specific sender stream endpoint.
class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
index 7d03bb5726f..eab3bf37497 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
@@ -7,12 +7,12 @@
#include "ace/Get_Opt.h"
#include "tao/PortableServer/PortableServer.h"
#include "tao/Strategies/advanced_resource.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Transport.h"
-#include "orbsvcs/AV/sfp.h"
-#include "orbsvcs/AV/MCast.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Transport.h"
+#include "orbsvcs/orbsvcs/AV/sfp.h"
+#include "orbsvcs/orbsvcs/AV/MCast.h"
class FTP_Client_Callback
:public TAO_AV_Callback
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast/server.h
index 9fa52e1620d..6d0b3a697c9 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.h
@@ -4,13 +4,13 @@
#include "ace/Get_Opt.h"
#include "tao/Strategies/advanced_resource.h"
#include "orbsvcs/orbsvcs/CosNamingC.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Transport.h"
-#include "orbsvcs/AV/sfp.h"
-#include "orbsvcs/AV/MCast.h"
-#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Transport.h"
+#include "orbsvcs/orbsvcs/AV/sfp.h"
+#include "orbsvcs/orbsvcs/AV/MCast.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
class FTP_Server_StreamEndPoint
:public TAO_Server_StreamEndPoint
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h
index 408ca2e5d09..18ff8ec8671 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h
@@ -6,12 +6,12 @@
#include "ace/Get_Opt.h"
#include "tao/PortableServer/PortableServer.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Flows_T.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/sfp.h"
-#include "orbsvcs/AV/MCast.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Flows_T.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/sfp.h"
+#include "orbsvcs/orbsvcs/AV/MCast.h"
class FTP_Client_Callback;
class FTP_Client_Producer
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
index 87a4c22639b..ac21c891ced 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
@@ -2,13 +2,13 @@
// $Id$
#include "ace/Get_Opt.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Flows_T.h"
-#include "orbsvcs/AV/sfp.h"
-#include "orbsvcs/AV/MCast.h"
-#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Flows_T.h"
+#include "orbsvcs/orbsvcs/AV/sfp.h"
+#include "orbsvcs/orbsvcs/AV/MCast.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
class FTP_Server_Callback
:public TAO_AV_Callback
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
index 048b89b88be..8bc7686cf71 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
@@ -18,11 +18,11 @@
//
// ============================================================================
-#include "orbsvcs/Naming/Naming_Utils.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
class Receiver_Callback : public TAO_AV_Callback
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
index 62b2086a660..f4f8b4716c2 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
@@ -18,10 +18,10 @@
//
// ============================================================================
-#include "orbsvcs/Naming/Naming_Utils.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
typedef ACE_Unbounded_Set<TAO_AV_Protocol_Object*> ProtocolObject_Set;
typedef ACE_Unbounded_Set_Iterator<TAO_AV_Protocol_Object*> ProtocolObject_SetItor;
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
index cfa78e4de09..772016bf4f8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
@@ -22,11 +22,11 @@
#define TAO_AV_FTP_H
#include "ace/Get_Opt.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
class FTP_Client_Callback : public TAO_AV_Callback
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
index 23eb5b60957..146d1e9486c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
@@ -16,10 +16,10 @@
//
// ============================================================================
-#include "orbsvcs/Naming/Naming_Utils.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
class FTP_Server_Callback : public TAO_AV_Callback
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
index 4faa8c72ae8..2fcda3f1f64 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
@@ -1,5 +1,5 @@
#include "TimeStamp.h"
-#include "orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
#include "ace/High_Res_Timer.h"
// $Id$
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h
index c19b488104f..e860731f0ad 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h
@@ -2,7 +2,7 @@
#define TIMESTAMP_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
#include "ace/Dynamic_Service.h"
#include "export.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
index 70a4c428c40..2ab749b7c70 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h
@@ -18,10 +18,10 @@
//
// ============================================================================
-#include "orbsvcs/Naming/Naming_Utils.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
class Receiver_Callback : public TAO_AV_Callback
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
index 8a41bdeb0da..3324e95747f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h
@@ -18,10 +18,10 @@
//
// ============================================================================
-#include "orbsvcs/Naming/Naming_Utils.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
index 2ad409534ab..66dc44f0ef8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
@@ -2,7 +2,7 @@
#include "distributer.h"
#include "ace/Get_Opt.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
typedef ACE_Singleton<Distributer, ACE_Null_Mutex> DISTRIBUTER;
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
index 0f56e2e2e85..6baa0c53584 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h
@@ -18,10 +18,10 @@
//
// ============================================================================
-#include "orbsvcs/Naming/Naming_Utils.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
class Distributer_Receiver_Callback : public TAO_AV_Callback
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
index 55d31695179..73d30316424 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h
@@ -18,10 +18,10 @@
//
// ============================================================================
-#include "orbsvcs/Naming/Naming_Utils.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
class Receiver_Callback : public TAO_AV_Callback
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
index 29837f9dca7..5fbcc6818ec 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h
@@ -18,10 +18,10 @@
//
// ============================================================================
-#include "orbsvcs/Naming/Naming_Utils.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
index 0ef6bc0defd..58d7eea5b2a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
@@ -18,10 +18,10 @@
//
// ============================================================================
-#include "orbsvcs/Naming/Naming_Utils.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
class Receiver_Callback : public TAO_AV_Callback
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
index 64ceca0cc3b..2ae3cac1248 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h
@@ -18,10 +18,10 @@
//
// ============================================================================
-#include "orbsvcs/Naming/Naming_Utils.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
{
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
index 067c1c7f45b..45f88b35c04 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h
@@ -18,10 +18,10 @@
//
// ============================================================================
-#include "orbsvcs/Naming/Naming_Utils.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Policy.h"
class Receiver_Callback : public TAO_AV_Callback
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
index 461c84750d3..6d92b5776d2 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h
@@ -18,10 +18,10 @@
//
// ============================================================================
-#include "orbsvcs/Naming/Naming_Utils.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/AV/AVStreams_i.h"
+#include "orbsvcs/orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/orbsvcs/AV/Protocol_Factory.h"
class Sender_StreamEndPoint : public TAO_Client_StreamEndPoint
{
diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
index 039612ba778..abf409ea9c8 100644
--- a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
+++ b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
@@ -2,12 +2,12 @@
// $Id$
//
-#include <tao/corba.h>
-#include "IFR_Client/IFR_BasicC.h"
+#include "tao/NVList.h"
+#include "tao/IFR_Client/IFR_BasicC.h"
#include "ace/OS_NS_string.h"
-int main( int argc, char* argv[] )
-{
+int main (int argc, char* argv[])
+{
ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY_NEW_ENV
{
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.h b/TAO/orbsvcs/tests/Concurrency/CC_client.h
index a81df69daa0..5c945b65f10 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_client.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_client.h
@@ -24,8 +24,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosConcurrencyControlC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "CC_tests.h"
#include "CC_naming_service.h"
#include "CC_command.h"
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
index b26b31e4c79..d1f5cc64d3c 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
@@ -20,10 +20,12 @@
#include "CC_naming_service.h"
#include "ace/ACE.h"
#include "ace/Process.h"
-#include "orbsvcs/CosConcurrencyControlC.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h"
#include "ace/OS_NS_stdio.h"
-ACE_RCSID(Concurrency, CC_command, "$Id$")
+ACE_RCSID (Concurrency,
+ CC_command,
+ "$Id$")
CC_Command::~CC_Command(void)
{
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.h b/TAO/orbsvcs/tests/Concurrency/CC_command.h
index 735d38d7c21..9992d80c6f7 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.h
@@ -20,7 +20,7 @@
//
// ============================================================================
-#include "orbsvcs/CosConcurrencyControlC.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h"
#ifndef _CC_COMMAND_H_
#define _CC_COMMAND_H_
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp
index 8a67df0eb67..2b161c63d94 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp
@@ -30,7 +30,7 @@
#include "CC_command.h"
#include "ace/ACE.h"
-#include "orbsvcs/CosConcurrencyControlC.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h"
#include "ace/OS_NS_stdio.h"
void ace_cc_yyerror (const char* s);
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
index 6c04a55541c..3dfbcff8b44 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h
@@ -18,9 +18,9 @@
//
// ============================================================================
-#include "orbsvcs/CosConcurrencyControlC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
#ifndef _CC_NAMING_SERVICE_H_
#define _CC_NAMING_SERVICE_H_
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h
index 4c1a643f863..95a4605d582 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h
@@ -17,7 +17,7 @@
//
// ============================================================================
-#include "orbsvcs/CosConcurrencyControlC.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h"
#ifndef _CC_TEST_UTILS_H_
#define _CC_TEST_UTILS_H_
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.h b/TAO/orbsvcs/tests/Concurrency/CC_tests.h
index 9f0083fd2ad..7417c23235d 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_tests.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.h
@@ -18,8 +18,8 @@
//
// ============================================================================
-#include "orbsvcs/CosConcurrencyControlC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosConcurrencyControlC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "CC_naming_service.h"
#ifndef _CC_TESTS_H_
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
index 14bff5925b2..7b6b3cb0345 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
@@ -3,11 +3,13 @@
#include "Counting_Supplier.h"
#include "Counting_Consumer.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h"
-ACE_RCSID(CEC_Tests, Disconnect, "$Id$")
+ACE_RCSID (CEC_Tests,
+ Disconnect,
+ "$Id$")
static void run_test (PortableServer::POA_ptr poa,
int use_callbacks
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
index 5587b6584fd..a31c7a75652 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
@@ -4,10 +4,12 @@
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h"
-ACE_RCSID(CEC_Tests, MT_Disconnect, "$Id$")
+ACE_RCSID (CEC_Tests,
+ MT_Disconnect,
+ "$Id$")
static void run_test (PortableServer::POA_ptr poa,
int use_callbacks
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
index 06a263e9178..a6e077c91cc 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
@@ -18,7 +18,7 @@
#define CEC_MT_DISCONNECT_H
#include "ace/Task.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
index 9f117d025b3..c2a6af2ac0c 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
@@ -2,10 +2,12 @@
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h"
-ACE_RCSID(CEC_Tests_Basic, Pull_Push_Event, "$Id$")
+ACE_RCSID (CEC_Tests_Basic,
+ Pull_Push_Event,
+ "$Id$")
int
main (int argc, char* argv[])
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
index f4fffebd1ad..48bc4698622 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
@@ -2,10 +2,12 @@
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h"
-ACE_RCSID(CEC_Tests_Basic, Push_Event, "$Id$")
+ACE_RCSID (CEC_Tests_Basic,
+ Push_Event,
+ "$Id$")
int
main (int argc, char* argv[])
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
index 7d9019d5bba..e63f132d34e 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
@@ -1,12 +1,14 @@
// $Id$
#include "Random.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h"
#include "ace/Arg_Shifter.h"
#include "ace/OS_NS_strings.h"
-ACE_RCSID(CEC_Tests, Random, "$Id$")
+ACE_RCSID (CEC_Tests,
+ Random,
+ "$Id$")
int
main (int argc, char* argv[])
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
index 450fe418668..d40b29ab84a 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h
@@ -17,8 +17,8 @@
#ifndef EC_RANDOM_H
#define EC_RANDOM_H
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
#include "ace/Task.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
index b69af879380..2a63a37184c 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
@@ -2,10 +2,12 @@
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h"
-ACE_RCSID(CEC_Tests_Basic, Shutdown, "$Id$")
+ACE_RCSID( CEC_Tests_Basic,
+ Shutdown,
+ "$Id$")
static void run_test (PortableServer::POA_ptr poa,
int with_callbacks
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
index d3ec2cbbb33..fbcc070662d 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h
@@ -23,8 +23,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
#include "ace/Task.h"
class CEC_Test_Export CEC_Counting_Consumer : public POA_CosEventComm::PushConsumer
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
index 5f557db27ee..c33b963a13e 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h
@@ -23,8 +23,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
#include "ace/Task.h"
class CEC_Test_Export CEC_Counting_Supplier : public POA_CosEventComm::PushSupplier
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
index 5dff1412a09..7dc5636bc8e 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
@@ -3,10 +3,10 @@
#include "ECM_Consumer.h"
#include "ECM_Data.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "tao/Timeprobe.h"
#include "tao/ORB_Core.h"
@@ -16,7 +16,9 @@
#include "ace/Sched_Params.h"
#include "ace/OS_NS_errno.h"
-ACE_RCSID(EC_Custom_Marshal, ECM_Consumer, "$Id$")
+ACE_RCSID (EC_Custom_Marshal,
+ ECM_Consumer,
+ "$Id$")
int
main (int argc, char *argv [])
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
index 1d0adde39fd..5b266e18c7b 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
@@ -17,8 +17,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/Channel_Clients_T.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Channel_Clients_T.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
#include "ace/OS_NS_time.h"
class Driver;
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
index 8bf2e961486..8c75e9e584c 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
@@ -6,10 +6,10 @@
#include "ace/ACE.h"
#include "tao/Timeprobe.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "ECM_Supplier.h"
#include "ECM_Data.h"
#include "ace/OS_NS_errno.h"
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
index 10b3adb9270..1aa98e8bea8 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h
@@ -17,7 +17,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/Channel_Clients_T.h"
+#include "orbsvcs/orbsvcs/Channel_Clients_T.h"
class ECMS_Driver;
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h
index 232f63a5071..d0be5f4851c 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h
@@ -5,7 +5,7 @@
#define ADDRSERVER_H
#include /**/ "ace/pre.h"
-#include "orbsvcs/RtecUDPAdminS.h"
+#include "orbsvcs/orbsvcs/RtecUDPAdminS.h"
class AddrServer : public POA_RtecUDPAdmin::AddrServer
{
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
index 23e8b6b0e2a..b43c33fd181 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
@@ -2,8 +2,8 @@
// Reused from: $TAO_ROOT/orbsvcs/examples/RtEC/MCast
#include "Consumer.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
ACE_RCSID(EC_MT_Mcast,
Consumer,
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
index 1e1d9fdaa17..415b4b19eea 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h
@@ -4,8 +4,8 @@
#ifndef CONSUMER_H
#define CONSUMER_H
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
index 9db402234b0..70c0d65a892 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
@@ -4,13 +4,13 @@
#include "Consumer.h"
#include "Supplier.h"
#include "AddrServer.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/Event/ECG_Mcast_EH.h"
-#include "orbsvcs/Event/ECG_UDP_Sender.h"
-#include "orbsvcs/Event/ECG_UDP_Receiver.h"
-#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h"
+#include "orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h"
+#include "orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h"
+#include "orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h"
#include "tao/ORB_Core.h"
#include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
index 851d74512e0..38ee3a1f8f5 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
@@ -2,8 +2,8 @@
// Reused from: $TAO_ROOT/orbsvcs/examples/RtEC/MCast
#include "Supplier.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
ACE_RCSID(EC_MT_Mcast,
Supplier,
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
index 8f9f50f2a87..b2618c5d810 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h
@@ -4,8 +4,8 @@
#ifndef SUPPLIER_H
#define SUPPLIER_H
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index 32c71519685..f7524e538ac 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -2,12 +2,12 @@
#include "EC_Mcast.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
#include "tao/ORB_Core.h"
@@ -21,7 +21,9 @@
#include "EC_Mcast.i"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(EC_Mcast, EC_Mcast, "$Id$")
+ACE_RCSID (EC_Mcast,
+ EC_Mcast,
+ "$Id$")
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
template class ACE_PushConsumer_Adapter<ECM_Supplier>;
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
index a1044cb15aa..c7e4d93e777 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
@@ -53,15 +53,15 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "ace/High_Res_Timer.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/Channel_Clients_T.h"
-#include "orbsvcs/Event/ECG_UDP_Sender.h"
-#include "orbsvcs/Event/EC_UDP_Admin.h"
-#include "orbsvcs/Event/ECG_Mcast_EH.h"
-#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.h"
-#include "orbsvcs/Event/ECG_UDP_Receiver.h"
-#include "orbsvcs/Event/ECG_UDP_Sender.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/Channel_Clients_T.h"
+#include "orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h"
+#include "orbsvcs/orbsvcs/Event/EC_UDP_Admin.h"
+#include "orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h"
+#include "orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h"
+#include "orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h"
+#include "orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h"
class ECM_Driver;
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index ad32b062a54..1f2e5c7c3a4 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -6,14 +6,14 @@
#include "Scheduler_Runtime2.h"
#include "Scheduler_Runtime_Dynamic.h" /* infos_3 */
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/Sched/Config_Scheduler.h"
-#include "orbsvcs/Runtime_Scheduler.h"
-#include "orbsvcs/Event/Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Sched/Config_Scheduler.h"
+#include "orbsvcs/orbsvcs/Runtime_Scheduler.h"
+#include "orbsvcs/orbsvcs/Event/Event_Channel.h"
#include "tao/ORB_Core.h"
@@ -27,7 +27,9 @@
# include <sys/lwp.h> /* for _lwp_self */
#endif /* sun */
-ACE_RCSID(EC_Multiple, EC_Multiple, "$Id$")
+ACE_RCSID (EC_Multiple,
+ EC_Multiple,
+ "$Id$")
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
template class ACE_Auto_Basic_Ptr<POA_RtecScheduler::Scheduler>;
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
index 4bf7784e0cd..e3491190859 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h
@@ -23,11 +23,11 @@
#include "ace/High_Res_Timer.h"
#include "ace/Condition_Thread_Mutex.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/Channel_Clients_T.h"
-#include "orbsvcs/Event/EC_Gateway_Sched.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/Channel_Clients_T.h"
+#include "orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
class Test_ECG;
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h
index a6de5dd6f1d..d5e25a0cafa 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime1.h
@@ -2,7 +2,7 @@
// before editing the file please consider generating it again
// $Id$
-#include "orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
static ACE_Scheduler_Factory::POD_RT_Info runtime_infos_1[] = {
{ "Reactor_Task-25000.us", 1, 0, 0, 0, 250000,
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h
index 44b87de3f80..3e89bc2e87b 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime2.h
@@ -2,7 +2,7 @@
// before editing the file please consider generating it again
// $Id$
-#include "orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
static ACE_Scheduler_Factory::POD_RT_Info runtime_infos_2[] = {
{ "Reactor_Task-25000.us", 1, 0, 0, 0, 250000,
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h
index 86089e80ff4..44a0458b555 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h
+++ b/TAO/orbsvcs/tests/EC_Multiple/Scheduler_Runtime_Dynamic.h
@@ -2,7 +2,7 @@
// before editing the file please consider generating it again
// $Id$
-#include "orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
static ACE_Scheduler_Factory::POD_RT_Info runtime_infos_3[] = {
{ "Reactor_Task-25000.us", 1, 0, 0, 0, 250000, (RtecScheduler::Criticality_t) 4, (RtecScheduler::Importance_t) 0, 0, 1, 59, 1022, 0, (RtecScheduler::Info_Type_t) 0 , (RtecScheduler::RT_Info_Enabled_Type_t) RtecScheduler::RT_INFO_ENABLED },
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
index 171604e78f2..548da9e2e8b 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
@@ -2,9 +2,9 @@
#include "ECT_Consumer.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
#include "tao/Timeprobe.h"
#include "tao/debug.h"
@@ -13,7 +13,9 @@
#include "ace/Auto_Ptr.h"
#include "ace/Sched_Params.h"
-ACE_RCSID(EC_Throughput, ECT_Consumer, "$Id$")
+ACE_RCSID (EC_Throughput,
+ ECT_Consumer,
+ "$Id$")
Test_Consumer::Test_Consumer (ECT_Driver *driver,
void *cookie,
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
index 6a086b38087..e5c69dd1ad5 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
@@ -19,9 +19,9 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/Channel_Clients_T.h"
-#include "orbsvcs/RtecSchedulerC.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Channel_Clients_T.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
#include "ace/Task.h"
#include "ace/OS_NS_time.h"
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
index 6de28a3c6d7..366639f8332 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
@@ -2,10 +2,10 @@
#include "ECT_Consumer_Driver.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
#include "tao/Timeprobe.h"
#include "tao/debug.h"
@@ -16,7 +16,9 @@
#include "ace/OS_NS_errno.h"
#include "ace/OS_NS_unistd.h"
-ACE_RCSID(EC_Throughput, ECT_Consumer_Driver, "$Id$")
+ACE_RCSID (EC_Throughput,
+ ECT_Consumer_Driver,
+ "$Id$")
int
main (int argc, char *argv [])
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
index 4af70e0f7a8..ba33ea4adef 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
@@ -20,8 +20,8 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "ECT_Consumer.h"
-#include "orbsvcs/Channel_Clients_T.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Channel_Clients_T.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
#include "ace/Task.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
index 7fe13479187..06d0710174d 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
@@ -2,9 +2,9 @@
#include "ECT_Supplier.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
#include "tao/Timeprobe.h"
#include "tao/debug.h"
@@ -15,7 +15,9 @@
#include "ace/High_Res_Timer.h"
#include "ace/ACE.h"
-ACE_RCSID(EC_Throughput, ECT_Supplier, "$Id$")
+ACE_RCSID (EC_Throughput,
+ ECT_Supplier,
+ "$Id$")
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
template class ACE_PushSupplier_Adapter<Test_Supplier>;
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
index 17fbcb8ce02..ee5dcf255d2 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
@@ -18,9 +18,9 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/Channel_Clients_T.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/RtecSchedulerC.h"
+#include "orbsvcs/orbsvcs/Channel_Clients_T.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecSchedulerC.h"
#include "ace/Task.h"
class Test_Supplier : public ACE_Task<ACE_SYNCH>
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
index 0bb6d9422af..082b1bfa826 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
@@ -2,10 +2,10 @@
#include "ECT_Supplier_Driver.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
#include "tao/Timeprobe.h"
#include "tao/debug.h"
@@ -16,7 +16,9 @@
#include "ace/OS_NS_errno.h"
#include "ace/OS_NS_unistd.h"
-ACE_RCSID(EC_Throughput, ECT_Supplier_Driver, "$Id$")
+ACE_RCSID (EC_Throughput,
+ ECT_Supplier_Driver,
+ "$Id$")
int
main (int argc, char *argv [])
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
index e51f0f73551..e295690f6e5 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
@@ -19,7 +19,7 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "ace/High_Res_Timer.h"
-#include "orbsvcs/Channel_Clients_T.h"
+#include "orbsvcs/orbsvcs/Channel_Clients_T.h"
#include "ECT_Driver.h"
#include "ECT_Supplier.h"
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index fd2ffe3273b..21fe2ee77e3 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -2,16 +2,16 @@
#include "ECT_Throughput.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Sched/Config_Scheduler.h"
-#include "orbsvcs/Runtime_Scheduler.h"
-#include "orbsvcs/Event/Event_Channel.h"
-#include "orbsvcs/Event/Module_Factory.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Sched/Config_Scheduler.h"
+#include "orbsvcs/orbsvcs/Runtime_Scheduler.h"
+#include "orbsvcs/orbsvcs/Event/Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/Module_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
#include "tao/Timeprobe.h"
#include "tao/debug.h"
@@ -23,7 +23,9 @@
#include "ace/OS_NS_strings.h"
#include "ace/OS_NS_errno.h"
-ACE_RCSID(EC_Throughput, ECT_Throughput, "$Id$")
+ACE_RCSID (EC_Throughput,
+ ECT_Throughput,
+ "$Id$")
int
main (int argc, char *argv [])
diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
index 5130896ad70..2829947df81 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
@@ -3,12 +3,14 @@
#include "Atomic_Reconnect.h"
#include "Counting_Supplier.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-
-ACE_RCSID(EC_Tests, Atomic_Reconnect, "$Id$")
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+
+ACE_RCSID (EC_Tests,
+ Atomic_Reconnect,
+ "$Id$")
const int event_type = 20;
const int event_source = 10;
diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h
index 6aafd6e9dce..93b84af5c2d 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h
@@ -14,7 +14,7 @@
#define EC_ATOMIC_RECONNECT_H
#include "Counting_Consumer.h"
-#include "orbsvcs/Channel_Clients.h"
+#include "orbsvcs/orbsvcs/Channel_Clients.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
index 5ab0bd4a842..4e085a1df56 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
@@ -3,12 +3,14 @@
#include "BCast.h"
#include "Consumer.h"
#include "Supplier.h"
-#include "orbsvcs/Event/ECG_Mcast_Gateway.h"
+#include "orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h"
#include "tao/ORB_Core.h"
#include "ace/Arg_Shifter.h"
#include "ace/INET_Addr.h"
-ACE_RCSID(EC_Tests_Basic, BCast, "$Id$")
+ACE_RCSID (EC_Tests_Basic,
+ BCast,
+ "$Id$")
int
main (int argc, char *argv [])
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.h b/TAO/orbsvcs/tests/Event/Basic/BCast.h
index 8cbcfa4c368..5ec95b193a8 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.h
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.h
@@ -14,7 +14,7 @@
#define EC_BCAST_H
#include "Driver.h"
-#include "orbsvcs/RtecUDPAdminS.h"
+#include "orbsvcs/orbsvcs/RtecUDPAdminS.h"
class ACE_INET_Addr;
diff --git a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
index c34c27eea06..2e9c750ccf5 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
@@ -3,12 +3,14 @@
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-
-ACE_RCSID(EC_Tests, Bitmask, "$Id$")
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+
+ACE_RCSID (EC_Tests,
+ Bitmask,
+ "$Id$")
int
main (int argc, char* argv[])
diff --git a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
index 05ed9b5f448..5beec0820a2 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
@@ -2,12 +2,14 @@
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-
-ACE_RCSID(EC_Tests, Complex, "$Id$")
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+
+ACE_RCSID (EC_Tests,
+ Complex,
+ "$Id$")
int
main (int argc, char* argv[])
diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp
index dd6efb09e13..0ccb01763af 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp
@@ -3,12 +3,14 @@
#include "Control.h"
#include "Counting_Supplier.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-
-ACE_RCSID(EC_Tests, Control, "$Id$")
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+
+ACE_RCSID (EC_Tests,
+ Control,
+ "$Id$")
const int event_type = 20;
const int event_source = 10;
diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.h b/TAO/orbsvcs/tests/Event/Basic/Control.h
index 2df1cb7e3ea..ac641891b4b 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Control.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Control.h
@@ -14,7 +14,7 @@
#define EC_CONTROL_H
#include "Counting_Consumer.h"
-#include "orbsvcs/Channel_Clients.h"
+#include "orbsvcs/orbsvcs/Channel_Clients.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
index 124ffcb5e2e..425e6b97eca 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
@@ -3,12 +3,14 @@
#include "Counting_Supplier.h"
#include "Counting_Consumer.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-
-ACE_RCSID(EC_Tests, Disconnect, "$Id$")
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+
+ACE_RCSID (EC_Tests,
+ Disconnect,
+ "$Id$")
static void run_test (PortableServer::POA_ptr poa,
int use_callbacks
diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
index 25823fbe628..d908603bb20 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
@@ -2,13 +2,15 @@
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/Event/EC_Gateway_IIOP.h"
-
-ACE_RCSID(EC_Tests, Gateway, "$Id$")
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h"
+
+ACE_RCSID (EC_Tests,
+ Gateway,
+ "$Id$")
int
main (int argc, char* argv[])
diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
index 28b60cf41bf..f2349ee5a21 100644
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
@@ -4,12 +4,14 @@
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-
-ACE_RCSID(EC_Tests, MT_Disconnect, "$Id$")
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+
+ACE_RCSID (EC_Tests,
+ MT_Disconnect,
+ "$Id$")
static void run_test (PortableServer::POA_ptr poa,
int use_callbacks
diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h
index 06855260d66..03e058934e1 100644
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h
+++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h
@@ -14,7 +14,7 @@
#define EC_MT_DISCONNECT_H
#include "ace/Task.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
index e94876eff99..44a50a10b13 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
@@ -3,12 +3,14 @@
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-
-ACE_RCSID(EC_Tests, Negation, "$Id$")
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+
+ACE_RCSID (EC_Tests,
+ Negation,
+ "$Id$")
int
main (int argc, char* argv[])
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
index 8ea3d55d74b..58253b839bd 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
@@ -3,12 +3,14 @@
#include "Observer.h"
#include "Consumer.h"
#include "Supplier.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
#include "ace/Arg_Shifter.h"
#include "ace/High_Res_Timer.h"
-ACE_RCSID(EC_Tests_Basic, Observer, "$Id$")
+ACE_RCSID (EC_Tests_Basic,
+ Observer,
+ "$Id$")
int
main (int argc, char *argv [])
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.h b/TAO/orbsvcs/tests/Event/Basic/Observer.h
index bb788c01258..13ae141293c 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.h
@@ -14,7 +14,7 @@
#define EC_OBSERVER_H
#include "Driver.h"
-#include "orbsvcs/Event/EC_Gateway_IIOP.h"
+#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
index 6217f46081e..44a4f2cb1d2 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
@@ -1,14 +1,16 @@
// $Id$
#include "Random.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
#include "ace/Arg_Shifter.h"
#include "ace/OS_NS_strings.h"
-ACE_RCSID(EC_Tests, Random, "$Id$")
+ACE_RCSID (EC_Tests,
+ Random,
+ "$Id$")
int
main (int argc, char* argv[])
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.h b/TAO/orbsvcs/tests/Event/Basic/Random.h
index 22fd387192b..727806f0be0 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Random.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Random.h
@@ -13,8 +13,8 @@
#ifndef EC_RANDOM_H
#define EC_RANDOM_H
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
#include "ace/Task.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
index 8e80572c29e..ba63f91ba2d 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
@@ -3,11 +3,13 @@
#include "Reconnect.h"
#include "Consumer.h"
#include "Supplier.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
#include "ace/Get_Opt.h"
#include "ace/High_Res_Timer.h"
-ACE_RCSID(EC_Tests_Basic, Reconnect, "$Id$")
+ACE_RCSID (EC_Tests_Basic,
+ Reconnect,
+ "$Id$")
int
main (int argc, char *argv [])
diff --git a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
index 682b11a8606..79fbf4580fe 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
@@ -3,12 +3,14 @@
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-
-ACE_RCSID(EC_Tests, Timeout, "$Id$")
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+
+ACE_RCSID (EC_Tests,
+ Timeout,
+ "$Id$")
// ****************************************************************
diff --git a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
index 30690628e96..868ff9b95f2 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
@@ -2,12 +2,14 @@
#include "Counting_Consumer.h"
#include "Counting_Supplier.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-
-ACE_RCSID(EC_Tests, Wildcard, "$Id$")
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+
+ACE_RCSID (EC_Tests,
+ Wildcard,
+ "$Id$")
int
main (int argc, char* argv[])
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
index 5fe05170a84..33207f3d371 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp
@@ -1,7 +1,7 @@
// $Id$
#include "EC_Wrapper.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
#include "ace/Auto_Ptr.h"
EC_Wrapper::EC_Wrapper (void)
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
index a8421c9334e..22b1f7a328e 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
@@ -4,8 +4,8 @@
#ifndef EC_WRAPPER_H
#define EC_WRAPPER_H
-#include "orbsvcs/RtecEventChannelAdminS.h"
-#include "orbsvcs/Event/EC_Lifetime_Utils_T.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h"
#include "ECMcastTests_export.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
index f2d62bc26f2..dfa129ef6c4 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
@@ -1,9 +1,9 @@
// $Id$
#include "Gateway_EC.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/Event/ECG_Mcast_Gateway.h"
-#include "orbsvcs/Event/EC_Lifetime_Utils_T.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h"
+#include "orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h"
#include "ace/Get_Opt.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
index 2f1ef4de6dc..ffdb42a1858 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
@@ -1,7 +1,7 @@
// $Id$
#include "Constants.h"
-#include "orbsvcs/Event/EC_Lifetime_Utils_T.h"
+#include "orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h"
#include "orbsvcs/orbsvcs/Event_Utilities.h"
#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
#include "orbsvcs/orbsvcs/RtecEventCommS.h"
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
index 087bf7f3831..1860291e40d 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
@@ -3,12 +3,14 @@
#include "Connect.h"
#include "Consumer.h"
#include "Supplier.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
#include "ace/Arg_Shifter.h"
#include "ace/High_Res_Timer.h"
#include "ace/OS_NS_strings.h"
-ACE_RCSID(EC_Tests_Performance, Connect, "$Id$")
+ACE_RCSID (EC_Tests_Performance,
+ Connect,
+ "$Id$")
int
main (int argc, char *argv [])
diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
index cb09add9977..b1f33edb93b 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
@@ -3,12 +3,14 @@
#include "Inversion.h"
#include "Consumer.h"
#include "Supplier.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
#include "ace/Sched_Params.h"
#include "ace/Arg_Shifter.h"
-ACE_RCSID(EC_Tests_Performance, Inversion, "$Id$")
+ACE_RCSID (EC_Tests_Performance,
+ Inversion,
+ "$Id$")
int
main (int argc, char *argv [])
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
index 23c11650fd9..7d0a54f78c6 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
@@ -1,7 +1,7 @@
// $Id$
#include "Latency.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
#include "tao/Messaging/Messaging.h"
#include "tao/Strategies/advanced_resource.h"
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.h b/TAO/orbsvcs/tests/Event/Performance/Latency.h
index 3b6880e36b5..365e21bcf2c 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.h
@@ -17,8 +17,8 @@
#ifndef EC_LATENCY_H
#define EC_LATENCY_H
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
#include "ace/Task.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
index 875bbf1803d..0b79f385e8a 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
@@ -1,7 +1,7 @@
// $Id$
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
#include "tao/Messaging/Messaging.h"
#include "tao/Strategies/advanced_resource.h"
diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
index 1ebbb09a649..31ae3910a5d 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
@@ -3,10 +3,12 @@
#include "Throughput.h"
#include "Consumer.h"
#include "Supplier.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
#include "ace/Get_Opt.h"
-ACE_RCSID(EC_Tests_Performance, Throughput, "$Id$")
+ACE_RCSID (EC_Tests_Performance,
+ Throughput,
+ "$Id$")
int
main (int argc, char *argv [])
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
index ed9c16e3de3..3be234ab90f 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
@@ -1,12 +1,14 @@
// $Id$
#include "Consumer.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
#include "tao/debug.h"
-ACE_RCSID(EC_Tests, EC_Consumer, "$Id$")
+ACE_RCSID (EC_Tests,
+ EC_Consumer,
+ "$Id$")
EC_Consumer::EC_Consumer (EC_Driver *driver,
void *cookie)
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.h b/TAO/orbsvcs/tests/Event/lib/Consumer.h
index 439b95f9747..ce3c6678d39 100644
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.h
+++ b/TAO/orbsvcs/tests/Event/lib/Consumer.h
@@ -19,8 +19,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
#include "ace/OS_NS_time.h"
/**
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
index 06878cb4b9f..482a9afc68e 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h
@@ -19,8 +19,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
/**
* @class EC_Counting_Consumer
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
index 838f3b35e7c..712c6a15215 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp
@@ -1,10 +1,12 @@
// $Id$
#include "Counting_Supplier.h"
-#include "orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
#include "ace/OS_NS_unistd.h"
-ACE_RCSID(EC_Tests, EC_Count_Supplier, "$Id$")
+ACE_RCSID (EC_Tests,
+ EC_Count_Supplier,
+ "$Id$")
EC_Counting_Supplier::EC_Counting_Supplier (void)
: event_count (0),
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
index cc76b3a6e91..da4b7f67172 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h
@@ -19,8 +19,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/Channel_Clients.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Channel_Clients.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
#include "ace/Task.h"
/**
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index 172264d2acd..22b59188f7f 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -4,10 +4,10 @@
#include "Consumer.h"
#include "Supplier.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.h b/TAO/orbsvcs/tests/Event/lib/Driver.h
index c902b4a7052..b6165e14ab4 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.h
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.h
@@ -19,7 +19,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
#include "ace/Stats.h"
#include "ace/Task.h"
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
index 8424216bd5c..97a49df7d5d 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
@@ -1,13 +1,15 @@
// $Id$
#include "Supplier.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
#include "tao/debug.h"
#include "ace/OS_NS_unistd.h"
-ACE_RCSID(EC_Tests, EC_Supplier, "$Id$")
+ACE_RCSID (EC_Tests,
+ EC_Supplier,
+ "$Id$")
EC_Supplier::EC_Supplier (EC_Driver *driver,
void* cookie)
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.h b/TAO/orbsvcs/tests/Event/lib/Supplier.h
index 065a20a15aa..9f4b5820fb1 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.h
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.h
@@ -19,8 +19,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
#include "ace/Task.h"
#include "ace/OS_NS_time.h"
diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp
index af2524a1fe1..9f5c9a92aac 100644
--- a/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp
@@ -13,7 +13,7 @@
//=============================================================================
#include <tao/Utils/Server_Main.h>
-#include <orbsvcs/PortableGroup/PG_FactoryRegistry.h>
+#include <orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h>
int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
{
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
index 8ca927d77a0..193ef991fb8 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
@@ -15,7 +15,7 @@
#include "FT_Creator.h"
// FUZZ: disable check_for_streams_include
#include "ace/streams.h"
-#include <orbsvcs/PortableGroup/PG_Properties_Encoder.h>
+#include <orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h>
#include <ace/Get_Opt.h>
#include <ace/OS_NS_stdio.h>
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
index 45b1e7753fb..c608a890b89 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
@@ -13,10 +13,10 @@
#include "FT_ReplicaFactory_i.h"
#include "FT_TestReplica_i.h"
#include <ace/Get_Opt.h>
-#include <orbsvcs/CosNamingC.h>
-#include <orbsvcs/PortableGroupC.h>
+#include <orbsvcs/orbsvcs/CosNamingC.h>
+#include <orbsvcs/orbsvcs/PortableGroupC.h>
#include <tao/PortableServer/ORB_Manager.h>
-#include <orbsvcs/PortableGroup/PG_Property_Set.h>
+#include <orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h>
// Use this macro at the beginning of CORBA methods
// to aid in debugging.
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
index a2bc85e5f80..0db1f6d948c 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h
@@ -30,7 +30,7 @@ class FT_ReplicaFactory_i;
#include <ace/Vector_T.h>
#include "FT_TestReplicaS.h"
#include <ace/Thread_Manager.h>
-#include <orbsvcs/FT_ReplicationManagerC.h>
+#include <orbsvcs/orbsvcs/FT_ReplicationManagerC.h>
/////////////////////
// Forward references
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
index 128f6e86531..b79e5fe3ce0 100755
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
@@ -1,6 +1,6 @@
// $Id$
-#include "orbsvcs/FT_ReplicationManagerC.h"
+#include "orbsvcs/orbsvcs/FT_ReplicationManagerC.h"
#include <ace/Get_Opt.h>
// FUZZ: disable check_for_streams_include
#include "ace/streams.h"
diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica.idl b/TAO/orbsvcs/tests/FT_App/FT_TestReplica.idl
index b9d41ed7429..7df01cb3cfc 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica.idl
+++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica.idl
@@ -14,7 +14,7 @@
#ifndef FT_TESTREPLICA_IDL
#define FT_TESTREPLICA_IDL
-#include "orbsvcs/FT_Replica.idl"
+#include "orbsvcs/orbsvcs/FT_Replica.idl"
module FT_TEST
{
diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
index 0d0833f7755..b06a41469cb 100755
--- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
+++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h
@@ -10,8 +10,8 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include <orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h>
-#include <orbsvcs/FT_NotifierC.h>
-#include <orbsvcs/FT_FaultDetectorFactoryC.h>
+#include <orbsvcs/orbsvcs/FT_NotifierC.h>
+#include <orbsvcs/orbsvcs/FT_FaultDetectorFactoryC.h>
#include <ace/Vector_T.h>
/////////////////////
diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
index d81d9fa061c..d7183f6c7f0 100644
--- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h
@@ -10,8 +10,8 @@
#pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include <orbsvcs/CosNotifyChannelAdminS.h>
-#include <orbsvcs/FT_NotifierC.h>
+#include <orbsvcs/orbsvcs/CosNotifyChannelAdminS.h>
+#include <orbsvcs/orbsvcs/FT_NotifierC.h>
//////////////////////
// Forward references
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
index c71354f88d0..f0cd42c8c18 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
@@ -5,7 +5,7 @@
#include "StubFaultAnalyzer.h"
#include <ace/Get_Opt.h>
#include <tao/PortableServer/ORB_Manager.h>
-#include <orbsvcs/PortableGroup/PG_Properties_Encoder.h>
+#include <orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h>
// FUZZ: disable check_for_streams_include
#include "ace/streams.h"
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
index 7da34e52cba..d617e9c4845 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h
@@ -12,8 +12,8 @@
#include "StubFaultConsumer.h"
#include "StubBatchConsumer.h"
-#include <orbsvcs/FT_NotifierC.h>
-#include <orbsvcs/FT_FaultDetectorFactoryC.h>
+#include <orbsvcs/orbsvcs/FT_NotifierC.h>
+#include <orbsvcs/orbsvcs/FT_FaultDetectorFactoryC.h>
#include "ace/Vector_T.h"
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
index 374b2e7b588..630bad0d6e9 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h
@@ -10,8 +10,8 @@
#pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include <orbsvcs/FT_NotifierC.h>
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include <orbsvcs/orbsvcs/FT_NotifierC.h>
//////////////////////
// Forward references
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
index b939dbdf74b..32e738a8b92 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h
@@ -11,8 +11,8 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include /**/ <ace/pre.h>
-#include <orbsvcs/FT_NotifierS.h>
-#include <orbsvcs/FT_FaultDetectorFactoryC.h>
+#include <orbsvcs/orbsvcs/FT_NotifierS.h>
+#include <orbsvcs/orbsvcs/FT_FaultDetectorFactoryC.h>
#include <ace/Vector_T.h>
//////////////////////
diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
index 64dfe677f67..c8326896681 100644
--- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
@@ -14,9 +14,9 @@
#include "TAO_Object_Group_Creator.h"
#include <ace/OS_NS_stdio.h>
-#include <orbsvcs/PortableGroup/PG_Properties_Encoder.h>
-#include <orbsvcs/FT_FaultDetectorFactoryC.h>
-#include <orbsvcs/PortableGroup/PG_Operators.h>
+#include <orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h>
+#include <orbsvcs/orbsvcs/FT_FaultDetectorFactoryC.h>
+#include <orbsvcs/orbsvcs/PortableGroup/PG_Operators.h>
#include <ace/Get_Opt.h>
diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
index 5bf6c6aae58..f987d0b45ac 100644
--- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
+++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
@@ -20,8 +20,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include <orbsvcs/FT_ReplicationManagerC.h>
-#include <orbsvcs/PortableGroupC.h>
+#include <orbsvcs/orbsvcs/FT_ReplicationManagerC.h>
+#include <orbsvcs/orbsvcs/PortableGroupC.h>
#include <ace/SString.h>
#include <ace/Vector_T.h>
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
index c03178bd0f0..b97637c874d 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
@@ -1,7 +1,7 @@
// -*- C++ -*-
#include "Server_Request_Interceptor.h"
-#include "orbsvcs/FT_CORBA_ORBC.h"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
#include "tao/ORB_Constants.h"
#include "testS.h"
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
index 82ac5cdec4b..800f6eacbfa 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
@@ -2,7 +2,7 @@
#include "ace/Get_Opt.h"
#include "testC.h"
-#include "orbsvcs/FaultTolerance/FT_Service_Activate.h"
+#include "orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h"
ACE_RCSID (Group_Ref_Manip,
client,
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
index ee1bd7e9d0e..5d959174ed5 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
@@ -10,9 +10,9 @@
#include "Server_Request_Interceptor.h"
#include "tao/IORManipulation/IORManipulation.h"
#include "tao/ORBInitializer_Registry.h"
-#include "orbsvcs/FaultTolerance/FT_Service_Activate.h"
-#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
-#include "orbsvcs/FT_CORBA_ORBC.h"
+#include "orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h"
+#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h"
+#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
ACE_RCSID (ForwardRequest,
server,
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
index e876e51290b..7d1740af1fb 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
@@ -6,12 +6,10 @@
#include "ace/Read_Buffer.h"
#include "tao/IORManipulation/IORManip_Loader.h"
#include "tao/PortableServer/PortableServer.h"
-#include "orbsvcs/FaultTolerance/FT_Service_Activate.h"
-#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
+#include "orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h"
+#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h"
#include "ace/OS_NS_stdio.h"
-
-
// Files which have the IOR
const char *first_ior = 0;
const char *second_ior = 0;
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
index c0120577eab..9d85a48410e 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
@@ -18,15 +18,13 @@
//=========================================================================
#include "tao/ORB.h"
-#include "orbsvcs/FT_CORBA_ORBC.h"
-#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
-
+#include "orbsvcs/orbsvcs/FT_CORBA_ORBC.h"
+#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h"
ACE_RCSID(IOGRManipluation,
IOGRTest,
"$Id$")
-
int
main (int argc, char *argv[])
{
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
index 89534672eff..a796bb9dbac 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
@@ -2,7 +2,7 @@
#include "ace/OS_NS_sys_time.h"
#include "PushConsumer.h"
-#include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
+#include "orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h"
#include <stdio.h>
ACE_RCSID (FtRtEvent,
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h
index b7daa9f35bd..6fdd67d1209 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.h
@@ -12,7 +12,7 @@
#ifndef PUSHCONSUMERIMPL_H
#define PUSHCONSUMERIMPL_H
-#include "orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
class PushConsumer_impl :
public virtual POA_RtecEventComm::PushConsumer
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
index 66d1da17a73..15ec5acd157 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
@@ -1,19 +1,18 @@
// $Id$
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
#include "PushSupplier.h"
#include "ace/Reactor.h"
#include "ace/Select_Reactor.h"
#include "tao/MProfile.h"
#include "tao/Stub.h"
-#include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
+#include "orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h"
ACE_RCSID (FtRtEvent,
PushSupplier,
"$Id$")
-
int
PushSupplier_impl::ReactorTask::svc (void)
{
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h
index 350a7d96708..e84f0b28e9c 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h
@@ -12,8 +12,8 @@
#ifndef PUSHSUPPLIER_H
#define PUSHSUPPLIER_H
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
#include "ace/Event_Handler.h"
#include "ace/Task.h"
#include "ace/Reactor.h"
diff --git a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
index 8fabe5d60d4..52afdd7fddb 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
@@ -1,18 +1,18 @@
// $Id$
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
-#include "orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
#include "PushConsumer.h"
#include "ace/Get_Opt.h"
-#include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
-#include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h"
+#include "orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h"
+#include "orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h"
/// include this file to statically linked with FT ORB
-#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
+#include "orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
/// include this file to statically linked with Transaction Depth
-#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h"
+#include "orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h"
ACE_RCSID (FtRtEvent,
PushConsumer,
diff --git a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
index a920d5d6910..d2383d84e9c 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
@@ -1,22 +1,21 @@
// $Id$
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/FtRtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/FtRtecEventChannelAdminC.h"
#include "PushSupplier.h"
#include "ace/Get_Opt.h"
-#include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
-#include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h"
+#include "orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h"
+#include "orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h"
/// include this file to statically linked with FT ORB
-#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
+#include "orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
/// include this file to statically linked with Transaction Depth
-#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h"
+#include "orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h"
ACE_RCSID (FtRtEvent,
supplier,
"$Id$")
-
ACE_Time_Value timer_interval(1,0);
CORBA::ORB_var orb;
auto_ptr<TAO_FTRTEC::FTEC_Gateway> gateway;
diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
index b885f1b28ed..defc5e21897 100644
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
@@ -2,7 +2,7 @@
// $Id$
//
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/InterfaceRepo_IDL3_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/InterfaceRepo_IDL3_Test.mpc
index 2b7c7a7429f..a34e2eafcf1 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/InterfaceRepo_IDL3_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/InterfaceRepo_IDL3_Test.mpc
@@ -4,6 +4,11 @@
project: taoexe, ifr_client {
avoids += minimum_corba
exename = IDL3_Test
+
+ Source_Files {
+ client.cpp
+ idl3_client.cpp
+ }
IDL_Files {
}
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
index 5180073acf4..eab444a49cd 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
@@ -1,6 +1,6 @@
#include "Basic_Log_Test.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
index 031c19ba769..e60b1ecddc5 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h
@@ -17,8 +17,8 @@
#ifndef TAO_BASIC_LOG_TEST_H
#define TAO_BASIC_LOG_TEST_H
-#include "orbsvcs/DsLogAdminC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/DsLogAdminC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
class BasicLog_Test
{
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
index 10eb9383368..6d96f438923 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
@@ -3,11 +3,13 @@
#include "ace/Arg_Shifter.h"
#include "ace/Get_Opt.h"
#include "tao/debug.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
#include "IdAssignment.h"
-ACE_RCSID (Notify_Tests, IdAssignment, "$Id$")
+ACE_RCSID (Notify_Tests,
+ IdAssignment,
+ "$Id$")
IdAssignment::IdAssignment (void)
: iter_ (3),
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
index 7b4a7e3920f..581fa2be9b5 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h
@@ -16,7 +16,7 @@
#ifndef IDASSIGNMENT_H
#define IDASSIGNMENT_H
-#include "orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
class IdAssignment
{
diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
index 34d526bf3d9..bf7a29af1e4 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
@@ -3,13 +3,15 @@
#include "ace/Arg_Shifter.h"
#include "ace/Get_Opt.h"
#include "tao/debug.h"
-#include <orbsvcs/CosNamingC.h>
-#include <orbsvcs/CosNotifyCommC.h>
-#include <orbsvcs/CosNotifyChannelAdminC.h>
+#include <orbsvcs/orbsvcs/CosNamingC.h>
+#include <orbsvcs/orbsvcs/CosNotifyCommC.h>
+#include <orbsvcs/orbsvcs/CosNotifyChannelAdminC.h>
#include "LifeCycle.h"
-ACE_RCSID (Notify_Tests, LifeCycle, "$Id$")
+ACE_RCSID (Notify_Tests,
+ LifeCycle,
+ "$Id$")
LifeCycle::LifeCycle (void)
: count_ (10)
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
index 19352ec0150..fd234dcc6e5 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
@@ -19,7 +19,7 @@
#include "Notify_Test_Client.h"
#include "Notify_SequencePushConsumer.h"
#include "Notify_SequencePushSupplier.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
#if defined(_MSC_VER)
#if (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
index c1fb14ec678..84254cda87b 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
@@ -1,7 +1,7 @@
// $Id$
#include "Notify_Structured_Push_Consumer.h"
-#include "orbsvcs/Notify/Notify_Extensions.h"
+#include "orbsvcs/orbsvcs/Notify/Notify_Extensions.h"
#include "common.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h
index 8041f156b35..86b160c2e0a 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.h
@@ -19,7 +19,7 @@
#define TAO_NOTIFY_STRUCTURED_PUSH_CONSUMER_H
#include "Notify_StructuredPushConsumer.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
class Notify_Structured_Push_Consumer: public TAO_Notify_Tests_StructuredPushConsumer
{
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
index 3992a28f441..6216ea6a384 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
@@ -6,9 +6,9 @@
#include "ace/Get_Opt.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
#include "Notify_Structured_Push_Consumer.h"
#include "goC.h"
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
index 03c7ce9214a..d1220a50e02 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
@@ -8,10 +8,10 @@
#include "tao/ORB_Core.h"
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
#include "Notify_StructuredPushSupplier.h"
#include "goS.h"
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/common.cpp b/TAO/orbsvcs/tests/Notify/Blocking/common.cpp
index c88d7dc082d..be72b75214f 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/common.cpp
@@ -2,8 +2,8 @@
#include "common.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/common.h b/TAO/orbsvcs/tests/Notify/Blocking/common.h
index 0e37aa80491..aaa7826b07f 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/common.h
+++ b/TAO/orbsvcs/tests/Notify/Blocking/common.h
@@ -18,7 +18,7 @@
#ifndef TAO_COMMON_H
#define TAO_COMMON_H
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
const char*
Any_String (const CORBA::Any& any);
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
index 85f6bd704d4..ab0fe8d5e43 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Sequence_Push_Consumer.cpp
@@ -1,7 +1,7 @@
// $Id$
#include "Notify_Sequence_Push_Consumer.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
#include "common.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
index e90987df064..8fbad2de53b 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
@@ -6,8 +6,8 @@
#include "ace/Get_Opt.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "Notify_Sequence_Push_Consumer.h"
#include "goC.h"
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
index 427fc996aea..79cf4ff3634 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
@@ -8,10 +8,10 @@
#include "tao/ORB_Core.h"
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
#include "Notify_SequencePushSupplier.h"
#include "goS.h"
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
index f7d72462486..b997fb9f27a 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
@@ -6,8 +6,8 @@
#include "ace/Get_Opt.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "Notify_Structured_Push_Consumer.h"
#include "goC.h"
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
index 47302392e00..050a2976d53 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
@@ -8,10 +8,10 @@
#include "tao/ORB_Core.h"
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
#include "Notify_StructuredPushSupplier.h"
#include "goS.h"
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/common.cpp b/TAO/orbsvcs/tests/Notify/Discarding/common.cpp
index c88d7dc082d..be72b75214f 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/common.cpp
@@ -2,8 +2,8 @@
#include "common.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/common.h b/TAO/orbsvcs/tests/Notify/Discarding/common.h
index 0e37aa80491..aaa7826b07f 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/common.h
+++ b/TAO/orbsvcs/tests/Notify/Discarding/common.h
@@ -18,7 +18,7 @@
#ifndef TAO_COMMON_H
#define TAO_COMMON_H
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
const char*
Any_String (const CORBA::Any& any);
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
index 1486816ff5e..5e7b8b6f034 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
@@ -6,8 +6,8 @@
#include "ace/Get_Opt.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "Notify_Structured_Push_Consumer.h"
#include "goC.h"
#include "ace/OS_NS_sys_time.h"
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
index f50a5bc3846..80f3d3ad428 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
@@ -8,9 +8,9 @@
#include "tao/ORB_Core.h"
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "Notify_StructuredPushSupplier.h"
#include "goS.h"
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
index 3b60cddc583..edbfadbf441 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Sequence_Push_Consumer.cpp
@@ -1,7 +1,7 @@
// $Id$
#include "Notify_Sequence_Push_Consumer.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
#include "common.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
index 4a0726e4d0c..b86efc47f25 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Notify_Structured_Push_Consumer.cpp
@@ -1,7 +1,7 @@
// $Id$
#include "Notify_Structured_Push_Consumer.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
#include "common.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
index 495f48ce04f..f7be5e1c8a7 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
@@ -6,8 +6,8 @@
#include "ace/Get_Opt.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "Notify_Sequence_Push_Consumer.h"
#include "goC.h"
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
index c28781d904d..a6fc0e42e2e 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
@@ -8,10 +8,10 @@
#include "tao/ORB_Core.h"
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
#include "Notify_SequencePushSupplier.h"
#include "goS.h"
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
index 2942fc5ed3f..6f778208274 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
@@ -6,8 +6,8 @@
#include "ace/Get_Opt.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "Notify_Structured_Push_Consumer.h"
#include "goC.h"
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
index eb2babf33ad..16e894b6c83 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
@@ -8,10 +8,10 @@
#include "tao/ORB_Core.h"
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
#include "Notify_StructuredPushSupplier.h"
#include "goS.h"
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/common.cpp b/TAO/orbsvcs/tests/Notify/Ordering/common.cpp
index c88d7dc082d..be72b75214f 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/common.cpp
@@ -2,8 +2,8 @@
#include "common.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/common.h b/TAO/orbsvcs/tests/Notify/Ordering/common.h
index 679adb0a42c..54ce6c9720a 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/common.h
+++ b/TAO/orbsvcs/tests/Notify/Ordering/common.h
@@ -18,7 +18,7 @@
#ifndef TAO_COMMON_H
#define TAO_COMMON_H
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
const char*
Any_String (const CORBA::Any& any);
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
index 2f1f5c9c41d..b12d9cdfffe 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
@@ -1,7 +1,7 @@
// $Id$
#include "Notify_Sequence_Push_Consumer.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
#include "common.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
index c4357fb4351..c49b5f35669 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
@@ -6,8 +6,8 @@
#include "ace/Get_Opt.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "Notify_Sequence_Push_Consumer.h"
#include "goC.h"
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
index 62127227df9..a99fcaa6aec 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp
@@ -8,10 +8,10 @@
#include "tao/ORB_Core.h"
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
#include "Notify_SequencePushSupplier.h"
#include "goS.h"
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp
index c88d7dc082d..be72b75214f 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp
@@ -2,8 +2,8 @@
#include "common.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.h b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.h
index 0e37aa80491..aaa7826b07f 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.h
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.h
@@ -18,7 +18,7 @@
#ifndef TAO_COMMON_H
#define TAO_COMMON_H
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
const char*
Any_String (const CORBA::Any& any);
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
index 292fe4f59aa..58684ce1b19 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Notify_Sequence_Push_Consumer.cpp
@@ -1,7 +1,7 @@
// $Id$
#include "Notify_Sequence_Push_Consumer.h"
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/orbsvcs/TimeBaseC.h"
#include "common.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
index 14a39144cdc..f621109f7a8 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
@@ -6,8 +6,8 @@
#include "ace/Get_Opt.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "Notify_Sequence_Push_Consumer.h"
#include "goC.h"
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
index a6c6bac9662..6f2a32690c9 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
@@ -11,9 +11,9 @@
#include "tao/ORB_Core.h"
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "Notify_SequencePushSupplier.h"
#include "goS.h"
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp
index c88d7dc082d..be72b75214f 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp
@@ -2,8 +2,8 @@
#include "common.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.h b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.h
index 0e37aa80491..aaa7826b07f 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.h
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.h
@@ -18,7 +18,7 @@
#ifndef TAO_COMMON_H
#define TAO_COMMON_H
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
const char*
Any_String (const CORBA::Any& any);
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
index 279b8e6448a..f6f3ae6326c 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
@@ -6,9 +6,9 @@
#include "ace/Get_Opt.h"
-#include "orbsvcs/CosNotifyChannelAdminC.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "controlC.h"
#include "Notify_Push_Consumer.h"
#include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
index 74a90e7f845..fba45d19f79 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
@@ -4,9 +4,9 @@
// Include Section
// ******************************************************************
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "Notify_StructuredPushSupplier.h"
#include "controlS.h"
#include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
index 67cd1747dda..ef1b3372df7 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
@@ -6,9 +6,9 @@
#include "ace/Get_Opt.h"
-#include "orbsvcs/CosNotifyChannelAdminC.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "controlC.h"
#include "Notify_Push_Consumer.h"
#include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
index 829bc0b9b08..8b4d62ec7b7 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
@@ -5,9 +5,9 @@
// ******************************************************************
#include "ace/Get_Opt.h"
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "Notify_Push_Supplier.h"
#include "controlS.h"
#include "Notify_Test_Client.h"
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
index 4b2e1021bdb..0efa9039997 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h
@@ -19,7 +19,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosNotifyFilterS.h"
+#include "orbsvcs/orbsvcs/CosNotifyFilterS.h"
#if defined(_MSC_VER)
#if (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
index 627fd171ed7..33e6b5a5203 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h
@@ -19,8 +19,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosNotifyFilterS.h"
-#include "orbsvcs/Notify/FilterFactory.h"
+#include "orbsvcs/orbsvcs/CosNotifyFilterS.h"
+#include "orbsvcs/orbsvcs/Notify/FilterFactory.h"
#if defined(_MSC_VER)
#if (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
index a94146e47bc..429cfe0ca99 100644
--- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
@@ -20,7 +20,7 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "ace/SString.h"
-#include "orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
#include "Command.h"
/**
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
index 2c4aeb81e78..1a94c4f4291 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
@@ -20,7 +20,7 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "ace/SString.h"
-#include "orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
#include "Command.h"
#include "../../../orbsvcs/Notify/CosNotify_Initializer.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
index 2678b6c4437..24e263b908c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
@@ -20,7 +20,7 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "ace/SString.h"
-#include "orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
#include "Command.h"
/**
diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
index 6cd7f1da60d..bba40b99762 100644
--- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
+++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
@@ -21,8 +21,8 @@
#include "ace/Singleton.h"
#include "tao/PortableServer/PortableServer.h"
-#include "orbsvcs/CosNotifyChannelAdminC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "ace/Hash_Map_Manager.h"
class TAO_Notify_Tests_Periodic_Supplier;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
index 60a1e436d08..b85f6540d86 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
@@ -16,9 +16,9 @@
#ifndef NOTIFY_TEST_CLIENT_H
#define NOTIFY_TEST_CLIENT_H
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "notify_test_export.h"
class TAO_NOTIFY_TEST_Export Notify_Test_Client
diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
index 9f167185c62..0a257ceed2d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
@@ -2,10 +2,12 @@
#include "Options_Parser.h"
-ACE_RCSID(lib, TAO_Options_Parser, "$Id$")
+ACE_RCSID (lib,
+ TAO_Options_Parser,
+ "$Id$")
#include "tao/debug.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
TAO_Notify_Tests_Options_Parser::TAO_Notify_Tests_Options_Parser (void)
{
diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
index 7acd1919324..6cdc20933b0 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
@@ -20,7 +20,7 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "ace/Arg_Shifter.h"
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
/**
* @class TAO_Notify_Tests_Options_Parser
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
index af33e0cb73f..f6e11655d40 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
@@ -6,13 +6,15 @@
#include "Peer.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(lib, TAO_Peer, "$Id$")
+ACE_RCSID (lib,
+ TAO_Peer,
+ "$Id$")
#include "ace/Arg_Shifter.h"
#include "Name.h"
#include "LookupManager.h"
#include "Options_Parser.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
TAO_Notify_Tests_Peer::TAO_Notify_Tests_Peer (void)
: poa_name_ (TAO_Notify_Tests_Name::root_poa)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
index c0e949b6a56..8a042567060 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
@@ -9,13 +9,15 @@
#include "Peer_T.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Notify, TAO_Notify_Tests_Peer_T, "$Id$")
+ACE_RCSID (Notify,
+ TAO_Notify_Tests_Peer_T,
+ "$Id$")
#include "ace/Arg_Shifter.h"
#include "Name.h"
#include "LookupManager.h"
#include "Options_Parser.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
template <class Peer_Traits>
TAO_Notify_Tests_Peer_T<Peer_Traits>::TAO_Notify_Tests_Peer_T (void)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
index 990acbbcf55..116f4d7fedf 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
@@ -5,14 +5,16 @@
#include "ace/Arg_Shifter.h"
#include "ace/High_Res_Timer.h"
#include "tao/debug.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
#include "StructuredEvent.h"
#include "Task_Stats.h"
#include "Task_Callback.h"
#include "LookupManager.h"
#include "Priority_Mapping.h"
-ACE_RCSID(RT_Notify, TAO_Notify_Tests_Periodic_Consumer, "$Id$")
+ACE_RCSID (RT_Notify,
+ TAO_Notify_Tests_Periodic_Consumer,
+ "$Id$")
int WARMUP_COUNT = 10;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
index b856ca38648..78929ec2730 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
@@ -2,7 +2,9 @@
#include "Periodic_Consumer_Command.h"
-ACE_RCSID(lib, TAO_Periodic_Consumer_Command, "$Id$")
+ACE_RCSID (lib,
+ TAO_Periodic_Consumer_Command,
+ "$Id$")
#include "LookupManager.h"
#include "Name.h"
@@ -11,7 +13,7 @@ ACE_RCSID(lib, TAO_Periodic_Consumer_Command, "$Id$")
#include "Direct_Consumer.h"
#include "Activation_Manager.h"
#include "Options_Parser.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
TAO_Notify_Tests_Periodic_Consumer_Command::TAO_Notify_Tests_Periodic_Consumer_Command (void)
{
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
index d258c7e2e8a..977c0f22f64 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
@@ -20,7 +20,7 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "ace/SString.h"
-#include "orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
#include "Command.h"
class TAO_Notify_Tests_Periodic_Consumer;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
index 3c8ba10a38d..308f3f6e459 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
@@ -7,14 +7,16 @@
#include "ace/Barrier.h"
#include "tao/debug.h"
#include "tao/ORB_Core.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
#include "StructuredEvent.h"
#include "Task_Stats.h"
#include "Task_Callback.h"
#include "LookupManager.h"
#include "Priority_Mapping.h"
-ACE_RCSID(RT_Notify, TAO_Notify_Tests_Periodic_Supplier, "$Id$")
+ACE_RCSID (RT_Notify,
+ TAO_Notify_Tests_Periodic_Supplier,
+ "$Id$")
TAO_Notify_Tests_Periodic_Supplier::TAO_Notify_Tests_Periodic_Supplier (void)
: barrier_ (0),
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
index c3c06163550..6b97740e3ca 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
@@ -2,7 +2,9 @@
#include "Periodic_Supplier_Command.h"
-ACE_RCSID(lib, TAO_Periodic_Supplier_Command, "$Id$")
+ACE_RCSID (lib,
+ TAO_Periodic_Supplier_Command,
+ "$Id$")
#include "LookupManager.h"
#include "Name.h"
@@ -10,7 +12,7 @@ ACE_RCSID(lib, TAO_Periodic_Supplier_Command, "$Id$")
#include "Direct_Supplier.h"
#include "Activation_Manager.h"
#include "Options_Parser.h"
-#include "orbsvcs/NotifyExtC.h"
+#include "orbsvcs/orbsvcs/NotifyExtC.h"
TAO_Notify_Tests_Periodic_Supplier_Command::TAO_Notify_Tests_Periodic_Supplier_Command (void)
{
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
index 726d7cd0ddd..a03215cb7b4 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
@@ -20,7 +20,7 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "ace/SString.h"
-#include "orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
#include "Command.h"
class TAO_Notify_Tests_Periodic_Supplier;
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h
index dddecec4dc1..a2a5b236df8 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h
@@ -19,7 +19,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/CosNotificationC.h"
+#include "orbsvcs/orbsvcs/CosNotificationC.h"
/**
* @class TAO_Notify_Tests_StructuredEvent
diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
index fbed3172551..10c011ee66d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
@@ -20,7 +20,7 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "ace/SString.h"
-#include "orbsvcs/CosNotifyChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminC.h"
#include "Command.h"
/**
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
index 1ff4cb087c0..a0cfc9f8a46 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
@@ -6,8 +6,8 @@
#include "ace/Get_Opt.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "Notify_Sequence_Push_Consumer.h"
#include "goC.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
index 124dca8a155..cff6c00dfe3 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
@@ -8,9 +8,9 @@
#include "tao/ORB_Core.h"
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "Notify_SequencePushSupplier.h"
#include "goS.h"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
index 8c543bd6b44..541266d8cd1 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
@@ -6,8 +6,8 @@
#include "ace/Get_Opt.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "Notify_Structured_Push_Consumer.h"
#include "goC.h"
#include "tao/debug.h"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
index c3cc5ac0f4a..5644e71b127 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
@@ -8,9 +8,9 @@
#include "tao/ORB_Core.h"
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "Notify_StructuredPushSupplier.h"
#include "goS.h"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp
index c88d7dc082d..be72b75214f 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp
@@ -2,8 +2,8 @@
#include "common.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.h b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.h
index 0e37aa80491..aaa7826b07f 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.h
@@ -18,7 +18,7 @@
#ifndef TAO_COMMON_H
#define TAO_COMMON_H
-#include "orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
const char*
Any_String (const CORBA::Any& any);
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
index 6b9ee00d231..1dcc9f2e98a 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
@@ -4,10 +4,12 @@
#include "ace/Arg_Shifter.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_unistd.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
#include "tao/debug.h"
-ACE_RCSID(Notify, RedGreen_Test, "$Id$")
+ACE_RCSID (Notify,
+ RedGreen_Test,
+ "$Id$")
#define NOTIFY_FACTORY_NAME "NotifyEventChannelFactory"
#define NAMING_SERVICE_NAME "NameService"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
index a6d83524294..6759d3bc543 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
@@ -17,9 +17,9 @@
#ifndef NOTIFY_RedGreen_Test_CLIENT_H
#define NOTIFY_RedGreen_Test_CLIENT_H
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "ace/Task.h"
#include "ace/Stats.h"
#include "ace/High_Res_Timer.h"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
index 27f51ab9134..a298517a58d 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
@@ -9,10 +9,12 @@
#include "ace/Dynamic_Service.h"
#include "tao/Strategies/advanced_resource.h"
#include "tao/Messaging/Messaging.h"
-#include "orbsvcs/Notify/Service.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Notify/Service.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
-ACE_RCSID (Notify_Tests, Throughput, "$Id$")
+ACE_RCSID (Notify_Tests,
+ Throughput,
+ "$Id$")
/***************************************************************************/
diff --git a/TAO/orbsvcs/tests/Property/client.h b/TAO/orbsvcs/tests/Property/client.h
index 68ea5861f2e..9ff5ad078b2 100644
--- a/TAO/orbsvcs/tests/Property/client.h
+++ b/TAO/orbsvcs/tests/Property/client.h
@@ -30,8 +30,8 @@
#include "ace/Thread_Manager.h"
#include "ace/Get_Opt.h"
#include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/Property/CosPropertyService_i.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/Property/CosPropertyService_i.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
class Client
{
diff --git a/TAO/orbsvcs/tests/Property/server.h b/TAO/orbsvcs/tests/Property/server.h
index b83f28e09dd..afe9808e3bf 100644
--- a/TAO/orbsvcs/tests/Property/server.h
+++ b/TAO/orbsvcs/tests/Property/server.h
@@ -21,7 +21,7 @@
#define COSPROPERTYSERVICE_SERVER_H
#include "tao/PortableServer/ORB_Manager.h"
-#include "orbsvcs/Property/CosPropertyService_i.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/Property/CosPropertyService_i.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
#endif /* COSPROPERTYSERVICE_SERVER_H */
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
index a75adb276d0..b3ff965ac4d 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
+++ b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
@@ -12,7 +12,7 @@
#include "testSchedC.h"
-#include <orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h>
+#include <orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h>
#include "ace/Get_Opt.h"
#include "tao/debug.h"
#include "ace/OS_main.h"
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
index 5cf7b94a164..a4b9e309967 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
+++ b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
@@ -11,7 +11,7 @@
//=============================================================================
#include "Object1_i.h"
-#include <orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h>
+#include <orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h>
// FUZZ: disable check_for_streams_include
#include "ace/streams.h"
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
index 8ae380b8bec..786f53ab34b 100644
--- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
@@ -17,14 +17,16 @@
// ============================================================================
#include "test_objectS.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
#include "tao/PortableServer/ORB_Manager.h"
#include "tao/debug.h"
#include "ace/Get_Opt.h"
#include "ace/OS_NS_stdio.h"
-ACE_RCSID(Simple_Naming, client, "$Id$")
+ACE_RCSID (Simple_Naming,
+ client,
+ "$Id$")
#if defined (_MSC_VER)
# pragma warning (disable : 4250)
diff --git a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp
index 9a97aba8c46..4b580b8ed46 100644
--- a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp
+++ b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp
@@ -1,12 +1,14 @@
// $Id$
-#include "orbsvcs/Sched/Strategy_Scheduler.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
#if defined (ACE_HAS_QUANTIFY)
# include <quantify.h>
#endif /* ACE_HAS_QUANTIFY */
-ACE_RCSID(Sched, DynSched_Test, "$Id$")
+ACE_RCSID (Sched,
+ DynSched_Test,
+ "$Id$")
// period times, in 100 nanoseconds
#define ONE_HZ 10000000
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
index dcf79635f6c..74272df5877 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
@@ -6,11 +6,13 @@
#include "ace/Sched_Params.h"
#include "ace/Get_Opt.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
-ACE_RCSID(Sched_Conf, Sched_Conf, "$Id$")
+ACE_RCSID (Sched_Conf,
+ Sched_Conf,
+ "$Id$")
const char* service_name = "ScheduleService";
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
index d299eaf939e..cb55b47de58 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
@@ -8,7 +8,6 @@ ACE_RCSID (Big_Request,
server,
"$Id$")
-
const char *ior_output_file = 0;
diff --git a/TAO/orbsvcs/tests/Security/Callback/client.cpp b/TAO/orbsvcs/tests/Security/Callback/client.cpp
index 9ca153929d6..983ce78144a 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/client.cpp
@@ -2,12 +2,10 @@
#include "serverC.h"
#include "client_i.h"
-
ACE_RCSID (Callback,
client,
"$Id$")
-
int
main (int argc, char *argv[])
{
diff --git a/TAO/orbsvcs/tests/Security/Callback/server.cpp b/TAO/orbsvcs/tests/Security/Callback/server.cpp
index 759cb390850..9bce1428d73 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/server.cpp
@@ -2,12 +2,10 @@
#include "server_i.h"
#include "ace/OS_NS_stdio.h"
-
ACE_RCSID (Callback,
server,
"$Id$")
-
int
main (int argc, char *argv[])
{
diff --git a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
index d2a8c676bc4..f4a66db526f 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp
@@ -1,11 +1,9 @@
#include "server_i.h"
-
ACE_RCSID (Callback,
server_i,
"$Id$")
-
server_i::server_i (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb)),
client_ ()
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
index c014c9abc29..e30b656e067 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
@@ -5,7 +5,9 @@
#include "ace/OS_NS_unistd.h"
#include "testC.h"
-ACE_RCSID(Send_File, client, "$Id$")
+ACE_RCSID (Send_File,
+ client,
+ "$Id$")
const char *ior = "file://test.ior";
CORBA::Boolean call_shutdown = 0;
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
index 56bfbdd04f1..f731dee89db 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
@@ -5,7 +5,9 @@
#include "ace/OS_NS_unistd.h"
#include "test_i.h"
-ACE_RCSID(Send_File, server, "$Id$")
+ACE_RCSID (Send_File,
+ server,
+ "$Id$")
const char *ior_output_file = 0;
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
index 89d1ea2c21e..f1eff4cd4bb 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
@@ -6,7 +6,9 @@
#include "test_i.i"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(Send_File, test_i, "$Id$")
+ACE_RCSID (Send_File,
+ test_i,
+ "$Id$")
void
Simple_Server_i::send_line (const char *
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
index 5a479d303f4..06a3f9ee203 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp
@@ -5,13 +5,15 @@
#include "tao/ORB_Core.h"
#include "tao/Thread_Lane_Resources.h"
#include "tao/Transport_Cache_Manager.h"
-#include "orbsvcs/SSLIOP/SSLIOP_Transport.h"
+#include "orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h"
#if !defined(__ACE_INLINE__)
#include "test_i.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(MT_Server, test_i, "$Id$")
+ACE_RCSID (MT_Server,
+ test_i,
+ "$Id$")
void
Simple_Server_i::ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
index f14b6b2b6df..bb1a2f65639 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
@@ -7,7 +7,9 @@
#include "test_i.i"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(MT_Server, test_i, "$Id$")
+ACE_RCSID (MT_Server,
+ test_i,
+ "$Id$")
CORBA::Long
Simple_Server_i::test_method (CORBA::Long x ACE_ENV_ARG_DECL_NOT_USED)
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
index 91b7361050b..87f1b47f673 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
@@ -16,7 +16,7 @@
#define SECURE_INVOCATION_FOO_I_H
#include "FooS.h"
-#include "orbsvcs/SecurityLevel2C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel2C.h"
class Foo_i : public virtual POA_Foo::Bar
, public virtual PortableServer::RefCountServantBase
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
index ea861c51cd2..cfc5da04d59 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
@@ -3,7 +3,7 @@
#include "ace/Get_Opt.h"
#include "FooC.h"
-#include "orbsvcs/SecurityC.h"
+#include "orbsvcs/orbsvcs/SecurityC.h"
ACE_RCSID (Secure_Invocation,
client,
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h b/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h
index 51f15de9d38..6e5c3146259 100644
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h
+++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h
@@ -16,7 +16,7 @@
#define TAO_SLEVEL1_TEST_I_H
#include "SLevel1_TestS.h"
-#include "orbsvcs/SecurityLevel1C.h"
+#include "orbsvcs/orbsvcs/SecurityLevel1C.h"
#include "openssl/x509.h"
class SLevel1_Server_i : public POA_SLevel1_Server
diff --git a/TAO/orbsvcs/tests/Security/SecurityLevel1/client.cpp b/TAO/orbsvcs/tests/Security/SecurityLevel1/client.cpp
index 2c30c19fb17..273aa5f2ecd 100644
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/client.cpp
+++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/client.cpp
@@ -4,7 +4,9 @@
#include "SLevel1_TestC.h"
-ACE_RCSID (SecurityLevel1, client, "$Id$")
+ACE_RCSID (SecurityLevel1,
+ client,
+ "$Id$")
const char *ior = "file://test.ior";
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.h b/TAO/orbsvcs/tests/Simple_Naming/client.h
index 02afd729403..94e0c1c5ae7 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.h
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.h
@@ -18,8 +18,8 @@
// ============================================================================
#include "test_objectS.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
#include "tao/PortableServer/ORB_Manager.h"
#include "ace/Task.h"
diff --git a/TAO/orbsvcs/tests/Time/Client_i.h b/TAO/orbsvcs/tests/Time/Client_i.h
index 03802c59511..8d00d712578 100644
--- a/TAO/orbsvcs/tests/Time/Client_i.h
+++ b/TAO/orbsvcs/tests/Time/Client_i.h
@@ -18,8 +18,8 @@
//
// ============================================================================
-#include "orbsvcs/TimeServiceC.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/TimeServiceC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
class Client_i
{
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.h b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
index 2a5e78885b3..a4d447cb7d7 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.h
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
@@ -23,7 +23,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "orbsvcs/Trader/Trader_Utils.h"
+#include "orbsvcs/orbsvcs/Trader/Trader_Utils.h"
#include "ttest_export.h"
class TAO_TTest_Export TAO_Offer_Importer
diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
index 28cf7b442dd..b18406139fb 100644
--- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
+++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
@@ -16,7 +16,7 @@
#ifndef TAO_SIMPLE_DYNAMIC_H
#define TAO_SIMPLE_DYNAMIC_H
-#include "orbsvcs/Trader/Trader_Utils.h"
+#include "orbsvcs/orbsvcs/Trader/Trader_Utils.h"
#if defined(_MSC_VER)
#if (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.cpp b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
index dfd8d90740e..c19395fb428 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.cpp
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
@@ -1,7 +1,7 @@
// $Id$
#include "TT_Info.h"
-#include "orbsvcs/Trader/Trader_Utils.h"
+#include "orbsvcs/orbsvcs/Trader/Trader_Utils.h"
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.h b/TAO/orbsvcs/tests/Trading/TT_Info.h
index ab18c86d51a..4e4c3d3f9d1 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.h
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.h
@@ -6,9 +6,9 @@
#include "TTestS.h"
#include "ace/Arg_Shifter.h"
#include "ace/Read_Buffer.h"
-#include "orbsvcs/CosTradingC.h"
-#include "orbsvcs/CosTradingReposC.h"
-#include "orbsvcs/CosTradingDynamicC.h"
+#include "orbsvcs/orbsvcs/CosTradingC.h"
+#include "orbsvcs/orbsvcs/CosTradingReposC.h"
+#include "orbsvcs/orbsvcs/CosTradingDynamicC.h"
#include "ttest_export.h"
class TAO_TTest_Export TT_Info
diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
index 895c8cab06b..cf25819a70a 100644
--- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
@@ -6,10 +6,12 @@
#include "Offer_Exporter.h"
#include "Offer_Importer.h"
#include "Service_Type_Exporter.h"
-#include "orbsvcs/Trader/Trader.h"
-#include "orbsvcs/Trader/Service_Type_Repository.h"
+#include "orbsvcs/orbsvcs/Trader/Trader.h"
+#include "orbsvcs/orbsvcs/Trader/Service_Type_Repository.h"
-ACE_RCSID(Trading, colocated_test, "$Id$")
+ACE_RCSID (Trading,
+ colocated_test,
+ "$Id$")
void
parse_args (int argc, char *argv[],
diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp
index 03cd930d8ea..582c340445e 100644
--- a/TAO/orbsvcs/tests/Trading/export_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/export_test.cpp
@@ -5,10 +5,12 @@
#include "Offer_Importer.h"
#include "Service_Type_Exporter.h"
#include "ace/Auto_Ptr.h"
-#include "orbsvcs/Trader/Trader.h"
-#include "orbsvcs/Trader/Service_Type_Repository.h"
+#include "orbsvcs/orbsvcs/Trader/Trader.h"
+#include "orbsvcs/orbsvcs/Trader/Service_Type_Repository.h"
-ACE_RCSID(Trading, export_test, "$Id$")
+ACE_RCSID (Trading,
+ export_test,
+ "$Id$")
int
main (int argc, char** argv)
diff --git a/TAO/rules.tao.GNU b/TAO/rules.tao.GNU
index 1b77ca96efb..38926aa457f 100644
--- a/TAO/rules.tao.GNU
+++ b/TAO/rules.tao.GNU
@@ -21,6 +21,8 @@ endif
TAO_IDL_DEP = $(TAO_IDL)$(EXEEXT)
+TAO_IDLFLAGS += -I$(TAO_ROOT)
+
ifeq (,$(findstring -L$(TAO_ROOT)/tao,$(LDFLAGS)))
LDFLAGS += -L$(TAO_ROOT)/tao
endif
diff --git a/TAO/tests/IDL_Test/array.idl b/TAO/tests/IDL_Test/array.idl
index 406a01c7b79..70f466db3a3 100644
--- a/TAO/tests/IDL_Test/array.idl
+++ b/TAO/tests/IDL_Test/array.idl
@@ -52,3 +52,24 @@ interface tdef
};
};
+// To test that all the octet arrays build and link as
+// unique types.
+module ABCModule
+{
+ struct RmtPhysicalInfo
+ {
+ octet rmtNodeId[22];
+ octet rmtDetails[22];
+ };
+
+ struct bbbBubBubBubBaby
+ {
+ octet rmtNodeId[22];
+ octet rmtDetails[22];
+ };
+};
+
+typedef octet oa1[22];
+typedef octet oa2[22];
+
+
diff --git a/TAO/utils/nslist/nsadd.cpp b/TAO/utils/nslist/nsadd.cpp
index 6ae185ed78b..fcdd5dc8c0f 100644
--- a/TAO/utils/nslist/nsadd.cpp
+++ b/TAO/utils/nslist/nsadd.cpp
@@ -17,7 +17,7 @@
//
// ================================================================
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/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 339273c7882..0d913af8c7f 100644
--- a/TAO/utils/nslist/nsdel.cpp
+++ b/TAO/utils/nslist/nsdel.cpp
@@ -17,7 +17,7 @@
//
// ================================================================
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/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 9bb06063168..5f082199fee 100644
--- a/TAO/utils/nslist/nslist.cpp
+++ b/TAO/utils/nslist/nslist.cpp
@@ -15,7 +15,7 @@
#include "ace/SString.h"
-#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
#include "tao/Endpoint.h"
#include "tao/Profile.h"
#include "tao/Stub.h"