diff options
Diffstat (limited to 'TAO/orbsvcs/examples')
94 files changed, 222 insertions, 223 deletions
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc b/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc index a8ca4d25dab..9f36dda8a84 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc +++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc @@ -1,19 +1,16 @@ // -*- MPC -*- // $Id$ -project(*Client) : orbsvcsexe, event, event_skel, naming { +project(*Client) : orbsvcsexe, event { idlflags += -I ../../.. - exename = FactoryClient source_files { FactoryClient.cpp } } -project(*Server) : orbsvcsexe, event, event_serv, naming { +project(*Server) : orbsvcsexe, event { idlflags += -I ../../.. - exename = FactoryServer source_files { - main.cpp FactoryDriver.cpp CosEventChannelFactory_i.cpp } diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl index ffeff6c5f94..59446678f5a 100644 --- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl +++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl @@ -36,7 +36,7 @@ #ifndef TAO_COSEVENTCHANNELFACTORY_IDL #define TAO_COSEVENTCHANNELFACTORY_IDL -#include "orbsvcs/CosEventChannelAdmin.idl" +#include "orbsvcs/orbsvcs/CosEventChannelAdmin.idl" module CosEventChannelFactory { diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp index 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 97d837a7c2e..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_Client.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/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, diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp index 578cebcefd0..81d992eb24b 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Consumer.h" -#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" ACE_RCSID (CosEC_Examples, Consumer, diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.h index 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/CosEC_Simple.mpc b/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc index 7a91454ad07..a423f5f1075 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc +++ b/TAO/orbsvcs/examples/CosEC/Simple/CosEC_Simple.mpc @@ -1,19 +1,19 @@ // -*- MPC -*- // $Id$ -project(*Service) : orbsvcsexe, event, event_serv, naming { +project(*Service) : orbsvcsexe, event { Source_Files { Service.cpp } } -project(*Consumer) : orbsvcsexe, event, event_skel { +project(*Consumer) : orbsvcsexe, event { Source_Files { Consumer.cpp } } -project(*Supplier) : orbsvcsexe, event, event_skel { +project(*Supplier) : orbsvcsexe, event { Source_Files { Supplier.cpp } diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp index f9fee3e6b0d..9dbb168736a 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp @@ -1,7 +1,7 @@ // $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" diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp index 099735ce5f7..85d26f07d32 100644 --- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp +++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp @@ -1,7 +1,7 @@ // $Id$ #include "Supplier.h" -#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" #include "ace/OS_NS_unistd.h" ACE_RCSID (CosEC_Examples, diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h index 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 b1858fb720a..aa6cea972e4 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.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 "Country_i.h" ACE_RCSID (CosEC_Examples, diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc b/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc index cddcd128801..d933c1610e7 100644 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*Consumer) : event_skel, orbsvcsexe, portableserver, naming { +project(*Consumer) : event, orbsvcsexe, portableserver { requires += ec_typed_events source_files { Consumer.cpp @@ -9,7 +9,7 @@ project(*Consumer) : event_skel, orbsvcsexe, portableserver, naming { } } -project(*Supplier) : event_skel, orbsvcsexe, portableserver, naming { +project(*Supplier) : event, orbsvcsexe, portableserver { requires += ec_typed_events after += CosEC_TypedSimple_Consumer idl_files { @@ -18,4 +18,4 @@ project(*Supplier) : event_skel, orbsvcsexe, portableserver, naming { CountryC.cpp Supplier.cpp } -} +}
\ No newline at end of file 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 b8dc8157a18..357cced7a5d 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp @@ -1,5 +1,5 @@ #include "Event_Consumer.h" -#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" #include "ace/OS_main.h" ACE_RCSID (Event, diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.h index 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 1fee4da0b1a..fc2d84cbe72 100644 --- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp @@ -1,5 +1,5 @@ #include "Event_Supplier.h" -#include "orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" #include "ace/OS_main.h" ACE_RCSID (Event, diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.h index 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/Event/Log_Event.mpc b/TAO/orbsvcs/examples/Log/Event/Log_Event.mpc index f58a5f29118..fb4ebd95b7e 100644 --- a/TAO/orbsvcs/examples/Log/Event/Log_Event.mpc +++ b/TAO/orbsvcs/examples/Log/Event/Log_Event.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*Consumer) : orbsvcsexe, dseventlogadmin, event_skel, naming { +project(*Consumer) : orbsvcsexe, event, dseventlogadmin { exename = consumer source_files { Event_Consumer.cpp } } -project(*Supplier) : orbsvcsexe, dseventlogadmin, event_skel, naming { +project(*Supplier) : orbsvcsexe, event, dseventlogadmin { exename = supplier source_files { Event_Supplier.cpp diff --git a/TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc b/TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc index 321de1e7566..74ebf988ce3 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc +++ b/TAO/orbsvcs/examples/Log/Notify/Log_Notify.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*Consumer) : orbsvcsexe, dsnotifylogadmin, notification_skel, naming { +project(*Consumer) : orbsvcsexe, notification, dsnotifylogadmin, naming { exename = consumer source_files { Notify_Consumer.cpp } } -project(*Supplier) : orbsvcsexe, dsnotifylogadmin, notification_skel, naming { +project(*Supplier) : orbsvcsexe, notification, dsnotifylogadmin, naming { exename = supplier source_files { Notify_Supplier.cpp diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp index 6c7c5447c96..83a910e565a 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp @@ -1,6 +1,6 @@ #include "Notify_Consumer.h" -#include "orbsvcs/CosEventChannelAdminS.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" #include "ace/OS_main.h" ACE_RCSID (Notify, diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.h index 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/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp index 5a8edb31e03..14dcf3155d8 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp @@ -1,5 +1,5 @@ #include "Notify_Supplier.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" #include "ace/OS_main.h" ACE_RCSID (Notify, diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h index ecba0889eaa..7e68335f786 100644 --- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h +++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.h @@ -17,10 +17,10 @@ #ifndef NOTIFY_SUPPLIER_H #define NOTIFY_SUPPLIER_H -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/DsNotifyLogAdminC.h" -#include "orbsvcs/CosNamingC.h" -#include "orbsvcs/CosNotifyCommS.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/DsNotifyLogAdminC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommS.h" class Filter_StructuredPushSupplier; diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp index 396b9e8c77e..ebf87ba501c 100644 --- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp +++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp @@ -1,6 +1,6 @@ #include "RTEvent_Consumer.h" -#include "orbsvcs/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, 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 a98457d4f72..8af49c7efc9 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" 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/Filter/Notify_Filter.mpc b/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc index 0c0e54324fc..061cdf7d4ae 100644 --- a/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc +++ b/TAO/orbsvcs/examples/Notify/Filter/Notify_Filter.mpc @@ -1,5 +1,5 @@ // -*- MPC -*- // $Id$ -project : orbsvcsexe, notification, notification_skel, naming { +project : orbsvcsexe, notification, naming { } diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h index bc7a3316a5c..4194e62bd31 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h @@ -16,8 +16,8 @@ #include "ORB_Objects.h" #include "tao/RTCORBA/RTCORBA.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" #include "ace/SString.h" /** diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp index 2a1c42434b4..2b29678007d 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp @@ -4,8 +4,8 @@ #include "Consumer.h" #include "ORB_Run_Task.h" #include "ace/Arg_Shifter.h" -#include "orbsvcs/NotifyExtC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "tao/ORB_Core.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h index e846e43303b..2cbab1c3352 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h @@ -16,8 +16,8 @@ #include "tao/RTCORBA/RTCORBA.h" #include "tao/PortableServer/PortableServer.h" -#include "orbsvcs/NotifyExtC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" /** * @class TAO_Notify_ORB_Objects diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h index 33182f595ee..d01675cb10b 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h @@ -15,8 +15,8 @@ #include "ORB_Objects.h" #include "tao/RTCORBA/RTCORBA.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" #include "ace/SString.h" #include "ace/Condition_Thread_Mutex.h" diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp index f3aa4a7322e..bd760366a36 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp @@ -7,8 +7,8 @@ #include "tao/ORB_Core.h" #include "ace/Sched_Params.h" #include "Supplier.h" -#include "orbsvcs/NotifyExtC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/OS_NS_errno.h" ACE_RCSID (Notify, TAO_Notify_Lanes_Supplier_Client, "$Id$") diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc b/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc index 6684e2215b1..589a889ed25 100644 --- a/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc +++ b/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc @@ -1,5 +1,6 @@ // -*- MPC -*- // $Id$ -project : orbsvcsexe, notification, notification_skel, naming, minimum_corba { +project : orbsvcsexe, notification, naming { + avoids += minimum_corba } 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/Notify/ThreadPool/Consumer.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h index ffe7ad82f73..614bc45268f 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h @@ -16,8 +16,8 @@ #include "ORB_Objects.h" #include "tao/RTCORBA/RTCORBA.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" #include "ace/SString.h" #include "ace/OS_NS_time.h" diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp index 11e04f8f4dc..4b4aa0283bf 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp @@ -4,8 +4,8 @@ #include "Consumer.h" #include "ORB_Run_Task.h" #include "ace/Arg_Shifter.h" -#include "orbsvcs/NotifyExtC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "tao/ORB_Core.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc b/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc index ed469821a28..2be127fbfd1 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Notify_ThreadPool.mpc @@ -1,5 +1,6 @@ // $Id$ -project(*Supplier): rtnotify, notifytest, rtportableserver, minimum_corba { +project(*Supplier): rtnotify, notifytest, rtportableserver { + avoids += minimum_corba exename = Supplier Source_Files { Supplier.cpp @@ -9,7 +10,8 @@ project(*Supplier): rtnotify, notifytest, rtportableserver, minimum_corba { } } -project(*Consumer): rtnotify, notifytest, rtportableserver, minimum_corba { +project(*Consumer): rtnotify, notifytest, rtportableserver { + avoids += minimum_corba exename = Consumer Source_Files { Consumer.cpp diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h index 7ca6ab99442..9ec6510cb60 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h @@ -15,8 +15,8 @@ #include "tao/RTCORBA/RTCORBA.h" #include "tao/PortableServer/PortableServer.h" -#include "orbsvcs/NotifyExtC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" /** * @class TAO_Notify_ORB_Objects diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h index 1a3c7893c76..e19d6b55401 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h @@ -15,8 +15,8 @@ #include "ORB_Objects.h" #include "tao/RTCORBA/RTCORBA.h" -#include "orbsvcs/CosNotifyChannelAdminS.h" -#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" #include "ace/Condition_Thread_Mutex.h" #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp index ed563e2e69d..bc23e0c05b3 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp @@ -7,8 +7,8 @@ #include "tao/ORB_Core.h" #include "ace/Sched_Params.h" #include "Supplier.h" -#include "orbsvcs/NotifyExtC.h" -#include "orbsvcs/CosNamingC.h" +#include "orbsvcs/orbsvcs/NotifyExtC.h" +#include "orbsvcs/orbsvcs/CosNamingC.h" #include "ace/OS_NS_errno.h" ACE_RCSID (Notify, TAO_Notify_ThreadPool_Supplier_Client, "$Id$") diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/notify.conf b/TAO/orbsvcs/examples/Notify/ThreadPool/notify.conf index 80a46e01105..f197dcef2ee 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/notify.conf +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/notify.conf @@ -1,3 +1,3 @@ dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy SYSTEM -ORBPriorityMapping continuous" -##dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification_Serv:_make_TAO_Notify_Default_Factory () "" +##dynamic TAO_Notify_Factory Service_Object * TAO_CosNotification:_make_TAO_Notify_Default_Factory () "" dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () "" diff --git a/TAO/orbsvcs/examples/ORT/ORT.mpc b/TAO/orbsvcs/examples/ORT/ORT.mpc index 66df1682a11..c7442bcc119 100644 --- a/TAO/orbsvcs/examples/ORT/ORT.mpc +++ b/TAO/orbsvcs/examples/ORT/ORT.mpc @@ -1,5 +1,6 @@ // $Id$ -project(*Gateway) : orbsvcsexe, dynamicinterface, ifr_client, minimum_corba { +project(*Gateway) : orbsvcsexe, dynamicinterface, ifr_client { + avoids += minimum_corba source_files { GatewayC.cpp GatewayS.cpp @@ -12,9 +13,10 @@ project(*Gateway) : orbsvcsexe, dynamicinterface, ifr_client, minimum_corba { } } -project(*Server) : orbsvcsexe, dynamicinterface, ifr_client, minimum_corba, iorinterceptor { +project(*Server) : orbsvcsexe, dynamicinterface, ifr_client { exename = server after += *Gateway + avoids += minimum_corba source_files { server.cpp GatewayC.cpp @@ -32,7 +34,8 @@ project(*Server) : orbsvcsexe, dynamicinterface, ifr_client, minimum_corba, iori } } -project(*Client) : orbsvcsexe, event, minimum_corba { +project(*Client) : orbsvcsexe, event { + avoids += minimum_corba after += *Server source_files { client.cpp diff --git a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp index 854519127e0..afb2783d8af 100644 --- a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp +++ b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp @@ -2,6 +2,7 @@ #include "Object_Factory_i.h" #include "tao/PortableServer/POA.h" +#include "tao/PortableServer/ObjectReferenceTemplate.h" Object_Factory_i::Object_Factory_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr gateway_poa) @@ -28,9 +29,7 @@ Object_Factory_i::create_object (const char *interface_repository_id, const PortableInterceptor::ObjectId *obj_id = ACE_reinterpret_cast (const PortableInterceptor::ObjectId *, &id.in ()); - ACE_UNUSED_ARG(obj_id); - ACE_UNUSED_ARG(interface_repository_id); -/* + TAO_POA *poa = dynamic_cast <TAO_POA *> (this->gateway_poa_); ACE_CHECK_RETURN (CORBA::Object::_nil ()); @@ -44,7 +43,7 @@ Object_Factory_i::create_object (const char *interface_repository_id, ort->make_object (interface_repository_id, *obj_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::Object::_nil ());*/ + ACE_CHECK_RETURN (CORBA::Object::_nil ()); - return CORBA::Object::_nil(); + return object_ptr; } diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp index 17ae07e376a..1f6d7a9e796 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp @@ -1,10 +1,10 @@ // $Id$ #include "Consumer.h" -#include "orbsvcs/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" 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 29e85721e86..ad503080423 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp @@ -1,12 +1,12 @@ // $Id$ #include "EC.h" -#include "orbsvcs/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, 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 11a219fd352..17944dad818 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp @@ -1,11 +1,11 @@ // $Id$ #include "Gateway.h" -#include "orbsvcs/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" 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 6d8586d16a8..ce16ed2237e 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp @@ -1,10 +1,10 @@ // $Id$ #include "Supplier.h" -#include "orbsvcs/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" 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 dba1cb22b01..8d41d2b200d 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/Consumer.cpp @@ -1,8 +1,8 @@ // $Id$ #include "Consumer.h" -#include "orbsvcs/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, 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 4ab33c1ee29..052a5fe8280 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" #include "ace/OS_NS_unistd.h" diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp index f83b00c5864..84a8d5a9f10 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/MCast/Supplier.cpp @@ -1,8 +1,8 @@ // $Id$ #include "Supplier.h" -#include "orbsvcs/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, 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 1011f5d53bc..fcf9123becd 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.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 d49a22fa62a..18d42999eab 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp @@ -1,9 +1,9 @@ // $Id$ #include "Consumer.h" -#include "orbsvcs/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, 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 4bc618c1232..9b4692a69ed 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp @@ -1,9 +1,9 @@ // $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, diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp index 850888b1d77..a91a5f8ec05 100644 --- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp +++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp @@ -1,9 +1,9 @@ // $Id$ #include "Supplier.h" -#include "orbsvcs/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, 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/examples/Security/Send_File/README b/TAO/orbsvcs/examples/Security/Send_File/README index c02ca187f21..e0b149b01f4 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/README +++ b/TAO/orbsvcs/examples/Security/Send_File/README @@ -37,16 +37,14 @@ phrase (it is 'test'). ======= Testing IIOP interoperability - We also want to verify that the client and server (assuming - "-SSLNoProtection" flag is set in server's `server.conf' file) - can interoperate with regular IIOP servers and clients. + We also want to verify that the client and +server can interoperate with regular IIOP servers and clients. First setup a pure IIOP server: $ server -o test.ior $ client -ORBSvcConf client.conf -k file://test.ior < myfile - next a pure IIOP client (assuming "-SSLNoProtection" flag is - set in server's `server.conf' file): + next a pure IIOP client: $ server -ORBSvcConf server.conf -o test.ior $ client -k file://test.ior < myfile diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.conf b/TAO/orbsvcs/examples/Security/Send_File/server.conf index e178933feb9..ee0ef1aa57c 100644 --- a/TAO/orbsvcs/examples/Security/Send_File/server.conf +++ b/TAO/orbsvcs/examples/Security/Send_File/server.conf @@ -1,4 +1,4 @@ # $Id$ -dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem -SSLNoProtection" +dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem" static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory" |