diff options
author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-02-04 20:20:27 +0000 |
---|---|---|
committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-02-04 20:20:27 +0000 |
commit | 5a326f47963cc1ef9f2a0d8a0f3bcb94d9b80b89 (patch) | |
tree | c76428cd75cef4d8a412be96af1accf5cdab557f /TAO/orbsvcs/examples/RtEC | |
parent | 4755552109abd912dbf3ed4ccc6d134500b4f0cb (diff) | |
download | ATCD-5a326f47963cc1ef9f2a0d8a0f3bcb94d9b80b89.tar.gz |
ChangeLogTag: Wed Feb 4 14:18:04 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
Diffstat (limited to 'TAO/orbsvcs/examples/RtEC')
24 files changed, 91 insertions, 71 deletions
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 |