8 files changed, 35 insertions, 27 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