diff options
Diffstat (limited to 'TAO/orbsvcs/examples/CosEC')
29 files changed, 74 insertions, 67 deletions
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:") |