ChangeLogTag: Wed Feb 4 14:18:04 2004 Jeff Parsons <j.parsons@vanderbilt.edu>

11 files changed, 27 insertions, 32 deletions

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 48617c8262d..357cced7a5d 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
@@ -1,12 +1,11 @@
 #include "Event_Consumer.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
 #include "ace/OS_main.h"
 
 ACE_RCSID (Event,
            Event_Consumer,
            "$Id$")
 
-
 #define NAMING_SERVICE_NAME "NameService"
 #define EVENT_TLS_LOG_FACTORY_NAME "EventLogFactory"
 
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 20d8ba4d47c..f518d96a672 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
@@ -1,12 +1,11 @@
 #include "Event_Supplier.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
 #include "ace/OS_main.h"
 
 ACE_RCSID (Event,
            Event_Supplier,
            "$Id$")
 
-
 #define NAMING_SERVICE_NAME "NameService"
 #define EVENT_TLS_LOG_FACTORY_NAME "EventLogFactory"
 #define LOG_EVENT_COUNT 9
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/Notify/Notify_Consumer.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
index 4da08b137c3..83a910e565a 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
@@ -1,13 +1,12 @@
 #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,
            Notify_Consumer,
            "$Id$")
 
-
 #define NAMING_SERVICE_NAME "NameService"
 #define NOTIFY_TLS_LOG_FACTORY_NAME "NotifyLogFactory"
 #define LOG_EVENT_COUNT 29
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/RTEvent/RTEvent_Consumer.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
index e5bb5b49a76..ebf87ba501c 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
@@ -1,13 +1,12 @@
 #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,
            RTEvent_Consumer,
            "$Id$")
 
-
 #define NAMING_SERVICE_NAME "NameService"
 #define EVENT_TLS_LOG_FACTORY_NAME "RTEventLogFactory"
 
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 3b421034a08..ef78ceafc32 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"
 
@@ -8,7 +8,6 @@ ACE_RCSID (RTEvent,
            RTEvent_Supplier,
            "$Id$")
 
-
 #define NAMING_SERVICE_NAME "NameService"
 #define EVENT_TLS_LOG_FACTORY_NAME "RTEventLogFactory"
 #define LOG_EVENT_COUNT 29
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