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

20 files changed, 108 insertions, 80 deletions

diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
index 5130896ad70..2829947df81 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
@@ -3,12 +3,14 @@
 #include "Atomic_Reconnect.h"
 #include "Counting_Supplier.h"
 
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-
-ACE_RCSID(EC_Tests, Atomic_Reconnect, "$Id$")
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+
+ACE_RCSID (EC_Tests, 
+           Atomic_Reconnect, 
+           "$Id$")
 
 const int event_type = 20;
 const int event_source = 10;
diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h
index 6aafd6e9dce..93b84af5c2d 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h
@@ -14,7 +14,7 @@
 #define EC_ATOMIC_RECONNECT_H
 
 #include "Counting_Consumer.h"
-#include "orbsvcs/Channel_Clients.h"
+#include "orbsvcs/orbsvcs/Channel_Clients.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
index 5ab0bd4a842..4e085a1df56 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
@@ -3,12 +3,14 @@
 #include "BCast.h"
 #include "Consumer.h"
 #include "Supplier.h"
-#include "orbsvcs/Event/ECG_Mcast_Gateway.h"
+#include "orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h"
 #include "tao/ORB_Core.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/INET_Addr.h"
 
-ACE_RCSID(EC_Tests_Basic, BCast, "$Id$")
+ACE_RCSID (EC_Tests_Basic, 
+           BCast, 
+           "$Id$")
 
 int
 main (int argc, char *argv [])
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.h b/TAO/orbsvcs/tests/Event/Basic/BCast.h
index 8cbcfa4c368..5ec95b193a8 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.h
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.h
@@ -14,7 +14,7 @@
 #define EC_BCAST_H
 
 #include "Driver.h"
-#include "orbsvcs/RtecUDPAdminS.h"
+#include "orbsvcs/orbsvcs/RtecUDPAdminS.h"
 
 class ACE_INET_Addr;
 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
index c34c27eea06..2e9c750ccf5 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
@@ -3,12 +3,14 @@
 #include "Counting_Consumer.h"
 #include "Counting_Supplier.h"
 
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-
-ACE_RCSID(EC_Tests, Bitmask, "$Id$")
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+
+ACE_RCSID (EC_Tests, 
+           Bitmask, 
+           "$Id$")
 
 int
 main (int argc, char* argv[])
diff --git a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
index 05ed9b5f448..5beec0820a2 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
@@ -2,12 +2,14 @@
 
 #include "Counting_Consumer.h"
 #include "Counting_Supplier.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-
-ACE_RCSID(EC_Tests, Complex, "$Id$")
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+
+ACE_RCSID (EC_Tests, 
+           Complex, 
+           "$Id$")
 
 int
 main (int argc, char* argv[])
diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp
index dd6efb09e13..0ccb01763af 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp
@@ -3,12 +3,14 @@
 #include "Control.h"
 #include "Counting_Supplier.h"
 
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-
-ACE_RCSID(EC_Tests, Control, "$Id$")
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+
+ACE_RCSID (EC_Tests, 
+           Control, 
+           "$Id$")
 
 const int event_type = 20;
 const int event_source = 10;
diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.h b/TAO/orbsvcs/tests/Event/Basic/Control.h
index 2df1cb7e3ea..ac641891b4b 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Control.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Control.h
@@ -14,7 +14,7 @@
 #define EC_CONTROL_H
 
 #include "Counting_Consumer.h"
-#include "orbsvcs/Channel_Clients.h"
+#include "orbsvcs/orbsvcs/Channel_Clients.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
index 124ffcb5e2e..425e6b97eca 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
@@ -3,12 +3,14 @@
 #include "Counting_Supplier.h"
 #include "Counting_Consumer.h"
 
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-
-ACE_RCSID(EC_Tests, Disconnect, "$Id$")
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+
+ACE_RCSID (EC_Tests, 
+           Disconnect, 
+           "$Id$")
 
 static void run_test (PortableServer::POA_ptr poa,
                       int use_callbacks
diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
index 25823fbe628..d908603bb20 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
@@ -2,13 +2,15 @@
 
 #include "Counting_Consumer.h"
 #include "Counting_Supplier.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/Event/EC_Gateway_IIOP.h"
-
-ACE_RCSID(EC_Tests, Gateway, "$Id$")
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h"
+
+ACE_RCSID (EC_Tests, 
+           Gateway, 
+           "$Id$")
 
 int
 main (int argc, char* argv[])
diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
index 28b60cf41bf..f2349ee5a21 100644
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
@@ -4,12 +4,14 @@
 #include "Counting_Consumer.h"
 #include "Counting_Supplier.h"
 
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-
-ACE_RCSID(EC_Tests, MT_Disconnect, "$Id$")
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+
+ACE_RCSID (EC_Tests, 
+           MT_Disconnect, 
+           "$Id$")
 
 static void run_test (PortableServer::POA_ptr poa,
                       int use_callbacks
diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h
index 06855260d66..03e058934e1 100644
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h
+++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h
@@ -14,7 +14,7 @@
 #define EC_MT_DISCONNECT_H
 
 #include "ace/Task.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
index e94876eff99..44a50a10b13 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
@@ -3,12 +3,14 @@
 #include "Counting_Consumer.h"
 #include "Counting_Supplier.h"
 
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-
-ACE_RCSID(EC_Tests, Negation, "$Id$")
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+
+ACE_RCSID (EC_Tests, 
+           Negation, 
+           "$Id$")
 
 int
 main (int argc, char* argv[])
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
index 8ea3d55d74b..58253b839bd 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
@@ -3,12 +3,14 @@
 #include "Observer.h"
 #include "Consumer.h"
 #include "Supplier.h"
-#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/Arg_Shifter.h"
 #include "ace/High_Res_Timer.h"
 
-ACE_RCSID(EC_Tests_Basic, Observer, "$Id$")
+ACE_RCSID (EC_Tests_Basic, 
+           Observer, 
+           "$Id$")
 
 int
 main (int argc, char *argv [])
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.h b/TAO/orbsvcs/tests/Event/Basic/Observer.h
index bb788c01258..13ae141293c 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.h
@@ -14,7 +14,7 @@
 #define EC_OBSERVER_H
 
 #include "Driver.h"
-#include "orbsvcs/Event/EC_Gateway_IIOP.h"
+#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
index 6217f46081e..44a4f2cb1d2 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
@@ -1,14 +1,16 @@
 // $Id$
 
 #include "Random.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID(EC_Tests, Random, "$Id$")
+ACE_RCSID (EC_Tests, 
+           Random, 
+           "$Id$")
 
 int
 main (int argc, char* argv[])
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.h b/TAO/orbsvcs/tests/Event/Basic/Random.h
index 22fd387192b..727806f0be0 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Random.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Random.h
@@ -13,8 +13,8 @@
 #ifndef EC_RANDOM_H
 #define EC_RANDOM_H
 
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminS.h"
 #include "ace/Task.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
index 8e80572c29e..ba63f91ba2d 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
@@ -3,11 +3,13 @@
 #include "Reconnect.h"
 #include "Consumer.h"
 #include "Supplier.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
 
-ACE_RCSID(EC_Tests_Basic, Reconnect, "$Id$")
+ACE_RCSID (EC_Tests_Basic, 
+           Reconnect, 
+           "$Id$")
 
 int
 main (int argc, char *argv [])
diff --git a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
index 682b11a8606..79fbf4580fe 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
@@ -3,12 +3,14 @@
 #include "Counting_Consumer.h"
 #include "Counting_Supplier.h"
 
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-
-ACE_RCSID(EC_Tests, Timeout, "$Id$")
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+
+ACE_RCSID (EC_Tests, 
+           Timeout, 
+           "$Id$")
 
 // ****************************************************************
 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
index 30690628e96..868ff9b95f2 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
@@ -2,12 +2,14 @@
 
 #include "Counting_Consumer.h"
 #include "Counting_Supplier.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-
-ACE_RCSID(EC_Tests, Wildcard, "$Id$")
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Event_Utilities.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+
+ACE_RCSID (EC_Tests, 
+           Wildcard, 
+           "$Id$")
 
 int
 main (int argc, char* argv[])