diff options
Diffstat (limited to 'TAO/orbsvcs/examples/CosEC/RtEC_Based')
20 files changed, 53 insertions, 54 deletions
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc index 246f2e8cbd7..aa651b338c2 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/CosEC_RtEC_Based_bin.mpc @@ -1,9 +1,9 @@ // -*- MPC -*- // $Id$ -project : orbsvcsexe, rtevent, event, event_skel, naming { +project : orbsvcsexe, rtevent, event { after += CosEC_RtEC_Based_lib includes += ../lib libs += CosEC_RtEC_Based libpaths += ../lib -} +}
\ No newline at end of file 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/CosEC_RtEC_Based_lib.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc index 62ea3052326..28ddfc71428 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEC_RtEC_Based_lib.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : orbsvcslib, event_skel, rtevent, rtsched { +project : orbsvcslib, event, rtevent, rtsched { sharedname = CosEC_RtEC_Based dynamicflags += TAO_RTEC_COSEC_BUILD_DLL } 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/CosEC_RtEC_Based_tests_Basic.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc index 1cd65727ebb..89c0143b7cd 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/CosEC_RtEC_Based_tests_Basic.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Client) : orbsvcsexe, event, event_skel, rtevent, rtsched { +project(*Client) : orbsvcsexe, event, rtevent, rtsched { after += CosEC_RtEC_Based_lib includes += ../../lib libs += CosEC_RtEC_Based 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/CosEC_RtEC_Based_Mult.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc index 3018aa6b8df..ee8fe174725 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Cons) : orbsvcsexe, event, event_skel, rtevent, rtsched { +project(*Cons) : orbsvcsexe, event, rtevent, rtsched { after += CosEC_RtEC_Based_lib includes += ../../lib libs += CosEC_RtEC_Based @@ -12,7 +12,7 @@ project(*Cons) : orbsvcsexe, event, event_skel, rtevent, rtsched { } } -project(*Supp) : orbsvcsexe, event, event_skel, rtevent, rtsched { +project(*Supp) : orbsvcsexe, event, rtevent, rtsched { after += CosEC_RtEC_Based_lib includes += ../../lib libs += CosEC_RtEC_Based 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 3248946ce78..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,10 +17,9 @@ #ifndef COSECMULTIPLE_H #define COSECMULTIPLE_H -#include "orbsvcs/Naming/Naming_Client.h" -#include "orbsvcs/Naming/Naming_Server.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, |