ChangeLogTag:Fri Mar 8 19:01:33 2002 Carlos O'Ryan <coryan@uci.edu>

49 files changed, 3859 insertions, 521 deletions

diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile
index cb37ba031db..18190650bdd 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile
@@ -187,8 +187,6 @@ server: $(addprefix $(VDIR),$(server_OBJS))
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -198,6 +196,7 @@ server: $(addprefix $(VDIR),$(server_OBJS))
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
@@ -206,7 +205,8 @@ server: $(addprefix $(VDIR),$(server_OBJS))
   $(ACE_ROOT)/ace/Swap.inl \
   $(ACE_ROOT)/ace/Swap.cpp \
   ../lib/Servant_var.inl ../lib/Servant_var.cpp ../lib/RIR_Narrow.h \
-  ../lib/RIR_Narrow.cpp ../lib/RTEC_Initializer.h \
+  ../lib/RIR_Narrow.cpp ../lib/RTServer_Setup.h ../lib/RTClient_Setup.h \
+  ../lib/RTCORBA_Setup.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
   $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
@@ -232,23 +232,13 @@ server: $(addprefix $(VDIR),$(server_OBJS))
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   $(TAO_ROOT)/tao/TimeBaseC.i \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
-  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
-  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
-  ../lib/RTServer_Setup.h ../lib/RTCORBA_Setup.h \
   $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping_Manager.h \
   $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping.h \
   $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
   $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping_Manager.i \
-  ../lib/RTCORBA_Setup.inl ../lib/RTPOA_Setup.h \
-  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServer.h \
-  $(TAO_ROOT)/tao/RTPortableServer/rtportableserver_export.h \
-  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.h \
-  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.i \
-  ../lib/RTPOA_Setup.inl ../lib/PriorityBand_Setup.h \
+  ../lib/RTCORBA_Setup.inl ../lib/PriorityBand_Setup.h \
   ../lib/PriorityBand_Setup.inl ../lib/SyncScope_Setup.h \
   $(TAO_ROOT)/tao/Messaging/Messaging.h \
   $(TAO_ROOT)/tao/Messaging/MessagingC.h \
@@ -262,16 +252,17 @@ server: $(addprefix $(VDIR),$(server_OBJS))
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/Messaging/MessagingC.i \
-  ../lib/SyncScope_Setup.inl ../lib/RTServer_Setup.inl \
-  ../lib/Loopback_Pair.h ../lib/Loopback_Supplier.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
-  $(TAO_ROOT)/tao/TimeBaseS.h \
-  $(TAO_ROOT)/tao/TimeBaseS_T.h \
-  $(TAO_ROOT)/tao/TimeBaseS_T.i \
-  $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
-  $(TAO_ROOT)/tao/TimeBaseS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
+  ../lib/SyncScope_Setup.inl ../lib/RTClient_Setup.inl \
+  ../lib/RTPOA_Setup.h \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServer.h \
+  $(TAO_ROOT)/tao/RTPortableServer/rtportableserver_export.h \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.i \
+  ../lib/RTPOA_Setup.inl ../lib/RTServer_Setup.inl ../lib/Control.h \
+  ../lib/Federated_TestS.h ../lib/Federated_TestC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/NVList.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
@@ -300,8 +291,8 @@ server: $(addprefix $(VDIR),$(server_OBJS))
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+  ../lib/Federated_TestC.i \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
   $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
   $(ACE_ROOT)/ace/Atomic_Op.h \
@@ -312,54 +303,19 @@ server: $(addprefix $(VDIR),$(server_OBJS))
   $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
   $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
-  ../lib/Loopback_Consumer.h ../lib/Loopback_Pair.inl \
-  ../lib/Auto_Disconnect.h ../lib/Auto_Disconnect.inl \
-  ../lib/Auto_Disconnect.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
+  ../lib/Federated_TestS_T.h ../lib/Federated_TestS_T.i \
+  ../lib/Federated_TestS_T.cpp ../lib/Federated_TestS.i \
+  $(TAO_ROOT)/tao/Strategies/advanced_resource.h \
+  $(TAO_ROOT)/tao/Strategies/strategies_export.h \
+  $(TAO_ROOT)/tao/default_resource.h \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Defaults.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Default_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Reactor.h \
@@ -375,14 +331,6 @@ server: $(addprefix $(VDIR),$(server_OBJS))
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Default_Factory.i \
-  $(TAO_ROOT)/tao/Strategies/advanced_resource.h \
-  $(TAO_ROOT)/tao/Strategies/strategies_export.h \
-  $(TAO_ROOT)/tao/default_resource.h \
-  $(TAO_ROOT)/tao/Resource_Factory.h \
-  $(TAO_ROOT)/tao/Pluggable.h \
-  $(TAO_ROOT)/tao/Pluggable.i \
-  $(TAO_ROOT)/tao/Protocol_Factory.h \
   $(TAO_ROOT)/tao/default_resource.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
@@ -567,8 +515,6 @@ server: $(addprefix $(VDIR),$(server_OBJS))
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -578,6 +524,7 @@ server: $(addprefix $(VDIR),$(server_OBJS))
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
@@ -586,7 +533,8 @@ server: $(addprefix $(VDIR),$(server_OBJS))
   $(ACE_ROOT)/ace/Swap.inl \
   $(ACE_ROOT)/ace/Swap.cpp \
   ../lib/Servant_var.inl ../lib/Servant_var.cpp ../lib/RIR_Narrow.h \
-  ../lib/RIR_Narrow.cpp ../lib/RTServer_Setup.h ../lib/RTCORBA_Setup.h \
+  ../lib/RIR_Narrow.cpp ../lib/RTServer_Setup.h ../lib/RTClient_Setup.h \
+  ../lib/RTCORBA_Setup.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
   $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
@@ -618,15 +566,7 @@ server: $(addprefix $(VDIR),$(server_OBJS))
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
   $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping_Manager.i \
-  ../lib/RTCORBA_Setup.inl ../lib/RTPOA_Setup.h \
-  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServer.h \
-  $(TAO_ROOT)/tao/RTPortableServer/rtportableserver_export.h \
-  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
-  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
-  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.i \
-  ../lib/RTPOA_Setup.inl ../lib/PriorityBand_Setup.h \
+  ../lib/RTCORBA_Setup.inl ../lib/PriorityBand_Setup.h \
   ../lib/PriorityBand_Setup.inl ../lib/SyncScope_Setup.h \
   $(TAO_ROOT)/tao/Messaging/Messaging.h \
   $(TAO_ROOT)/tao/Messaging/MessagingC.h \
@@ -640,7 +580,16 @@ server: $(addprefix $(VDIR),$(server_OBJS))
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/Messaging/MessagingC.i \
-  ../lib/SyncScope_Setup.inl ../lib/RTServer_Setup.inl ../lib/Send_Task.h \
+  ../lib/SyncScope_Setup.inl ../lib/RTClient_Setup.inl \
+  ../lib/RTPOA_Setup.h \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServer.h \
+  $(TAO_ROOT)/tao/RTPortableServer/rtportableserver_export.h \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.i \
+  ../lib/RTPOA_Setup.inl ../lib/RTServer_Setup.inl ../lib/Send_Task.h \
   ../lib/Supplier.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
@@ -756,11 +705,13 @@ server: $(addprefix $(VDIR),$(server_OBJS))
   $(ACE_ROOT)/ace/Copy_Disabled.h \
   ../lib/Task_Activator.inl ../lib/Task_Activator.cpp \
   ../lib/ORB_Task_Activator.inl ../lib/Auto_Disconnect.h \
+  ../lib/Auto_Functor.h ../lib/Auto_Functor.inl ../lib/Auto_Functor.cpp \
   ../lib/Auto_Disconnect.inl ../lib/Auto_Disconnect.cpp \
   ../lib/Low_Priority_Setup.h ../lib/Send_Task_Stopper.h \
   ../lib/Send_Task_Stopper.inl ../lib/Low_Priority_Setup.cpp \
   $(ACE_ROOT)/ace/Basic_Stats.h \
   $(ACE_ROOT)/ace/Basic_Stats.inl \
+  ../lib/EC_Destroyer.h ../lib/EC_Destroyer.inl \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
index 4ddc048732c..4e38b193ebd 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
@@ -5,13 +5,11 @@
 #include "Servant_var.h"
 #include "RIR_Narrow.h"
 #include "RTServer_Setup.h"
+#include "Peer_Base.h"
+#include "Auto_Disconnect.h"
 #include "Send_Task.h"
+#include "Task_Activator.h"
 #include "Client_Pair.h"
-#include "ORB_Task.h"
-#include "ORB_Task_Activator.h"
-#include "Auto_Disconnect.h"
-#include "Low_Priority_Setup.h"
-#include "EC_Destroyer.h"
 
 #include "orbsvcs/Event_Service_Constants.h"
 
@@ -31,9 +29,7 @@
 ACE_RCSID(TAO_RTEC_PERF_Roundtrip, client, "$Id$")
 
 const char *ior = "file://test.ior";
-int iterations = 10000;
 int nthreads   = 0;
-int do_dump_history = 0;
 int high_priority_period = 0;
 int high_priority_workload = 0;
 int low_priority_period  = 0;
@@ -41,10 +37,37 @@ int low_priority_workload = 0;
 int disable_low_priority = 0;
 int use_rt_corba = 0;
 
+class Roundtrip_Peer : public Peer_Base
+{
+public:
+  Roundtrip_Peer (CORBA::ORB_ptr orb,
+                  RTServer_Setup &rtserver_setup,
+                  RT_Class &rt_class
+                  ACE_ENV_ARG_DECL)
+    : Peer_Base (orb, rtserver_setup
+                 ACE_ENV_ARG_PARAMETER)
+    , rt_class_ (&rt_class)
+  {
+  }
+
+  //@{
+  /** @name The Federated_Test::Peer methods
+   */
+  virtual Federated_Test::Experiment_Results *
+      run_experiment (CORBA::Long experiment_id,
+                      CORBA::Long iterations
+                      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+  //@}
+
+private:
+  RT_Class *rt_class_;
+};
+
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:i:n:l:h:w:v:zdr");
+  ACE_Get_Opt get_opts (argc, argv, "k:n:l:h:w:v:zr");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -54,10 +77,6 @@ parse_args (int argc, char *argv[])
         ior = get_opts.opt_arg ();
         break;
 
-      case 'i':
-        iterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
       case 'n':
         nthreads = ACE_OS::atoi (get_opts.opt_arg ());
         break;
@@ -78,10 +97,6 @@ parse_args (int argc, char *argv[])
         low_priority_workload = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
-      case 'd':
-        do_dump_history = 1;
-        break;
-
       case 'z':
         disable_low_priority = 1;
         break;
@@ -102,7 +117,6 @@ parse_args (int argc, char *argv[])
                            "-v low_priority_workload (usecs) "
                            "-r (enable RT-CORBA) "
                            "-n nthreads (low priority thread) "
-                           "-d (dump history) "
                            "-z (disable low priority) "
                            "\n",
                            argv [0]),
@@ -114,8 +128,6 @@ parse_args (int argc, char *argv[])
 
 int main (int argc, char *argv[])
 {
-  const CORBA::Long experiment_id = 1;
-
   RT_Class rt_class;
 
   ACE_TRY_NEW_ENV
@@ -147,58 +159,71 @@ int main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      PortableServer::POA_var supplier_poa (root_poa);
-      PortableServer::POA_var consumer_poa (root_poa);
-      if (use_rt_corba != 0)
-        {
-          supplier_poa = rtserver_setup.poa ();
-          consumer_poa = rtserver_setup.poa ();
-        }
-
       ACE_DEBUG ((LM_DEBUG, "Finished ORB and POA configuration\n"));
 
-      ACE_Thread_Manager my_thread_manager;
-
-      ORB_Task orb_task (orb);
-      orb_task.thr_mgr (&my_thread_manager);
-      ORB_Task_Activator orb_task_activator (rt_class.priority_high (),
-                                             rt_class.thr_sched_class (),
-                                             1,
-                                             &orb_task);
+      Servant_var<Roundtrip_Peer> peer_impl (
+          new Roundtrip_Peer (orb,
+                              rtserver_setup,
+                              rt_class
+                              ACE_ENV_ARG_PARAMETER)
+          );
+      ACE_TRY_CHECK;
 
-      ACE_DEBUG ((LM_DEBUG, "ORB is active\n"));
+      Federated_Test::Peer_var peer =
+        peer_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
+      ACE_DEBUG ((LM_DEBUG, "Finished peer configuration and activation\n")); 
+     
       CORBA::Object_var object =
         orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+      Federated_Test::Control_var control =
+        Federated_Test::Control::_narrow (object.in ()
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      EC_Destroyer ec_destroyer (ec.in ());
+      control->join (peer.in ()
+                     ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-      CORBA::PolicyList_var inconsistent_policies;
-      (void) ec->_validate_connection (inconsistent_policies
-                                       ACE_ENV_ARG_PARAMETER);
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "Exception caught:");
+      return 1;
+    }
+  ACE_ENDTRY;
 
-      ACE_DEBUG ((LM_DEBUG, "Finished EC configuration and activation\n"));
+  return 0;
+}
 
-      int thread_count = 1;
-      if (disable_low_priority == 0)
-        thread_count += nthreads;
+Federated_Test::Experiment_Results *
+Roundtrip_Peer::run_experiment (CORBA::Long experiment_id,
+                                CORBA::Long iterations
+                                ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  int thread_count = 1;
+#if 0
+  if (disable_low_priority == 0)
+    thread_count += nthreads;
+#endif
 
-      ACE_Barrier barrier (thread_count);
+  ACE_Barrier barrier (thread_count);
 
-      ACE_DEBUG ((LM_DEBUG, "Calibrating high res timer ...."));
-      ACE_High_Res_Timer::calibrate ();
+  ACE_DEBUG ((LM_DEBUG, "Calibrating high res timer ...."));
+  ACE_High_Res_Timer::calibrate ();
 
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-      ACE_DEBUG ((LM_DEBUG, "Done (%d)\n", gsf));
+  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_DEBUG ((LM_DEBUG, "Done (%d)\n", gsf));
 
-      Low_Priority_Setup<Client_Pair> low_priority_setup (
+#if 0
+  Low_Priority_Setup<Client_Pair> low_priority_setup (
           nthreads,
           0, // no limit on the number of iterations
           1, // each client gets its own type
@@ -207,96 +232,75 @@ int main (int argc, char *argv[])
           low_priority_workload,
           gsf,
           disable_low_priority ? 0 : 1,
-          rt_class.priority_low (),
-          rt_class.thr_sched_class (),
+          this->rt_class_.priority_low (),
+          this->rt_class_.thr_sched_class (),
           low_priority_period,
-          supplier_poa.in (),
-          consumer_poa.in (),
-          ec.in (),
+          this->poa_.in (),
+          this->poa_.in (),
+          this->event_channel_.in (),
           &barrier
           ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+#endif
+
+  Client_Pair high_priority_group;
+  high_priority_group.init (experiment_id,
+                            ACE_ES_EVENT_UNDEFINED,
+                            iterations,
+                            high_priority_workload,
+                            gsf,
+                            this->poa_.in (),
+                            this->poa_.in ());
+  high_priority_group.connect (this->event_channel_.in ()
+                               ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  Auto_Disconnect<Client_Pair> high_priority_disconnect (&high_priority_group);
+
+  Send_Task high_priority_task;
+  high_priority_task.init (iterations,
+                           high_priority_period,
+                           0,
+                           ACE_ES_EVENT_UNDEFINED,
+                           1,
+                           high_priority_group.supplier (),
+                           &barrier);
+  {
+    // Artificial scope to wait for the high priority task...
+    Task_Activator<Send_Task> high_priority_act (this->rt_class_->priority_high (),
+                                                 this->rt_class_->thr_sched_class (),
+                                                 1,
+                                                 &high_priority_task);
+  }
+
+  ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - high priority task completed\n"));
+
+#if 0
+  if (disable_low_priority == 0)
+    {
+      low_priority_setup.stop_all_threads ();
+    }
 
-      Client_Pair high_priority_group;
-      high_priority_group.init (experiment_id,
-                                ACE_ES_EVENT_UNDEFINED,
-                                iterations,
-                                high_priority_workload,
-                                gsf,
-                                supplier_poa.in (),
-                                consumer_poa.in ());
-      high_priority_group.connect (ec.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      Auto_Disconnect<Client_Pair> high_priority_disconnect (&high_priority_group);
-
-      Send_Task high_priority_task;
-      high_priority_task.init (iterations,
-                               high_priority_period,
-                               0,
-                               ACE_ES_EVENT_UNDEFINED,
-                               1,
-                               high_priority_group.supplier (),
-                               &barrier);
-      high_priority_task.thr_mgr (&my_thread_manager);
-      {
-        // Artificial scope to wait for the high priority task...
-        Task_Activator<Send_Task> high_priority_act (rt_class.priority_high (),
-                                                     rt_class.thr_sched_class (),
-                                                     1,
-                                                     &high_priority_task);
-      }
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - high priority task completed\n"));
-
-      if (disable_low_priority == 0)
-        {
-          low_priority_setup.stop_all_threads ();
-        }
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - low priority task(s) stopped\n"));
-
-      ACE_Sample_History &history =
-        high_priority_group.consumer ()->sample_history ();
-      if (do_dump_history)
-        {
-          history.dump_samples ("HISTORY", gsf);
-        }
-
-      ACE_Basic_Stats high_priority_stats;
-      history.collect_basic_stats (high_priority_stats);
-      high_priority_stats.dump_results ("High Priority", gsf);
+  ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - low priority task(s) stopped\n"));
+#endif
 
-      ACE_Basic_Stats low_priority_stats;
-      low_priority_setup.collect_basic_stats (low_priority_stats);
-      low_priority_stats.dump_results ("Low Priority", gsf);
+  ACE_Sample_History &history =
+    high_priority_group.consumer ()->sample_history ();
 
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - starting cleanup\n"));
-    }
-  ACE_CATCHANY
+  Federated_Test::Experiment_Results_var results (
+     new Federated_Test::Experiment_Results (iterations)
+     );
+  results->length (iterations);
+  for (CORBA::ULong i = 0; i != results->length (); ++i)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
-      return 1;
+      results[i] = history.get_sample (i) / gsf;
     }
-  ACE_ENDTRY;
-
-  return 0;
+  
+  return results._retn ();
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class Servant_var<Supplier>;
-template class Servant_var<Consumer>;
-template class ACE_Auto_Basic_Array_Ptr<Servant_var<Supplier> >;
-template class ACE_Auto_Basic_Array_Ptr<Servant_var<Consumer> >;
-template class ACE_Auto_Basic_Array_Ptr<Send_Task>;
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate Servant_var<Supplier>
-#pragma instantiate Servant_var<Consumer>
-#pragma instantiate ACE_Auto_Basic_Array_Ptr<Servant_var<Supplier> >
-#pragma instantiate ACE_Auto_Basic_Array_Ptr<Servant_var<Consumer> >
-#pragma instantiate ACE_Auto_Basic_Array_Ptr<Send_Task>
-
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp
index 16313d92a81..e0916710392 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp
@@ -4,15 +4,8 @@
 #include "ORB_Holder.h"
 #include "Servant_var.h"
 #include "RIR_Narrow.h"
-#include "RTEC_Initializer.h"
 #include "RTServer_Setup.h"
-#include "Loopback_Pair.h"
-#include "Auto_Disconnect.h"
-
-#include "orbsvcs/Event_Service_Constants.h"
-
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "Control.h"
 
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
@@ -24,13 +17,16 @@
 ACE_RCSID(TAO_PERF_RTEC_Federated_Roundtrip, server, "$Id$")
 
 const char *ior_output_file = "test.ior";
+int iterations = 10000;
+int nthreads   = 1;
+int peer_count = 2;
+int do_dump_history = 0;
 int use_rt_corba = 0;
-int nthreads = 1;
 
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:n:r");
+  ACE_Get_Opt get_opts (argc, argv, "o:i:p:n:rd");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -44,17 +40,32 @@ parse_args (int argc, char *argv[])
         nthreads = ACE_OS::atoi (get_opts.opt_arg ());
         break;
 
+      case 'i':
+        iterations = ACE_OS::atoi (get_opts.opt_arg ());
+        break;
+
+      case 'p':
+        peer_count = ACE_OS::atoi (get_opts.opt_arg ());
+        break;
+
       case 'r':
         use_rt_corba = 1;
         break;
 
+      case 'd':
+        do_dump_history = 1;
+        break;
+
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
                            "-o <iorfile> "
                            "-n nthreads "
+                           "-i iterations "
+                           "-p peer_count "
                            "-r (use RT-CORBA) "
+                           "-d (dump full history) "
                            "\n",
                            argv [0]),
                           -1);
@@ -65,10 +76,6 @@ parse_args (int argc, char *argv[])
 
 int main (int argc, char *argv[])
 {
-  const CORBA::Long experiment_id = 1;
-
-  TAO_EC_Default_Factory::init_svcs ();
-
   RT_Class rt_class;
 
   ACE_TRY_NEW_ENV
@@ -100,37 +107,21 @@ int main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      PortableServer::POA_var ec_poa (root_poa);
-      if (use_rt_corba != 0)
-        {
-          ec_poa = rtserver_setup.poa ();
-        }
-      Servant_var<TAO_EC_Event_Channel> ec_impl (
-        RTEC_Initializer::create (ec_poa.in (),
-                                  ec_poa.in (),
-                                  rtserver_setup.rtcorba_setup ()
-                                  ACE_ENV_ARG_PARAMETER));
-      ACE_TRY_CHECK;
-
-      ec_impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::ObjectId_var ec_id =
-        ec_poa->activate_object (ec_impl.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      CORBA::Object_var ec_object =
-        ec_poa->id_to_reference (ec_id.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      RtecEventChannelAdmin::EventChannel_var ec =
-        RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
+      PortableServer::POA_var control_poa (rtserver_setup.poa ());
+      Servant_var<Control> control_impl (
+        new Control (peer_count,
+                     iterations,
+                     do_dump_history,
+                     orb,
+                     control_poa.in ())
+        );
+
+      Federated_Test::Control_var control =
+        control_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (ec.in () ACE_ENV_ARG_PARAMETER);
+        orb->object_to_string (control.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Output the ior to the <ior_output_file>
@@ -146,29 +137,8 @@ int main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      Loopback_Pair high_priority_pair;
-      high_priority_pair.init (experiment_id,
-                               ACE_ES_EVENT_UNDEFINED,
-                               ec_poa.in (), ec_poa.in ());
-      high_priority_pair.connect (ec.in ()
-                                  ACE_ENV_ARG_PARAMETER);
+      orb->run (ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      Auto_Disconnect<Loopback_Pair> high_priority_disconnect (&high_priority_pair);
-
-      Loopback_Pair low_priority_pair;
-      low_priority_pair.init (experiment_id,
-                              ACE_ES_EVENT_UNDEFINED + 2,
-                              ec_poa.in (), ec_poa.in ());
-      low_priority_pair.connect (ec.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      Auto_Disconnect<Loopback_Pair> low_priority_disconnect (&low_priority_pair);
-
-      do {
-        ACE_Time_Value tv (1, 0);
-        orb->run (tv ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      } while (ec_impl->destroyed () == 0);
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
     }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Makefile b/TAO/orbsvcs/performance-tests/RTEvent/Makefile
index 0ae9d30843b..0eaf49a6c9e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Makefile
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Makefile
@@ -10,6 +10,7 @@
 
 DIRS  = \
   lib \
+  RTCORBA_Baseline \
   Roundtrip \
   Federated_Roundtrip
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile
index 7d352b049dc..e4fe794a4b1 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile
@@ -70,7 +70,7 @@ realclean: clean
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/server.o .obj/server.o .obj/server.o .obj/server.o: server.cpp ../lib/RT_Class.h ../lib/rtec_perf_export.h \
+.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp ../lib/RT_Class.h ../lib/rtec_perf_export.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -216,7 +216,8 @@ realclean: clean
   $(ACE_ROOT)/ace/Swap.inl \
   $(ACE_ROOT)/ace/Swap.cpp \
   ../lib/Servant_var.inl ../lib/Servant_var.cpp ../lib/RIR_Narrow.h \
-  ../lib/RIR_Narrow.cpp ../lib/RTServer_Setup.h ../lib/RTCORBA_Setup.h \
+  ../lib/RIR_Narrow.cpp ../lib/RTServer_Setup.h ../lib/RTClient_Setup.h \
+  ../lib/RTCORBA_Setup.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
   $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
@@ -248,15 +249,7 @@ realclean: clean
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
   $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping_Manager.i \
-  ../lib/RTCORBA_Setup.inl ../lib/RTPOA_Setup.h \
-  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServer.h \
-  $(TAO_ROOT)/tao/RTPortableServer/rtportableserver_export.h \
-  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
-  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
-  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.i \
-  ../lib/RTPOA_Setup.inl ../lib/PriorityBand_Setup.h \
+  ../lib/RTCORBA_Setup.inl ../lib/PriorityBand_Setup.h \
   ../lib/PriorityBand_Setup.inl ../lib/SyncScope_Setup.h \
   $(TAO_ROOT)/tao/Messaging/Messaging.h \
   $(TAO_ROOT)/tao/Messaging/MessagingC.h \
@@ -270,9 +263,17 @@ realclean: clean
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/Messaging/MessagingC.i \
-  ../lib/SyncScope_Setup.inl ../lib/RTServer_Setup.inl Roundtrip.h \
-  TestS.h TestC.h \
-  $(TAO_ROOT)/tao/corba.h \
+  ../lib/SyncScope_Setup.inl ../lib/RTClient_Setup.inl \
+  ../lib/RTPOA_Setup.h \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServer.h \
+  $(TAO_ROOT)/tao/RTPortableServer/rtportableserver_export.h \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.i \
+  ../lib/RTPOA_Setup.inl ../lib/RTServer_Setup.inl Roundtrip.h TestS.h \
+  TestC.h $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/NVList.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
@@ -395,7 +396,7 @@ realclean: clean
   $(ACE_ROOT)/ace/Get_Opt.h \
   $(ACE_ROOT)/ace/Get_Opt.i
 
-.obj/client.o .obj/client.o .obj/client.o .obj/client.o: client.cpp ../lib/RT_Class.h ../lib/rtec_perf_export.h \
+.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp ../lib/RT_Class.h ../lib/rtec_perf_export.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
   $(ACE_ROOT)/ace/ACE_export.h \
@@ -537,7 +538,7 @@ realclean: clean
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
   ../lib/ORB_Holder.inl ../lib/RIR_Narrow.h ../lib/RIR_Narrow.cpp \
-  ../lib/RTServer_Setup.h ../lib/RTCORBA_Setup.h \
+  ../lib/RTClient_Setup.h ../lib/RTCORBA_Setup.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
   $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
@@ -569,15 +570,7 @@ realclean: clean
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
   $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping_Manager.i \
-  ../lib/RTCORBA_Setup.inl ../lib/RTPOA_Setup.h \
-  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServer.h \
-  $(TAO_ROOT)/tao/RTPortableServer/rtportableserver_export.h \
-  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
-  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
-  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.i \
-  ../lib/RTPOA_Setup.inl ../lib/PriorityBand_Setup.h \
+  ../lib/RTCORBA_Setup.inl ../lib/PriorityBand_Setup.h \
   ../lib/PriorityBand_Setup.inl ../lib/SyncScope_Setup.h \
   $(TAO_ROOT)/tao/Messaging/Messaging.h \
   $(TAO_ROOT)/tao/Messaging/MessagingC.h \
@@ -591,7 +584,7 @@ realclean: clean
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/Messaging/MessagingC.i \
-  ../lib/SyncScope_Setup.inl ../lib/RTServer_Setup.inl ../lib/Send_Task.h \
+  ../lib/SyncScope_Setup.inl ../lib/RTClient_Setup.inl ../lib/Send_Task.h \
   ../lib/Servant_var.h \
   $(ACE_ROOT)/ace/Swap.h \
   $(ACE_ROOT)/ace/Swap.inl \
@@ -636,6 +629,9 @@ realclean: clean
   $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
   $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
   $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
   $(ACE_ROOT)/ace/Atomic_Op.h \
@@ -704,13 +700,15 @@ realclean: clean
   $(ACE_ROOT)/ace/Stream_Modules.h \
   $(ACE_ROOT)/ace/Stream_Modules.cpp \
   ../lib/Low_Priority_Setup.h ../lib/Auto_Disconnect.h \
+  ../lib/Auto_Functor.h ../lib/Auto_Functor.inl ../lib/Auto_Functor.cpp \
   ../lib/Auto_Disconnect.inl ../lib/Auto_Disconnect.cpp \
   ../lib/Send_Task_Stopper.h ../lib/Task_Activator.h \
   $(ACE_ROOT)/ace/Copy_Disabled.h \
   ../lib/Task_Activator.inl ../lib/Task_Activator.cpp \
   ../lib/Send_Task_Stopper.inl ../lib/Low_Priority_Setup.cpp \
   $(ACE_ROOT)/ace/Basic_Stats.h \
-  $(ACE_ROOT)/ace/Basic_Stats.inl \
+  $(ACE_ROOT)/ace/Basic_Stats.inl TestC.h \
+  TestC.i \
   $(TAO_ROOT)/tao/Strategies/advanced_resource.h \
   $(TAO_ROOT)/tao/Strategies/strategies_export.h \
   $(TAO_ROOT)/tao/default_resource.h \
@@ -773,6 +771,10 @@ realclean: clean
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
   $(TAO_ROOT)/tao/ORB_Core.i \
   $(TAO_ROOT)/tao/Strategies/advanced_resource.i \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServer.h \
+  $(TAO_ROOT)/tao/RTPortableServer/rtportableserver_export.h \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.h \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.i \
   $(ACE_ROOT)/ace/Get_Opt.h \
   $(ACE_ROOT)/ace/Get_Opt.i \
   $(ACE_ROOT)/ace/High_Res_Timer.h \
@@ -782,7 +784,7 @@ realclean: clean
   $(ACE_ROOT)/ace/Stats.h \
   $(ACE_ROOT)/ace/Stats.i
 
-.obj/Roundtrip.o .obj/Roundtrip.o .obj/Roundtrip.o .obj/Roundtrip.o: Roundtrip.cpp Roundtrip.h \
+.obj/Roundtrip.o .obj/Roundtrip.so .shobj/Roundtrip.o .shobj/Roundtrip.so: Roundtrip.cpp Roundtrip.h \
   $(ACE_ROOT)/ace/pre.h TestS.h TestC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/post.h \
@@ -979,7 +981,7 @@ realclean: clean
   $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
   TestS_T.h TestS_T.i TestS_T.cpp TestS.i
 
-.obj/TestC.o .obj/TestC.o .obj/TestC.o .obj/TestC.o: TestC.cpp TestC.h \
+.obj/TestC.o .obj/TestC.so .shobj/TestC.o .shobj/TestC.so: TestC.cpp TestC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
@@ -1284,7 +1286,7 @@ realclean: clean
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
   $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
 
-.obj/TestS.o .obj/TestS.o .obj/TestS.o .obj/TestS.o: TestS.cpp TestS.h TestC.h \
+.obj/TestS.o .obj/TestS.so .shobj/TestS.o .shobj/TestS.so: TestS.cpp TestS.h TestC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
index 7d79ec739d5..0baab43df2e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp
@@ -3,9 +3,7 @@
 #include "RT_Class.h"
 #include "ORB_Holder.h"
 #include "RIR_Narrow.h"
-#include "RTServer_Setup.h"
-#include "Send_Task.h"
-#include "Low_Priority_Setup.h"
+#include "RTClient_Setup.h"
 #include "TestC.h"
 
 #include "tao/Messaging/Messaging.h"
@@ -17,6 +15,7 @@
 #include "ace/Sample_History.h"
 #include "ace/Basic_Stats.h"
 #include "ace/Stats.h"
+#include "ace/Task.h"
 
 ACE_RCSID(TAO_RTEC_PERF_RTCORBA_Baseline, client, "$Id$")
 
@@ -243,7 +242,7 @@ int main (int argc, char *argv[])
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      RTServer_Setup rtserver_setup (use_rt_corba,
+      RTClient_Setup rtclient_setup (use_rt_corba,
                                      orb,
                                      rt_class,
                                      nthreads
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/generate_cmp.sh b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/generate_cmp.sh
new file mode 100755
index 00000000000..2c7c555e9e8
--- /dev/null
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/generate_cmp.sh
@@ -0,0 +1,10 @@
+#/bin/sh
+
+for i in reactive rtcorba; do
+  echo $i ;
+  for j in 99 999 9999; do
+    paste $i.avg.dat ${i}.${j}.dat |
+      awk '{print $1, $4 / $2}' > $i.${j}.cmp.dat
+  done
+done
+
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/generate_histo.sh b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/generate_histo.sh
new file mode 100755
index 00000000000..9837c080edf
--- /dev/null
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/generate_histo.sh
@@ -0,0 +1,8 @@
+#/bin/sh
+
+for i in *.txt; do
+  b=`basename $i .txt`
+  echo $i
+  awk '/^HISTO/ {print $3}' $i | sort -n | uniq -c |
+    awk '{print $2, 100.0 * $1 / 20000.0}' > $b.histo.dat
+done
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/generate_percentiles.sh b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/generate_percentiles.sh
new file mode 100755
index 00000000000..dc610791904
--- /dev/null
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/generate_percentiles.sh
@@ -0,0 +1,43 @@
+#/bin/sh
+
+CONSUMERS="1 2 4 6 8 10 12 14 16 18 20 22 24"
+
+for t in reactive rtcorba; do
+  cat /dev/null > ${t}.min.dat
+  cat /dev/null > ${t}.avg.dat
+  cat /dev/null > ${t}.99.dat
+  cat /dev/null > ${t}.999.dat
+  cat /dev/null > ${t}.9999.dat
+
+  for c in $CONSUMERS; do
+    INPUT=${t}.${c}.txt
+    awk -v c=$c '/^HISTO/ {n++; s += $3} END {printf("%d %f\n", c, s/n);}' $INPUT >> ${t}.avg.dat
+    awk -v c=$c 'BEGIN { n = 0; }
+                 /^HISTO/ {
+                  if (n == 0 || m > $3) {
+                    m = $3;
+                  }
+                  n++;
+                }
+                END {
+                  printf("%d %f\n", c, m);
+                }' $INPUT >> ${t}.min.dat
+
+    for p in 99 999 9999; do
+      awk '/^HISTO/ {print $3}' $INPUT | sort -n | uniq -c |
+        awk '{print $2, $1 / 20000.0}' |
+        awk -v c=$c -v p=0.${p} '\
+BEGIN { x = 0; }
+{ s += $2;
+  if (x == 0 && s > p) {
+      x = $1;
+  }
+}
+END {
+  printf("%d %f\n", c, x);
+}' >> ${t}.${p}.dat
+    done
+
+  done
+
+done
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/run.sh b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/run.sh
new file mode 100755
index 00000000000..aaa19f49bee
--- /dev/null
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/run.sh
@@ -0,0 +1,39 @@
+#! /bin/sh
+#
+# $Id$
+#
+
+LOW_PRIORITY="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28"
+#"1 2 4 6 8 10 12 14 16 18 20 22 24 26 28 30 32"
+
+#IOR=/project/amras/coryan/IOR/roundtrip.ior
+IOR=test.ior
+
+for c in $LOW_PRIORITY; do
+  date
+  echo rtcorba $c
+
+  /bin/rm -f $IOR
+#  ssh celegorm "cd /project/celegorm/coryan/RTCORBA_Baseline ; ./server -ORBSvcConf realtime.conf -r -n $c -o $IOR" >server.log 2>&1 </dev/null &
+  ./server -ORBSvcConf realtime.conf -r -n $c -o $IOR >server.log 2>&1 </dev/null &
+  while [ ! -f $IOR ]; do
+    sleep 1
+  done
+  ./client -ORBSvcConf realtime.conf -r -d -h 10000 -l 10000 -i 20000 -n $c -k file://$IOR > rtcorba.$c.txt 2>&1
+  sleep 5
+  wait
+
+  date
+  echo reactive $c
+
+  /bin/rm -f $IOR
+#  ssh celegorm "cd /project/celegorm/coryan/RTCORBA_Baseline ; ./server -n $c -o $IOR" >server.log 2>&1 </dev/null &
+  ./server -n $c -o $IOR >server.log 2>&1 </dev/null &
+  while [ ! -f $IOR ]; do
+    sleep 1
+  done
+  ./client -d -h 10000 -l 10000 -i 20000 -n $c -k file://$IOR > reactive.$c.txt 2>&1
+  sleep 5
+  wait
+
+done
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp
index 9eaa769b3a4..20a6985ee68 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp
@@ -90,11 +90,7 @@ int main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      PortableServer::POA_var the_poa = root_poa;
-      if (use_rt_corba)
-        {
-          the_poa = rtserver_setup.poa ();
-        }
+      PortableServer::POA_var the_poa (rtserver_setup.poa ());
 
       Servant_var<Roundtrip> roundtrip (new Roundtrip (orb));
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile
index ab5a2f49646..2f439e935ef 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile
@@ -187,8 +187,6 @@ server: $(addprefix $(VDIR),$(server_OBJS))
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -198,6 +196,7 @@ server: $(addprefix $(VDIR),$(server_OBJS))
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
@@ -236,19 +235,14 @@ server: $(addprefix $(VDIR),$(server_OBJS))
   $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
-  ../lib/RTServer_Setup.h ../lib/RTCORBA_Setup.h \
+  ../lib/RTServer_Setup.h ../lib/RTClient_Setup.h ../lib/RTCORBA_Setup.h \
   $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping_Manager.h \
   $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping.h \
   $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
   $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping_Manager.i \
-  ../lib/RTCORBA_Setup.inl ../lib/RTPOA_Setup.h \
-  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServer.h \
-  $(TAO_ROOT)/tao/RTPortableServer/rtportableserver_export.h \
-  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.h \
-  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.i \
-  ../lib/RTPOA_Setup.inl ../lib/PriorityBand_Setup.h \
+  ../lib/RTCORBA_Setup.inl ../lib/PriorityBand_Setup.h \
   ../lib/PriorityBand_Setup.inl ../lib/SyncScope_Setup.h \
   $(TAO_ROOT)/tao/Messaging/Messaging.h \
   $(TAO_ROOT)/tao/Messaging/MessagingC.h \
@@ -262,7 +256,13 @@ server: $(addprefix $(VDIR),$(server_OBJS))
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/Messaging/MessagingC.i \
-  ../lib/SyncScope_Setup.inl ../lib/RTServer_Setup.inl \
+  ../lib/SyncScope_Setup.inl ../lib/RTClient_Setup.inl \
+  ../lib/RTPOA_Setup.h \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServer.h \
+  $(TAO_ROOT)/tao/RTPortableServer/rtportableserver_export.h \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.h \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.i \
+  ../lib/RTPOA_Setup.inl ../lib/RTServer_Setup.inl \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
@@ -560,8 +560,6 @@ server: $(addprefix $(VDIR),$(server_OBJS))
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -571,6 +569,7 @@ server: $(addprefix $(VDIR),$(server_OBJS))
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
@@ -579,7 +578,8 @@ server: $(addprefix $(VDIR),$(server_OBJS))
   $(ACE_ROOT)/ace/Swap.inl \
   $(ACE_ROOT)/ace/Swap.cpp \
   ../lib/Servant_var.inl ../lib/Servant_var.cpp ../lib/RIR_Narrow.h \
-  ../lib/RIR_Narrow.cpp ../lib/RTServer_Setup.h ../lib/RTCORBA_Setup.h \
+  ../lib/RIR_Narrow.cpp ../lib/RTServer_Setup.h ../lib/RTClient_Setup.h \
+  ../lib/RTCORBA_Setup.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
   $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
@@ -611,15 +611,7 @@ server: $(addprefix $(VDIR),$(server_OBJS))
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
   $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping_Manager.i \
-  ../lib/RTCORBA_Setup.inl ../lib/RTPOA_Setup.h \
-  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServer.h \
-  $(TAO_ROOT)/tao/RTPortableServer/rtportableserver_export.h \
-  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
-  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
-  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
-  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.i \
-  ../lib/RTPOA_Setup.inl ../lib/PriorityBand_Setup.h \
+  ../lib/RTCORBA_Setup.inl ../lib/PriorityBand_Setup.h \
   ../lib/PriorityBand_Setup.inl ../lib/SyncScope_Setup.h \
   $(TAO_ROOT)/tao/Messaging/Messaging.h \
   $(TAO_ROOT)/tao/Messaging/MessagingC.h \
@@ -633,7 +625,16 @@ server: $(addprefix $(VDIR),$(server_OBJS))
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
   $(TAO_ROOT)/tao/Messaging/MessagingC.i \
-  ../lib/SyncScope_Setup.inl ../lib/RTServer_Setup.inl ../lib/Send_Task.h \
+  ../lib/SyncScope_Setup.inl ../lib/RTClient_Setup.inl \
+  ../lib/RTPOA_Setup.h \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServer.h \
+  $(TAO_ROOT)/tao/RTPortableServer/rtportableserver_export.h \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.i \
+  ../lib/RTPOA_Setup.inl ../lib/RTServer_Setup.inl ../lib/Send_Task.h \
   ../lib/Supplier.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
@@ -747,9 +748,10 @@ server: $(addprefix $(VDIR),$(server_OBJS))
   ../lib/Client_Pair.inl ../lib/Loopback_Pair.h \
   ../lib/Loopback_Supplier.h ../lib/Loopback_Consumer.h \
   ../lib/Loopback_Pair.inl ../lib/Client_Group.inl ../lib/ORB_Task.h \
-  ../lib/ORB_Task.inl ../lib/Auto_Disconnect.h ../lib/Auto_Disconnect.inl \
-  ../lib/Auto_Disconnect.cpp ../lib/ORB_Task_Activator.h \
-  ../lib/Task_Activator.h \
+  ../lib/ORB_Task.inl ../lib/Auto_Disconnect.h ../lib/Auto_Functor.h \
+  ../lib/Auto_Functor.inl ../lib/Auto_Functor.cpp \
+  ../lib/Auto_Disconnect.inl ../lib/Auto_Disconnect.cpp \
+  ../lib/ORB_Task_Activator.h ../lib/Task_Activator.h \
   $(ACE_ROOT)/ace/Copy_Disabled.h \
   ../lib/Task_Activator.inl ../lib/Task_Activator.cpp \
   ../lib/ORB_Task_Activator.inl ../lib/Low_Priority_Setup.h \
@@ -757,6 +759,7 @@ server: $(addprefix $(VDIR),$(server_OBJS))
   ../lib/Low_Priority_Setup.cpp \
   $(ACE_ROOT)/ace/Basic_Stats.h \
   $(ACE_ROOT)/ace/Basic_Stats.inl \
+  ../lib/EC_Destroyer.h ../lib/EC_Destroyer.inl \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
index 6816cab2124..b6bf6aaf8c3 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
@@ -147,13 +147,8 @@ int main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      PortableServer::POA_var supplier_poa (root_poa);
-      PortableServer::POA_var consumer_poa (root_poa);
-      if (use_rt_corba != 0)
-        {
-          supplier_poa = rtserver_setup.poa ();
-          consumer_poa = rtserver_setup.poa ();
-        }
+      PortableServer::POA_var supplier_poa (rtserver_setup.poa ());
+      PortableServer::POA_var consumer_poa (rtserver_setup.poa ());
 
       ACE_DEBUG ((LM_DEBUG, "Finished ORB and POA configuration\n"));
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
index dae42796169..99f883071fe 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
@@ -95,11 +95,10 @@ int main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      PortableServer::POA_var ec_poa (root_poa);
-      if (use_rt_corba != 0)
-        {
-          ec_poa = rtserver_setup.poa ();
-        }
+      PortableServer::POA_var ec_poa (rtserver_setup.poa ());
+
+      ACE_DEBUG ((LM_DEBUG, "Finished ORB and POA configuration\n"));
+
       Servant_var<TAO_EC_Event_Channel> ec_impl (
               RTEC_Initializer::create (ec_poa.in (),
                                         ec_poa.in (),
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.cpp
index 0e144a0b445..79426e39a24 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.cpp
@@ -9,35 +9,15 @@
 #define TAO_PERF_RTEC_AUTO_DISCONNECT_CPP
 
 #include "Auto_Disconnect.h"
-#include "tao/Environment.h"
-#include "ace/Swap.h"
 
 #if !defined(__ACE_INLINE__)
 #include "Auto_Disconnect.inl"
 #endif /* __ACE_INLINE__ */
 
-template<class Client>
-Auto_Disconnect<Client>::~Auto_Disconnect ()
-{
-  if (this->client_ == 0)
-    return;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY {
-    this->client_->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  } ACE_CATCHANY {
-    // @@ TODO This event should be logged. Cannot throw because that
-    //    would make it impossible to use this class effectively.
-    //    Read Servant_var.cpp for more details.
-  } ACE_ENDTRY;
-}
-
 template<class Client> Auto_Disconnect<Client>&
 Auto_Disconnect<Client>::operator= (Client *client)
 {
-  Auto_Disconnect<Client> tmp (client);
-  ACE_Swap<Client*>::swap (this->client_, tmp.client_);
+  this->Auto_Functor<Client,Disconnect<Client> >::operator= (client);
   return *this;
 }
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.h
index 72ce91e9eee..b24449e2114 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.h
@@ -8,7 +8,19 @@
 #ifndef TAO_PERF_RTEC_AUTO_DISCONNECT_H
 #define TAO_PERF_RTEC_AUTO_DISCONNECT_H
 
-#include "ace/config-all.h"
+#include "Auto_Functor.h"
+
+/**
+ * @class Disconnect
+ *
+ * @brief Helper functor to call the disconnect() method of a class.
+ */
+template<class Client>
+class Disconnect
+{
+public:
+  void operator() (Client *client ACE_ENV_ARG_DECL);
+};
 
 /**
  * @class Auto_Disconnect
@@ -17,7 +29,7 @@
  *        RTEC client.
  */
 template<class Client>
-class Auto_Disconnect
+class Auto_Disconnect : public Auto_Functor<Client,Disconnect<Client> >
 {
 public:
   /// Constructor
@@ -26,19 +38,8 @@ public:
    */
   ACE_EXPLICIT Auto_Disconnect (Client *s = 0);
 
-  /// Destructor
-  ~Auto_Disconnect (void);
-
-  /// Assingment operator
+  /// Assignment operator
   Auto_Disconnect<Client>& operator= (Client *client);
-
-  /// Release the client, i.e. the destructor does not call any
-  /// methods.
-  void release (void);
-
-private:
-  /// The client
-  Client *client_;
 };
 
 #if defined(__ACE_INLINE__)
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.inl
index 0bdfcfc18dd..84c0df08c1b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.inl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.inl
@@ -6,14 +6,15 @@
  * @author Carlos O'Ryan <coryan@uci.edu>
  */
 
-template<class Client> ACE_INLINE
-Auto_Disconnect<Client>::Auto_Disconnect (Client *client)
-  :  client_ (client)
+template<class Client> ACE_INLINE void
+Disconnect<Client>::operator () (Client *client
+                                 ACE_ENV_ARG_DECL)
 {
+  client->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-template<class Client> ACE_INLINE void
-Auto_Disconnect<Client>::release (void)
+template<class Client> ACE_INLINE
+Auto_Disconnect<Client>::Auto_Disconnect (Client *client)
+  :  Auto_Functor<Client,Disconnect<Client> > (client)
 {
-  this->client_ = 0;
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Functor.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Functor.cpp
new file mode 100644
index 00000000000..058045125e8
--- /dev/null
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Functor.cpp
@@ -0,0 +1,60 @@
+/**
+ * @file Auto_Functor.cpp
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan <coryan@uci.edu>
+ */
+#ifndef TAO_PERF_RTEC_AUTO_FUNCTOR_CPP
+#define TAO_PERF_RTEC_AUTO_FUNCTOR_CPP
+
+#include "Auto_Functor.h"
+#include "tao/Environment.h"
+#include "ace/Swap.h"
+
+#if !defined(__ACE_INLINE__)
+#include "Auto_Functor.inl"
+#endif /* __ACE_INLINE__ */
+
+template<class Client, class Functor>
+Auto_Functor<Client,Functor>::Auto_Functor (const Auto_Functor<Client,Functor> &rhs)
+  : client_ (0)
+{
+  ACE_Swap<Client*>::swap (this->client_, rhs.client_);
+}
+
+template<class Client, class Functor> Auto_Functor<Client,Functor>&
+Auto_Functor<Client,Functor>::operator= (const Auto_Functor<Client,Functor> &rhs)
+{
+  Auto_Functor<Client,Functor> tmp (rhs);
+  ACE_Swap<Client*>::swap (this->client_, tmp.client_);
+  return *this;
+}
+
+template<class Client, class Functor>
+Auto_Functor<Client,Functor>::~Auto_Functor ()
+{
+  if (this->client_ == 0)
+    return;
+
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY {
+    Functor functor;
+    functor (this->client_ ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+  } ACE_CATCHANY {
+    // @@ TODO This event should be logged. Cannot throw because that
+    //    would make it impossible to use this class effectively.
+    //    Read Servant_var.cpp for more details.
+  } ACE_ENDTRY;
+}
+
+template<class Client, class Functor> Auto_Functor<Client,Functor>&
+Auto_Functor<Client,Functor>::operator= (Client *client)
+{
+  Auto_Functor<Client,Functor> tmp (client);
+  ACE_Swap<Client*>::swap (this->client_, tmp.client_);
+  return *this;
+}
+
+#endif /* TAO_PERF_RTEC_AUTO_FUNCTOR_CPP */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Functor.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Functor.h
new file mode 100644
index 00000000000..3217452d6ba
--- /dev/null
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Functor.h
@@ -0,0 +1,58 @@
+/**
+ * @file Auto_Functor.h
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan <coryan@uci.edu>
+ */
+#ifndef TAO_PERF_RTEC_AUTO_FUNCTOR_H
+#define TAO_PERF_RTEC_AUTO_FUNCTOR_H
+
+#include "ace/config-all.h"
+
+/**
+ * @class Auto_Functor
+ *
+ * @brief Automatically invoke the disconnect() operation on some
+ *        RTEC client.
+ *
+ * @todo This template can be extended to work with non-pointer
+ *       arguments, but needs a little work to get there (and some
+ *       specializations of the swap() method).
+ */
+template<class Client, class Functor>
+class Auto_Functor
+{
+public:
+  /// Constructor
+  /**
+   * @param client The client
+   */
+  ACE_EXPLICIT Auto_Functor (Client *s = 0);
+  Auto_Functor (const Auto_Functor<Client,Functor>& rhs);
+  Auto_Functor<Client,Functor>& operator= (const Auto_Functor<Client,Functor>& rhs);
+
+  /// Destructor
+  ~Auto_Functor (void);
+
+  /// Assignment operator
+  Auto_Functor<Client,Functor>& operator= (Client *client);
+
+  /// Release the client, i.e. the destructor does not call any
+  /// methods.
+  void release (void);
+
+private:
+  /// The client
+  Client *client_;
+};
+
+#if defined(__ACE_INLINE__)
+#include "Auto_Functor.inl"
+#endif /* __ACE_INLINE__ */
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "Auto_Functor.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#endif /* TAO_PERF_RTEC_AUTO_FUNCTOR_H */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Functor.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Functor.inl
new file mode 100644
index 00000000000..c76f3f5b1b8
--- /dev/null
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Functor.inl
@@ -0,0 +1,19 @@
+/**
+ * @file Auto_Functor.inl
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan <coryan@uci.edu>
+ */
+
+template<class Client, class Functor> ACE_INLINE
+Auto_Functor<Client,Functor>::Auto_Functor (Client *client)
+  :  client_ (client)
+{
+}
+
+template<class Client, class Functor> ACE_INLINE void
+Auto_Functor<Client,Functor>::release (void)
+{
+  this->client_ = 0;
+}
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
index 934238dc97a..74ec1234ba2 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
@@ -7,6 +7,7 @@
  */
 
 #include "Consumer.h"
+#include "Implicit_Deactivator.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
 ACE_RCSID(TAO_PERF_RTEC, Consumer, "$Id$")
@@ -78,21 +79,15 @@ Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
     proxy = this->proxy_supplier_._retn ();
   }
 
+  Implicit_Deactivator deactivator (this
+                                    ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
   ACE_TRY {
     proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_TRY_CHECK;
   } ACE_CATCHANY {
   } ACE_ENDTRY;
-
-  PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  PortableServer::ObjectId_var id =
-    poa->servant_to_id (this
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 ACE_Sample_History &
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
new file mode 100644
index 00000000000..a419e9ad797
--- /dev/null
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
@@ -0,0 +1,161 @@
+/**
+ * @file Control.cpp
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan <coryan@uci.edu>
+ */
+
+#include "Control.h"
+#include "ORB_Shutdown.h"
+#include "Shutdown.h"
+#include "Auto_Functor.h"
+#include "Auto_Disconnect.h"
+
+#include "ace/High_Res_Timer.h"
+#include "ace/Sample_History.h"
+#include "ace/Basic_Stats.h"
+#include "ace/Auto_Ptr.h"
+
+ACE_RCSID (TAO_RTEC_Perf, Control, "$Id$")
+
+Control::Control (size_t peers_expected,
+                  size_t iterations,
+                  int do_dump_history,
+                  CORBA::ORB_ptr orb,
+                  PortableServer::POA_ptr poa)
+  : peers_expected_ (peers_expected)
+  , iterations_ (iterations)
+  , do_dump_history_ (do_dump_history)
+  , orb_ (CORBA::ORB::_duplicate (orb))
+  , poa_ (PortableServer::POA::_duplicate (poa))
+  , peers_count_ (0)
+  , peers_ (new Federated_Test::Peer_var[this->peers_expected_])
+{
+}
+
+Control::~Control (void)
+{
+  delete[] this->peers_;
+}
+
+void
+Control::join (Federated_Test::Peer_ptr peer
+               ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  {
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
+    if (this->peers_count_ == this->peers_expected_)
+      return;
+
+    this->peers_[this->peers_count_++] =
+      Federated_Test::Peer::_duplicate (peer);
+
+    if (this->peers_count_ < this->peers_expected_)
+      return;
+  }
+
+  /// Automatically shutdown the ORB
+  Auto_Functor<CORBA::ORB,ORB_Shutdown> orb_shutdown (this->orb_.in ());
+
+  /// Automatically shutdown the peers
+  typedef Auto_Functor<Federated_Test::Peer,Shutdown<Federated_Test::Peer> > Peer_Shutdown;
+  ACE_Auto_Basic_Array_Ptr<Peer_Shutdown> peer_shutdown (
+      new Peer_Shutdown[this->peers_count_]
+      );
+
+  size_t i;
+  for (i = 0; i != this->peers_count_; ++i)
+    {
+      peer_shutdown[i] = this->peers_[i].in ();
+    }
+  
+  ACE_DEBUG ((LM_DEBUG,
+              "Control (%P|%t) Building the federation\n"));
+
+  /// Build the EC federation
+  for (i = 0; i != this->peers_count_; ++i)
+    {
+      for (size_t j = 0; j != this->peers_count_; ++j)
+        {
+          if (i != j)
+            {
+              this->peers_[j]->connect (this->peers_[i].in ()
+                                        ACE_ENV_ARG_PARAMETER);
+              ACE_CHECK;
+            }
+        }
+    }
+
+  /// ... run the test(s) ...
+  for (i = 0; i != this->peers_count_; ++i)
+    {
+      /// ... automatically release the object references ...
+      ACE_Auto_Basic_Array_Ptr<Federated_Test::Loopback_var> loopbacks (
+          new Federated_Test::Loopback_var[this->peers_count_]
+          );
+
+      /// ... and automatically disconnect the loopbacks ...
+      typedef Auto_Disconnect<Federated_Test::Loopback> Loopback_Disconnect;
+      ACE_Auto_Basic_Array_Ptr<auto_ptr<Loopback_Disconnect> > disconnects (
+          new auto_ptr<Loopback_Disconnect>[this->peers_count_]
+          );
+
+      ACE_DEBUG ((LM_DEBUG,
+                  "Control (%P|%t) Running test for peer %d\n",
+                  i));
+      CORBA::Long experiment_id = 128 + i;
+      CORBA::Long base_event_type = 32;
+
+      size_t lcount = 0;
+
+      size_t j;
+      for (j = 0; j != this->peers_count_; ++j)
+        {
+          if (j != i)
+            {
+              loopbacks[lcount] =
+                this->peers_[j]->setup_loopback (experiment_id,
+                                                 base_event_type
+                                                 ACE_ENV_ARG_PARAMETER);
+              ACE_CHECK;
+
+              disconnects[lcount] = auto_ptr<Loopback_Disconnect> (
+                  new Loopback_Disconnect (loopbacks[lcount].in ())
+                  );
+              lcount++;
+            }
+        }
+
+      Federated_Test::Experiment_Results_var results =
+        this->peers_[i]->run_experiment (experiment_id,
+                                         this->iterations_
+                                         ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      ACE_Sample_History history (results->length ());
+      for (CORBA::ULong k = 0; k != results->length (); ++k)
+        history.sample (results[k]);
+
+      // We use a fake scale factor because the peer already converted
+      // to microseconds...
+      const ACE_UINT32 fake_scale_factor = 1;
+
+      ACE_Basic_Stats stats;
+      history.collect_basic_stats (stats);
+      stats.dump_results ("Total", fake_scale_factor);
+
+      if (this->do_dump_history_)
+        {
+          history.dump_samples ("HISTORY", fake_scale_factor);
+        }
+    }
+}
+
+PortableServer::POA_ptr
+Control::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return PortableServer::POA::_duplicate (this->poa_.in ());
+}
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h
new file mode 100644
index 00000000000..0644d755a3f
--- /dev/null
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h
@@ -0,0 +1,81 @@
+/**
+ * @file Control.h
+ *
+ * $Id$
+ *
+ */
+
+#ifndef TAO_RTEC_PERF_CONTROL_H
+#define TAO_RTEC_PERF_CONTROL_H
+#include "ace/pre.h"
+
+#include "Federated_TestS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+/**
+ * @class Control
+ *
+ * @brief Implement the Federated_Test::Control interface
+ *
+ */
+class Control
+ : public virtual POA_Federated_Test::Control
+ , public virtual PortableServer::RefCountServantBase
+{
+public:
+  /// Constructor
+  Control (size_t peers_expected,
+           size_t iterations,
+           int do_dump_history,
+           CORBA::ORB_ptr orb,
+           PortableServer::POA_ptr poa);
+
+  /// Destructor
+  virtual ~Control (void);
+
+  //@{
+  /** @name The Federated_Test::Control methods
+   */
+  virtual void join (Federated_Test::Peer_ptr peer
+                     ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  //@}
+
+private:
+  /// Synchronize access to the internal data
+  TAO_SYNCH_MUTEX mutex_;
+
+  /// Number of peers expected
+  size_t peers_expected_;
+
+  /// Number of iterations on each test
+  size_t iterations_;
+
+  /// This flag is set to 1 to dump the complete test history
+  int do_dump_history_;
+
+  /// Keep a reference to the ORB, used in shutdown
+  CORBA::ORB_var orb_;
+
+  /// The default POA
+  PortableServer::POA_var poa_;
+
+  /// Current number of items in the in the @c peers_ array.
+  size_t peers_count_;
+
+  /// An array to keep the list of peers.
+  /**
+   * @todo I would like to use ACE_Array<> but the interface is too
+   * confusing.  std::vector<> would be better, but I'm not allowed to
+   */
+  Federated_Test::Peer_var *peers_;
+};
+
+#include "ace/post.h"
+#endif /* TAO_RTEC_PERF_CONTROL_H */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Federated_Test.idl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Federated_Test.idl
new file mode 100644
index 00000000000..ac013f92dd2
--- /dev/null
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Federated_Test.idl
@@ -0,0 +1,105 @@
+/**
+ * @file Federated_Test.idl
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan <coryan@uci.edu>
+ *
+ */
+
+module Federated_Test
+{
+  interface Peer;
+
+  interface Loopback;
+
+  /**
+   * @interface Coordinator
+   *
+   * @brief Controls a federated test.
+   *
+   * Implementations of the Control interface:
+   *
+   * -# wait for all the peers to join
+   * -# connecting the peers to each other
+   * -# run different experiments on each peer
+   * -# collect the results and print them
+   *
+   */
+  interface Control
+  {
+    /// Join a new peer into the simulation.
+    /**
+     * Implementations of this interface arbitrarly decide when there
+     * are "enough" peers to run the test.
+     */
+    void join (in Peer the_peer);
+  };
+
+  /// The results of a single experiment
+  typedef sequence<unsigned long long> Experiment_Results;
+
+  /**
+   * @interface Peer
+   *
+   * @brief A member of a federated test
+   *
+   * Peers define the required interface to participate in a federated
+   * test.
+   */
+  interface Peer
+  {
+    /// Shutdown the peer
+    void shutdown ();
+
+    /// Setup an Consumer/Supplier loopback pair
+    /**
+     * Some experiments require one or more peers to setup a
+     * "loopback" through their event channel, i.e. a
+     * Consumer/Supplier pair that simply "loop" every event they
+     * receive through the event channel.
+     *
+     * @param experiment_id Each experiment receives a unique ID to
+     * separate resources.
+     *
+     * @param base_event_type The type the Consumer part of the
+     * loopback should subscribe to, the supplier generate events of
+     * type base_event_type + 1
+     *
+     * @return The returned object can be used to disconnect and
+     * destroy the loopback elements.
+     */
+    Loopback setup_loopback (in long experiment_id,
+                             in long base_event_type);
+
+    /// Run a single experiment
+    /**
+     * @param experiment_id Each experiment is assigned a different ID
+     * by the Control object.
+     * @param iterations How many iterations of the experiment should
+     * be run.
+     *
+     * @return All the samples captured in the experiment, the samples
+     * are returned in microseconds.
+     */
+    Experiment_Results run_experiment (in long experiment_id,
+                                       in long iterations);
+
+    /// Return the event channel in this peer
+    readonly attribute Object channel;
+
+    /// Connect to a remote peer
+    void connect (in Peer remote_peer);
+  };
+
+  /**
+   * @interface Loopback
+   *
+   * @brief Control the elements on a Consumer/Supplier loopback pair.
+   */
+  interface Loopback
+  {
+    /// Disconnect and destroy the loopback elements
+    void disconnect ();
+  };
+};
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.cpp
new file mode 100644
index 00000000000..ded3aa19ae6
--- /dev/null
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.cpp
@@ -0,0 +1,74 @@
+/**
+ * @file Implicit_Deactivator.cpp
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan <coryan@uci.edu>
+ */
+
+#include "Implicit_Deactivator.h"
+#include "tao/PortableServer/Servant_Base.h"
+#include "tao/Environment.h"
+#include "ace/Swap.h"
+
+#if !defined(__ACE_INLINE__)
+#include "Implicit_Deactivator.inl"
+#endif /* __ACE_INLINE__ */
+
+Implicit_Deactivator::Implicit_Deactivator (PortableServer::Servant servant
+                                            ACE_ENV_ARG_DECL)
+{
+  this->poa_ =
+    servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  this->id_ =
+    this->poa_->servant_to_id (servant ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+Implicit_Deactivator::Implicit_Deactivator (Implicit_Deactivator &rhs)
+  : poa_ (rhs.poa_)
+  , id_ (rhs.id_)
+{
+  rhs.release ();
+}
+
+Implicit_Deactivator&
+Implicit_Deactivator::operator= (Implicit_Deactivator &rhs)
+{
+  Implicit_Deactivator tmp (rhs);
+  // @@ This seems bogus, there should be a more efficient way to swap
+  //    vars
+  ACE_Swap<PortableServer::POA_var>::swap (this->poa_, tmp.poa_);
+  ACE_Swap<PortableServer::ObjectId_var>::swap (this->id_, tmp.id_);
+  return *this;
+}
+
+Implicit_Deactivator::~Implicit_Deactivator ()
+{
+  if (this->id_.ptr () == 0)
+    return;
+
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY {
+    this->poa_->deactivate_object (this->id_.in ()
+                                   ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+  } ACE_CATCHANY {
+    // @@ TODO This event should be logged. Cannot throw because that
+    //    would make it impossible to use this class effectively.
+    //    Read Servant_var.cpp for more details.
+  } ACE_ENDTRY;
+}
+
+Implicit_Deactivator&
+Implicit_Deactivator::operator= (PortableServer::Servant servant)
+{
+  Implicit_Deactivator tmp (servant);
+  // @@ This seems bogus, there should be a more efficient way to swap
+  //    vars
+  ACE_Swap<PortableServer::POA_var>::swap (this->poa_, tmp.poa_);
+  ACE_Swap<PortableServer::ObjectId_var>::swap (this->id_, tmp.id_);
+  return *this;
+}
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.h
new file mode 100644
index 00000000000..7a8bd639a72
--- /dev/null
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.h
@@ -0,0 +1,52 @@
+/**
+ * @file Implicit_Deactivator.h
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan <coryan@uci.edu>
+ */
+#ifndef TAO_PERF_RTEC_IMPLICIT_DEACTIVATOR_H
+#define TAO_PERF_RTEC_IMPLICIT_DEACTIVATOR_H
+
+#include "rtec_perf_export.h"
+#include "tao/PortableServer/PortableServer.h"
+
+/**
+ * @class Implicit_Deactivator
+ *
+ * @brief Automatically deactivate an implicitly activated object.
+ */
+class TAO_RTEC_Perf_Export Implicit_Deactivator
+{
+public:
+  /// Constructor
+  /**
+   * @param client The client
+   */
+  ACE_EXPLICIT Implicit_Deactivator (PortableServer::Servant servant = 0
+                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+  Implicit_Deactivator (Implicit_Deactivator& rhs);
+  Implicit_Deactivator& operator= (Implicit_Deactivator& rhs);
+
+  /// Destructor
+  ~Implicit_Deactivator (void);
+
+  /// Assignment operator
+  Implicit_Deactivator& operator= (PortableServer::Servant servant);
+
+  /// Release the servant, i.e. the destructor does not deactivate anything
+  void release (void);
+
+private:
+  /// The POA
+  PortableServer::POA_var poa_;
+
+  /// The object id
+  PortableServer::ObjectId_var id_;
+};
+
+#if defined(__ACE_INLINE__)
+#include "Implicit_Deactivator.inl"
+#endif /* __ACE_INLINE__ */
+
+#endif /* TAO_PERF_RTEC_IMPLICIT_DEACTIVATOR_H */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.inl
new file mode 100644
index 00000000000..b220d7959e4
--- /dev/null
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.inl
@@ -0,0 +1,13 @@
+/**
+ * @file Implicit_Deactivator.inl
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan <coryan@uci.edu>
+ */
+
+ACE_INLINE void
+Implicit_Deactivator::release (void)
+{
+  this->id_ = 0;
+}
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
new file mode 100644
index 00000000000..d974b324e85
--- /dev/null
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
@@ -0,0 +1,44 @@
+/**
+ * @file Loopback.cpp
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan <coryan@uci.edu>
+ */
+
+#include "Loopback.h"
+#include "Auto_Disconnect.h"
+#include "Implicit_Deactivator.h"
+
+ACE_RCSID(TAO_RTEC_Perf, Loopback, "$Id$")
+
+Loopback::Loopback (CORBA::Long experiment_id,
+                    CORBA::Long base_event_type,
+                    PortableServer::POA_ptr supplier_poa,
+                    PortableServer::POA_ptr consumer_poa,
+                    RtecEventChannelAdmin::EventChannel_ptr ec
+                    ACE_ENV_ARG_DECL)
+{
+  this->loopback_pair_.init (experiment_id,
+                             base_event_type,
+                             supplier_poa,
+                             consumer_poa);
+
+  this->loopback_pair_.connect (ec ACE_ENV_ARG_PARAMETER);
+}
+
+void
+Loopback::disconnect (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  Auto_Disconnect<Loopback_Pair> disconnect (&this->loopback_pair_);
+
+  Implicit_Deactivator deactivator (this ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h
new file mode 100644
index 00000000000..a6fb0e18866
--- /dev/null
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h
@@ -0,0 +1,48 @@
+/**
+ * @file Loopback.h
+ *
+ * $Id$
+ *
+ */
+
+#ifndef TAO_RTEC_PERF_LOOPBACK_H
+#define TAO_RTEC_PERF_LOOPBACK_H
+
+#include "Federated_TestS.h"
+#include "Loopback_Pair.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+/**
+ * @class Loopback
+ *
+ * @brief Implement the Control::Loopback interface
+ *
+ */
+class Loopback
+ : public virtual POA_Federated_Test::Loopback
+ , public virtual PortableServer::RefCountServantBase
+{
+public:
+  /// Constructor
+  Loopback (CORBA::Long experiment_id,
+            CORBA::Long base_event_type,
+            PortableServer::POA_ptr supplier_poa,
+            PortableServer::POA_ptr consumer_poa,
+            RtecEventChannelAdmin::EventChannel_ptr ec
+            ACE_ENV_ARG_DECL);
+
+  //@{
+  /** @name The Federated_Test::Loopback methods
+   */
+  virtual void disconnect (ACE_ENV_SINGLE_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  //@}
+
+private:
+  Loopback_Pair loopback_pair_;
+};
+
+#endif /* TAO_RTEC_PERF_LOOPBACK_H */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
index 0f9e634df7f..0e1fbef4bb9 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
@@ -7,6 +7,7 @@
  */
 
 #include "Loopback_Consumer.h"
+#include "Implicit_Deactivator.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
 ACE_RCSID(PERF_RTEC, Loopback_Consumer, "$Id$")
@@ -75,20 +76,16 @@ Loopback_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL)
     proxy = this->proxy_supplier_._retn ();
   }
 
+  Implicit_Deactivator deactivator (this
+                                    ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
   ACE_TRY
     {
       proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
-
-  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  PortableServer::ObjectId_var id = poa->servant_to_id (this
-                                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
index 1b919ace35a..ce575dcd439 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
@@ -7,6 +7,7 @@
  */
 
 #include "Loopback_Supplier.h"
+#include "Implicit_Deactivator.h"
 
 ACE_RCSID(TAO_PERF_RTEC, Loopback_Supplier, "$Id$")
 
@@ -67,21 +68,15 @@ Loopback_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
     proxy = this->proxy_consumer_._retn ();
   }
 
+  Implicit_Deactivator deactivator (this
+                                    ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
   ACE_TRY {
     proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_TRY_CHECK;
   } ACE_CATCHANY {
   } ACE_ENDTRY;
-
-  PortableServer::POA_var poa =
-    this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  PortableServer::ObjectId_var id =
-    poa->servant_to_id (this
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile
index 07ad9f04b87..01e93e71c24 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile
@@ -26,6 +26,9 @@ LDLIBS     = \
   -lTAO
 ACE_SHLIBS = $(LDLIBS) -lACE
 
+IDL_FILES = Federated_Test
+IDL_SRC = Federated_TestC.cpp Federated_TestS.cpp
+
 SRCS = \
   Consumer \
   Supplier \
@@ -45,8 +48,15 @@ SRCS = \
   PriorityBand_Setup \
   Send_Task_Stopper \
   ORB_Task_Activator \
+  RTClient_Setup \
   RTServer_Setup \
-  EC_Destroyer
+  EC_Destroyer \
+  Federated_TestC \
+  Federated_TestS \
+  Loopback \
+  Implicit_Deactivator \
+  Peer_Base \
+  Control
 
 TEMPLATE_SOURCES = \
   Servant_var \
@@ -58,6 +68,13 @@ FILES = $(SRCS)
 DEFS  = $(addsuffix .h,$(FILES))
 LSRC  = $(addsuffix .cpp,$(FILES))
 
+TAO_IDLFLAGS += \
+  -Ge 1 \
+  -Wb,export_macro=TAO_RTEC_Perf_Export \
+  -Wb,export_include=rtec_perf_export.h \
+  -Wb,pre_include=ace/pre.h \
+  -Wb,post_include=ace/post.h
+
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -78,6 +95,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 LDFLAGS  += -L$(TAO_ROOT)/tao
 CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
 
+.PRECIOUS: $(foreach file, $(IDL_FILES), $(foreach ext, $(IDL_EXT), $(file)$(ext)))
+
+realclean: clean
+	-$(RM) $(foreach file, $(IDL_FILES), $(foreach ext, $(IDL_EXT), $(file)$(ext)))
+
 #----------------------------------------------------------------------------
 #       Dependencies
 #----------------------------------------------------------------------------
@@ -204,8 +226,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
@@ -261,6 +281,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
@@ -330,6 +351,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
   $(ACE_ROOT)/ace/Sample_History.h \
   $(ACE_ROOT)/ace/Sample_History.inl \
+  Implicit_Deactivator.h Implicit_Deactivator.inl \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i
@@ -452,8 +474,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
@@ -509,6 +529,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
@@ -575,7 +596,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
+  Implicit_Deactivator.h Implicit_Deactivator.inl
 
 .obj/Loopback_Consumer.o .obj/Loopback_Consumer.so .shobj/Loopback_Consumer.o .shobj/Loopback_Consumer.so: Loopback_Consumer.cpp Loopback_Consumer.h \
   Loopback_Supplier.h rtec_perf_export.h \
@@ -696,8 +718,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
@@ -753,6 +773,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
@@ -823,7 +844,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   Servant_var.h $(ACE_ROOT)/ace/Swap.h \
   $(ACE_ROOT)/ace/Swap.inl \
   $(ACE_ROOT)/ace/Swap.cpp Servant_var.inl \
-  Servant_var.cpp \
+  Servant_var.cpp Implicit_Deactivator.h Implicit_Deactivator.inl \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i
@@ -947,8 +968,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
@@ -1004,6 +1023,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
@@ -1070,7 +1090,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
+  Implicit_Deactivator.h Implicit_Deactivator.inl
 
 .obj/ORB_Holder.o .obj/ORB_Holder.so .shobj/ORB_Holder.o .shobj/ORB_Holder.so: ORB_Holder.cpp ORB_Holder.h rtec_perf_export.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -1197,8 +1218,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -1208,6 +1227,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i ORB_Holder.inl
@@ -1374,8 +1394,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -1385,6 +1403,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
@@ -1654,8 +1673,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(ACE_ROOT)/ace/SString.i \
   $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
@@ -1696,6 +1713,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
@@ -1714,9 +1732,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/ORB.i RIR_Narrow.cpp \
   RT_Class.h $(ACE_ROOT)/ace/Sched_Params.h \
   $(ACE_ROOT)/ace/Sched_Params.i \
-  RT_Class.inl \
-  $(TAO_ROOT)/tao/RTCORBA/Continuous_Priority_Mapping.h \
-  $(TAO_ROOT)/tao/RTCORBA/Continuous_Priority_Mapping.i
+  RT_Class.inl
 
 .obj/Send_Task.o .obj/Send_Task.so .shobj/Send_Task.o .shobj/Send_Task.so: Send_Task.cpp Send_Task.h Servant_var.h \
   $(ACE_ROOT)/ace/Swap.h \
@@ -1841,8 +1857,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
@@ -1898,6 +1912,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
@@ -2126,8 +2141,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
@@ -2183,6 +2196,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
@@ -2254,7 +2268,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(ACE_ROOT)/ace/Sample_History.inl \
   Supplier.h Client_Pair.inl Loopback_Pair.h Loopback_Supplier.h \
   Loopback_Consumer.h Loopback_Pair.inl Client_Group.inl \
-  Auto_Disconnect.h Auto_Disconnect.inl Auto_Disconnect.cpp
+  Auto_Disconnect.h Auto_Functor.h Auto_Functor.inl Auto_Functor.cpp \
+  Auto_Disconnect.inl Auto_Disconnect.cpp
 
 .obj/ORB_Task.o .obj/ORB_Task.so .shobj/ORB_Task.o .shobj/ORB_Task.so: ORB_Task.cpp ORB_Task.h rtec_perf_export.h \
   $(ACE_ROOT)/ace/pre.h \
@@ -2381,8 +2396,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -2392,6 +2405,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
@@ -2562,8 +2576,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/Environment.h \
   $(TAO_ROOT)/tao/Environment.i \
   $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
@@ -2580,6 +2592,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
   $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
   $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
@@ -2738,8 +2751,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
@@ -2795,6 +2806,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
@@ -2862,8 +2874,9 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
-  Loopback_Consumer.h Loopback_Pair.inl Auto_Disconnect.h \
-  Auto_Disconnect.inl Auto_Disconnect.cpp
+  Loopback_Consumer.h Loopback_Pair.inl Auto_Disconnect.h Auto_Functor.h \
+  Auto_Functor.inl Auto_Functor.cpp Auto_Disconnect.inl \
+  Auto_Disconnect.cpp
 
 .obj/Client_Pair.o .obj/Client_Pair.so .shobj/Client_Pair.o .shobj/Client_Pair.so: Client_Pair.cpp Client_Pair.h Servant_var.h \
   $(ACE_ROOT)/ace/Swap.h \
@@ -2988,8 +3001,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
@@ -3045,6 +3056,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
@@ -3114,7 +3126,8 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
   $(ACE_ROOT)/ace/Sample_History.h \
   $(ACE_ROOT)/ace/Sample_History.inl \
-  Supplier.h Client_Pair.inl Auto_Disconnect.h Auto_Disconnect.inl \
+  Supplier.h Client_Pair.inl Auto_Disconnect.h Auto_Functor.h \
+  Auto_Functor.inl Auto_Functor.cpp Auto_Disconnect.inl \
   Auto_Disconnect.cpp
 
 .obj/RTPOA_Setup.o .obj/RTPOA_Setup.so .shobj/RTPOA_Setup.o .shobj/RTPOA_Setup.so: RTPOA_Setup.cpp RTPOA_Setup.h rtec_perf_export.h \
@@ -3232,8 +3245,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(ACE_ROOT)/ace/SString.i \
   $(TAO_ROOT)/tao/Exception.i \
   $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
@@ -3274,6 +3285,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
@@ -3424,8 +3436,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -3435,6 +3445,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
@@ -3596,8 +3607,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/CDR.i \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Sequence.h \
   $(TAO_ROOT)/tao/Managed_Types.h \
@@ -3653,6 +3662,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
@@ -3885,8 +3895,6 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/Object.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
-  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -3896,6 +3904,7 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(TAO_ROOT)/tao/Object.i \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
@@ -3946,4 +3955,2168 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
   $(ACE_ROOT)/ace/Copy_Disabled.h \
   Task_Activator.inl Task_Activator.cpp ORB_Task_Activator.inl
 
+.obj/RTClient_Setup.o .obj/RTClient_Setup.so .shobj/RTClient_Setup.o .shobj/RTClient_Setup.so: RTClient_Setup.cpp RTClient_Setup.h \
+  $(ACE_ROOT)/ace/pre.h RTCORBA_Setup.h \
+  rtec_perf_export.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
+  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
+  $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping_Manager.h \
+  $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping.h \
+  $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping_Manager.i \
+  RTCORBA_Setup.inl PriorityBand_Setup.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
+  PriorityBand_Setup.inl SyncScope_Setup.h \
+  $(TAO_ROOT)/tao/Messaging/Messaging.h \
+  $(TAO_ROOT)/tao/Messaging/MessagingC.h \
+  $(TAO_ROOT)/tao/Messaging/messaging_export.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/Messaging/MessagingC.i \
+  SyncScope_Setup.inl RTClient_Setup.inl RIR_Narrow.h RIR_Narrow.cpp
+
+.obj/RTServer_Setup.o .obj/RTServer_Setup.so .shobj/RTServer_Setup.o .shobj/RTServer_Setup.so: RTServer_Setup.cpp RTServer_Setup.h \
+  $(ACE_ROOT)/ace/pre.h RTClient_Setup.h \
+  RTCORBA_Setup.h rtec_perf_export.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
+  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
+  $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping_Manager.h \
+  $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping.h \
+  $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping_Manager.i \
+  RTCORBA_Setup.inl PriorityBand_Setup.h \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ORB.i \
+  PriorityBand_Setup.inl SyncScope_Setup.h \
+  $(TAO_ROOT)/tao/Messaging/Messaging.h \
+  $(TAO_ROOT)/tao/Messaging/MessagingC.h \
+  $(TAO_ROOT)/tao/Messaging/messaging_export.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/Messaging/MessagingC.i \
+  SyncScope_Setup.inl RTClient_Setup.inl RTPOA_Setup.h \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServer.h \
+  $(TAO_ROOT)/tao/RTPortableServer/rtportableserver_export.h \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.i \
+  RTPOA_Setup.inl RTServer_Setup.inl RIR_Narrow.h RIR_Narrow.cpp
+
+.obj/EC_Destroyer.o .obj/EC_Destroyer.so .shobj/EC_Destroyer.o .shobj/EC_Destroyer.so: EC_Destroyer.cpp EC_Destroyer.h rtec_perf_export.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/ObjectIDList.h \
+  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
+  EC_Destroyer.inl
+
+.obj/Federated_TestC.o .obj/Federated_TestC.so .shobj/Federated_TestC.o .shobj/Federated_TestC.so: Federated_TestC.cpp Federated_TestC.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/ObjectIDList.h \
+  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  rtec_perf_export.h Federated_TestC.i \
+  $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/PICurrent.h \
+  $(TAO_ROOT)/tao/PICurrent.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.i \
+  $(TAO_ROOT)/tao/Invocation.h \
+  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
+  $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/TAOC.i \
+  $(TAO_ROOT)/tao/operation_details.h \
+  $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/Service_Context.inl \
+  $(TAO_ROOT)/tao/target_specification.h \
+  $(TAO_ROOT)/tao/target_specification.i \
+  $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+  $(TAO_ROOT)/tao/Invocation.i \
+  $(TAO_ROOT)/tao/PortableInterceptor.h \
+  $(TAO_ROOT)/tao/RequestInfo_Util.h \
+  $(TAO_ROOT)/tao/ClientRequestInfo_i.h \
+  $(TAO_ROOT)/tao/ClientRequestInfo_i.inl \
+  $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
+  $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
+
+.obj/Federated_TestS.o .obj/Federated_TestS.so .shobj/Federated_TestS.o .shobj/Federated_TestS.so: Federated_TestS.cpp Federated_TestS.h \
+  $(ACE_ROOT)/ace/pre.h Federated_TestC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/ObjectIDList.h \
+  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  rtec_perf_export.h Federated_TestC.i \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+  $(ACE_ROOT)/ace/Atomic_Op.h \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(ACE_ROOT)/ace/Atomic_Op.cpp \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+  Federated_TestS_T.h Federated_TestS_T.i Federated_TestS_T.cpp \
+  Federated_TestS.i \
+  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
+  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
+  $(ACE_ROOT)/ace/Map.h \
+  $(ACE_ROOT)/ace/Map_T.h \
+  $(ACE_ROOT)/ace/Pair.h \
+  $(ACE_ROOT)/ace/Pair_T.h \
+  $(ACE_ROOT)/ace/Pair_T.i \
+  $(ACE_ROOT)/ace/Pair_T.cpp \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Active_Map_Manager.h \
+  $(ACE_ROOT)/ace/Active_Map_Manager.i \
+  $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Map_T.i \
+  $(ACE_ROOT)/ace/Map_T.cpp \
+  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \
+  $(TAO_ROOT)/tao/PortableServer/poa_macros.h \
+  $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \
+  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+  $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PortableServer/Default_Policy_Validator.h \
+  $(TAO_ROOT)/tao/Policy_Validator.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policies.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policies.i \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \
+  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
+  $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Server_Request.h \
+  $(TAO_ROOT)/tao/Tagged_Profile.h \
+  $(TAO_ROOT)/tao/GIOPC.h \
+  $(TAO_ROOT)/tao/GIOPC.i \
+  $(TAO_ROOT)/tao/Tagged_Profile.i \
+  $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/Service_Context.inl \
+  $(TAO_ROOT)/tao/PICurrent.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(TAO_ROOT)/tao/PICurrent.inl \
+  $(TAO_ROOT)/tao/TAO_Server_Request.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/Stub.i \
+  $(TAO_ROOT)/tao/IFR_Client_Adapter.h \
+  $(TAO_ROOT)/tao/PortableInterceptor.h \
+  $(TAO_ROOT)/tao/RequestInfo_Util.h \
+  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+  $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.h \
+  $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.inl \
+  $(ACE_ROOT)/ace/Dynamic_Service.h \
+  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
+  $(ACE_ROOT)/ace/Dynamic_Service.i \
+  $(ACE_ROOT)/ace/Dynamic_Service.cpp
+
+.obj/Loopback.o .obj/Loopback.so .shobj/Loopback.o .shobj/Loopback.so: Loopback.cpp Loopback.h Federated_TestS.h \
+  $(ACE_ROOT)/ace/pre.h Federated_TestC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/ObjectIDList.h \
+  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  rtec_perf_export.h Federated_TestC.i \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+  $(ACE_ROOT)/ace/Atomic_Op.h \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(ACE_ROOT)/ace/Atomic_Op.cpp \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+  Federated_TestS_T.h Federated_TestS_T.i Federated_TestS_T.cpp \
+  Federated_TestS.i Loopback_Pair.h Servant_var.h \
+  $(ACE_ROOT)/ace/Swap.h \
+  $(ACE_ROOT)/ace/Swap.inl \
+  $(ACE_ROOT)/ace/Swap.cpp Servant_var.inl \
+  Servant_var.cpp Loopback_Supplier.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
+  $(TAO_ROOT)/tao/TimeBaseS.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/TimeBaseS_T.h \
+  $(TAO_ROOT)/tao/TimeBaseS_T.i \
+  $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+  $(TAO_ROOT)/tao/TimeBaseS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
+  Loopback_Consumer.h Loopback_Pair.inl Auto_Disconnect.h Auto_Functor.h \
+  Auto_Functor.inl Auto_Functor.cpp Auto_Disconnect.inl \
+  Auto_Disconnect.cpp Implicit_Deactivator.h Implicit_Deactivator.inl
+
+.obj/Implicit_Deactivator.o .obj/Implicit_Deactivator.so .shobj/Implicit_Deactivator.o .shobj/Implicit_Deactivator.so: Implicit_Deactivator.cpp Implicit_Deactivator.h \
+  rtec_perf_export.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  Implicit_Deactivator.inl \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+  $(ACE_ROOT)/ace/Atomic_Op.h \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(ACE_ROOT)/ace/Atomic_Op.cpp \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+  $(ACE_ROOT)/ace/Swap.h \
+  $(ACE_ROOT)/ace/Swap.inl \
+  $(ACE_ROOT)/ace/Swap.cpp
+
+.obj/Peer_Base.o .obj/Peer_Base.so .shobj/Peer_Base.o .shobj/Peer_Base.so: Peer_Base.cpp Peer_Base.h Federated_TestS.h \
+  $(ACE_ROOT)/ace/pre.h Federated_TestC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/ObjectIDList.h \
+  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  rtec_perf_export.h Federated_TestC.i \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+  $(ACE_ROOT)/ace/Atomic_Op.h \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(ACE_ROOT)/ace/Atomic_Op.cpp \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+  Federated_TestS_T.h Federated_TestS_T.i Federated_TestS_T.cpp \
+  Federated_TestS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
+  RTServer_Setup.h RTClient_Setup.h RTCORBA_Setup.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
+  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
+  $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping_Manager.h \
+  $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping.h \
+  $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping.i \
+  $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping_Manager.i \
+  RTCORBA_Setup.inl PriorityBand_Setup.h PriorityBand_Setup.inl \
+  SyncScope_Setup.h \
+  $(TAO_ROOT)/tao/Messaging/Messaging.h \
+  $(TAO_ROOT)/tao/Messaging/MessagingC.h \
+  $(TAO_ROOT)/tao/Messaging/messaging_export.h \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/Messaging/MessagingC.i \
+  SyncScope_Setup.inl RTClient_Setup.inl RTPOA_Setup.h \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServer.h \
+  $(TAO_ROOT)/tao/RTPortableServer/rtportableserver_export.h \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.h \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.i \
+  RTPOA_Setup.inl RTServer_Setup.inl RIR_Narrow.h RIR_Narrow.cpp \
+  Servant_var.h $(ACE_ROOT)/ace/Swap.h \
+  $(ACE_ROOT)/ace/Swap.inl \
+  $(ACE_ROOT)/ace/Swap.cpp Servant_var.inl \
+  Servant_var.cpp RTEC_Initializer.h EC_Destroyer.h EC_Destroyer.inl \
+  Auto_Disconnect.h Auto_Functor.h Auto_Functor.inl Auto_Functor.cpp \
+  Auto_Disconnect.inl Auto_Disconnect.cpp Loopback.h Loopback_Pair.h \
+  Loopback_Supplier.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
+  $(TAO_ROOT)/tao/TimeBaseS.h \
+  $(TAO_ROOT)/tao/TimeBaseS_T.h \
+  $(TAO_ROOT)/tao/TimeBaseS_T.i \
+  $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
+  $(TAO_ROOT)/tao/TimeBaseS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
+  Loopback_Consumer.h Loopback_Pair.inl \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Defaults.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Gateway.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.cpp \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h
+
+.obj/Control.o .obj/Control.so .shobj/Control.o .shobj/Control.so: Control.cpp Control.h \
+  $(ACE_ROOT)/ace/pre.h Federated_TestS.h \
+  Federated_TestC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/ObjectIDList.h \
+  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  rtec_perf_export.h Federated_TestC.i \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+  $(ACE_ROOT)/ace/Atomic_Op.h \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(ACE_ROOT)/ace/Atomic_Op.cpp \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+  Federated_TestS_T.h Federated_TestS_T.i Federated_TestS_T.cpp \
+  Federated_TestS.i ORB_Shutdown.h ORB_Shutdown.inl Shutdown.h \
+  Auto_Functor.h Auto_Functor.inl Auto_Functor.cpp \
+  $(ACE_ROOT)/ace/Swap.h \
+  $(ACE_ROOT)/ace/Swap.inl \
+  $(ACE_ROOT)/ace/Swap.cpp Shutdown.inl \
+  Shutdown.cpp Auto_Disconnect.h Auto_Disconnect.inl Auto_Disconnect.cpp \
+  $(ACE_ROOT)/ace/High_Res_Timer.h \
+  $(ACE_ROOT)/ace/High_Res_Timer.i \
+  $(ACE_ROOT)/ace/Sample_History.h \
+  $(ACE_ROOT)/ace/Sample_History.inl \
+  $(ACE_ROOT)/ace/Basic_Stats.h \
+  $(ACE_ROOT)/ace/Basic_Stats.inl
+
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.cpp
new file mode 100644
index 00000000000..3d9485f34f9
--- /dev/null
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.cpp
@@ -0,0 +1,14 @@
+/**
+ * @file Shutdown.cpp
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan <coryan@uci.edu>
+ */
+#include "Shutdown.h"
+
+#if !defined(__ACE_INLINE__)
+#include "Shutdown.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(TAO_PERF_RTEC, Shutdown, "$Id$")
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.h
new file mode 100644
index 00000000000..9c0c9fc5e02
--- /dev/null
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.h
@@ -0,0 +1,32 @@
+/**
+ * @file ORB_Shutdown.h
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan <coryan@uci.edu>
+ */
+#ifndef TAO_PERF_RTEC_ORB_SHUTDOWN_H
+#define TAO_PERF_RTEC_ORB_SHUTDOWN_H
+#include "ace/pre.h"
+
+#include "rtec_perf_export.h"
+#include "tao/ORB.h"
+
+/**
+ * @class ORB_Shutdown
+ *
+ * @brief Helper functor to call the shutdown() operation in the ORB.
+ */
+class ORB_Shutdown
+{
+public:
+  void operator() (CORBA::ORB_ptr orb
+                   ACE_ENV_ARG_DECL);
+};
+
+#if defined(__ACE_INLINE__)
+#include "ORB_Shutdown.inl"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/post.h"
+#endif /* TAO_PERF_RTEC_ORB_SHUTDOWN_H */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl
new file mode 100644
index 00000000000..c0864ee4aa7
--- /dev/null
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl
@@ -0,0 +1,15 @@
+/**
+ * @file ORB_Shutdown.inl
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan <coryan@uci.edu>
+ */
+
+ACE_INLINE void
+ORB_Shutdown::operator () (CORBA::ORB_ptr orb
+                           ACE_ENV_ARG_DECL)
+{
+  orb->shutdown (0
+                 ACE_ENV_SINGLE_ARG_PARAMETER);
+}
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
new file mode 100644
index 00000000000..8e663c4cd45
--- /dev/null
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
@@ -0,0 +1,149 @@
+/**
+ * @file Peer_Base.cpp
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan <coryan@uci.edu>
+ */
+
+#include "Peer_Base.h"
+#include "RTServer_Setup.h"
+#include "RIR_Narrow.h"
+#include "Servant_var.h"
+#include "RTEC_Initializer.h"
+#include "EC_Destroyer.h"
+#include "Auto_Disconnect.h"
+#include "Loopback.h"
+
+#include "orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/Event/EC_Gateway.h"
+
+ACE_RCSID (TAO_RTEC_Perf, Peer_Base, "$Id$")
+
+Peer_Base::Peer_Base (CORBA::ORB_ptr orb,
+                      RTServer_Setup &rtserver_setup
+                      ACE_ENV_ARG_DECL)
+  : orb_ (CORBA::ORB::_duplicate (orb))
+  , poa_ (rtserver_setup.poa ())
+{
+  Servant_var<TAO_EC_Event_Channel> ec_impl (
+      RTEC_Initializer::create (this->poa_.in (),
+                                this->poa_.in (),
+                                rtserver_setup.rtcorba_setup ()
+                                ACE_ENV_ARG_PARAMETER)
+      );
+  ACE_CHECK;
+
+  ec_impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  PortableServer::ObjectId_var ec_id =
+    this->poa_->activate_object (ec_impl.in ()
+                                 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  CORBA::Object_var ec_object =
+    this->poa_->id_to_reference (ec_id.in ()
+                                 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  this->event_channel_ =
+    RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in ()
+                                                  ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+Peer_Base::~Peer_Base (void)
+{
+}
+
+void
+Peer_Base::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  {
+    EC_Destroyer ec_destroyer (this->event_channel_.in ());
+    this->event_channel_ =
+      RtecEventChannelAdmin::EventChannel::_nil ();
+  }
+
+  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object_ptr
+Peer_Base::channel (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return CORBA::Object::_duplicate (this->event_channel_.in ());
+}
+
+void
+Peer_Base::connect (Federated_Test::Peer_ptr remote_peer
+                    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // ACE_DEBUG ((LM_DEBUG, "(%P|%t) Connecting....\n"));
+  CORBA::Object_var remote_ec_object =
+    remote_peer->channel (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  RtecEventChannelAdmin::EventChannel_var remote_ec =
+    RtecEventChannelAdmin::EventChannel::_narrow (remote_ec_object.in ()
+                                                  ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  Servant_var<TAO_EC_Gateway_IIOP> gateway (new TAO_EC_Gateway_IIOP);
+  gateway->init (remote_ec.in (),
+                 this->event_channel_.in ()
+                 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  RtecEventChannelAdmin::Observer_var observer =
+    gateway->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  RtecEventChannelAdmin::Observer_Handle h =
+    this->event_channel_->append_observer (observer.in ()
+                                           ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  gateway->observer_handle (h);
+}
+
+Federated_Test::Loopback_ptr
+Peer_Base::setup_loopback (CORBA::Long experiment_id,
+                           CORBA::Long base_event_type
+                           ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  Servant_var<Loopback> loopback (
+      new Loopback (experiment_id,
+                    base_event_type,
+                    this->poa_.in (),
+                    this->poa_.in (),
+                    this->event_channel_.in ()
+                    ACE_ENV_ARG_PARAMETER));
+  ACE_CHECK_RETURN (Federated_Test::Loopback::_nil ());
+
+  Auto_Disconnect<Loopback> disconnect (loopback);
+
+  Federated_Test::Loopback_var lb =
+    loopback->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (Federated_Test::Loopback::_nil ());
+
+  disconnect.release ();
+
+  return lb._retn ();
+}
+
+PortableServer::POA_ptr
+Peer_Base::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return PortableServer::POA::_duplicate (this->poa_.in ());
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h
new file mode 100644
index 00000000000..0cfb751b5a6
--- /dev/null
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h
@@ -0,0 +1,77 @@
+/**
+ * @file Peer_Base.h
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan <coryan@uci.edu>
+ *
+ */
+
+#ifndef TAO_RTEC_PERF_PEER_BASE_H
+#define TAO_RTEC_PERF_PEER_BASE_H
+
+#include "Federated_TestS.h"
+#include "orbsvcs/RtecEventChannelAdminC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+class RTServer_Setup;
+
+/**
+ * @class Peer_Base
+ *
+ * @brief Implement the shared portions of Federated_Test::Peer
+ *        servants
+ *
+ */
+class Peer_Base
+ : public virtual POA_Federated_Test::Peer
+ , public virtual PortableServer::RefCountServantBase
+{
+public:
+  /// Constructor
+  Peer_Base (CORBA::ORB_ptr orb,
+             RTServer_Setup &rtserver_setup
+             ACE_ENV_ARG_DECL);
+
+  /// Destructor
+  virtual ~Peer_Base (void);
+
+  //@{
+  /** @name The Federated_Test::Peer methods
+   */
+  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  virtual CORBA::Object_ptr
+      channel (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+  virtual void connect (Federated_Test::Peer_ptr remote_peer
+                        ACE_ENV_ARG_DECL_NOT_USED)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  Federated_Test::Loopback_ptr setup_loopback (CORBA::Long experiment_id,
+                                               CORBA::Long base_event_type
+                                               ACE_ENV_ARG_DECL_NOT_USED)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  //@}
+
+protected:
+  /// Keep a reference to the ORB, used in shutdown
+  CORBA::ORB_var orb_;
+
+  /// The POA used for the suppliers, consumers, activate the EC and
+  /// as this servant's _default_POA()
+  PortableServer::POA_var poa_;
+
+  /// Event Channel references
+  RtecEventChannelAdmin::EventChannel_var event_channel_;
+};
+
+#endif /* TAO_RTEC_PERF_PEER_BASE_H */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
index 75acc3c3e9a..6ef03eec91f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
@@ -59,4 +59,3 @@ PriorityBand_Setup::PriorityBand_Setup (CORBA::ORB_ptr orb,
 PriorityBand_Setup::~PriorityBand_Setup (void)
 {
 }
-
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp
new file mode 100644
index 00000000000..6bf90420095
--- /dev/null
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp
@@ -0,0 +1,46 @@
+/**
+ * @file RTClient_Setup.cpp
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan <coryan@uci.edu>
+ */
+
+#include "RTClient_Setup.h"
+#include "RIR_Narrow.h"
+#include "tao/RTCORBA/RTCORBA.h"
+
+#include "ace/Log_Msg.h"
+
+#if !defined(__ACE_INLINE__)
+#include "RTClient_Setup.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(TAO_PERF_RTEC, RTClient_Setup, "$Id$")
+
+RTClient_Setup::RTClient_Setup (int use_rt_corba,
+                                CORBA::ORB_ptr orb,
+                                const RT_Class &rt_class,
+                                int nthreads
+                                ACE_ENV_ARG_DECL)
+  : use_rt_corba_ (use_rt_corba)
+  , syncscope_setup_ (orb ACE_ENV_ARG_PARAMETER)
+{
+  ACE_CHECK;
+
+  if (use_rt_corba)
+    {
+      this->rtcorba_setup_ =
+        auto_ptr<RTCORBA_Setup> (new RTCORBA_Setup (orb,
+                                                    rt_class,
+                                                    nthreads
+                                                    ACE_ENV_ARG_PARAMETER));
+      ACE_CHECK;
+
+      this->priorityband_setup_ =
+        auto_ptr<PriorityBand_Setup> (new PriorityBand_Setup (orb,
+                                                              *this->rtcorba_setup_
+                                                              ACE_ENV_ARG_PARAMETER));
+      ACE_CHECK;
+    }
+}
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h
new file mode 100644
index 00000000000..9ec7bec9402
--- /dev/null
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h
@@ -0,0 +1,59 @@
+/**
+ * @file RTClient_Setup.h
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan <coryan@uci.edu>
+ */
+
+#ifndef TAO_PERF_RTEC_RTCLIENT_SETUP_H
+#define TAO_PERF_RTEC_RTCLIENT_SETUP_H
+#include "ace/pre.h"
+
+#include "RTCORBA_Setup.h"
+#include "PriorityBand_Setup.h"
+#include "SyncScope_Setup.h"
+#include "ace/Auto_Ptr.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+class RT_Class;
+
+/**
+ * @class RTClient_Setup
+ *
+ * @brief Simplify the initialization of performance tests.
+ *
+ */
+class TAO_RTEC_Perf_Export RTClient_Setup
+{
+public:
+  /// Constructor
+  RTClient_Setup (int use_rt_corba,
+                  CORBA::ORB_ptr orb,
+                  const RT_Class &rt_class,
+                  int nthreads
+                  ACE_ENV_ARG_DECL);
+
+  /// Return non-zero if RTCORBA is enabled
+  int use_rt_corba (void) const;
+
+  /// Return the underlying RTCORBA_Setup pointer
+  RTCORBA_Setup *rtcorba_setup (void);
+
+private:
+  int use_rt_corba_;
+
+  auto_ptr<RTCORBA_Setup> rtcorba_setup_;
+  auto_ptr<PriorityBand_Setup> priorityband_setup_;
+  SyncScope_Setup syncscope_setup_;
+};
+
+#if defined(__ACE_INLINE__)
+#include "RTClient_Setup.inl"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/post.h"
+#endif /* TAO_PERF_RTEC_RTCLIENT_SETUP_H */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.inl
new file mode 100644
index 00000000000..7e7eebf1254
--- /dev/null
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.inl
@@ -0,0 +1,19 @@
+/**
+ * @file RTClient_Setup.inl
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan <coryan@uci.edu>
+ */
+
+ACE_INLINE int
+RTClient_Setup::use_rt_corba (void) const
+{
+  return this->use_rt_corba_;
+}
+
+ACE_INLINE RTCORBA_Setup *
+RTClient_Setup::rtcorba_setup (void)
+{
+  return this->rtcorba_setup_.get ();
+}
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp
index e41718d2b81..61ba5d971f3 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp
@@ -41,7 +41,7 @@ RTPOA_Setup::RTPOA_Setup (CORBA::ORB_ptr orb,
   const CORBA::Boolean allow_request_buffering = 0;
   const CORBA::ULong max_buffered_requests   = 0; // dummy value
   const CORBA::ULong max_request_buffer_size = 0; // dummy value
-  
+
   RTCORBA::ThreadpoolId pool_id =
     rtorb->create_threadpool_with_lanes (stacksize,
                                          lanes,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp
index 51992df25c4..f388765f717 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp
@@ -23,30 +23,31 @@ RTServer_Setup::RTServer_Setup (int use_rt_corba,
                                 const RT_Class &rt_class,
                                 int nthreads
                                 ACE_ENV_ARG_DECL)
-  : syncscope_setup_ (orb
-                      ACE_ENV_ARG_PARAMETER)
+  : RTClient_Setup (use_rt_corba,
+                    orb,
+                    rt_class,
+                    nthreads
+                    ACE_ENV_ARG_DECL)
 {
   ACE_CHECK;
 
   if (use_rt_corba)
     {
-      this->rtcorba_setup_ =
-        auto_ptr<RTCORBA_Setup> (new RTCORBA_Setup (orb,
-                                                    rt_class,
-                                                    nthreads
-                                                    ACE_ENV_ARG_PARAMETER));
-      ACE_CHECK;
-
       this->rtpoa_setup_ =
         auto_ptr<RTPOA_Setup> (new RTPOA_Setup (orb,
-                                                *this->rtcorba_setup_
+                                                *this->rtcorba_setup ()
                                                 ACE_ENV_ARG_PARAMETER));
       ACE_CHECK;
 
-      this->priorityband_setup_ =
-        auto_ptr<PriorityBand_Setup> (new PriorityBand_Setup (orb,
-                                                              *this->rtcorba_setup_
-                                                              ACE_ENV_ARG_PARAMETER));
+      this->poa_ =
+        this->rtpoa_setup_->poa ();
+    }
+  else
+    {
+      this->poa_ =
+        RIR_Narrow<RTPortableServer::POA>::resolve (orb,
+                                                    "RootPOA"
+                                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.h
index 7a17750411c..a7fe3180e32 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.h
@@ -8,26 +8,22 @@
 
 #ifndef TAO_PERF_RTEC_RTSERVER_SETUP_H
 #define TAO_PERF_RTEC_RTSERVER_SETUP_H
+#include "ace/pre.h"
 
-#include "RTCORBA_Setup.h"
+#include "RTClient_Setup.h"
 #include "RTPOA_Setup.h"
-#include "PriorityBand_Setup.h"
-#include "SyncScope_Setup.h"
-#include "ace/Auto_Ptr.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class RT_Class;
-
 /**
  * @class RTServer_Setup
  *
  * @brief Simplify the initialization of performance tests.
  *
  */
-class TAO_RTEC_Perf_Export RTServer_Setup
+class TAO_RTEC_Perf_Export RTServer_Setup : public RTClient_Setup
 {
 public:
   /// Constructor
@@ -40,18 +36,15 @@ public:
   /// Return the POA configured by the RTPOA_Setup
   PortableServer::POA_ptr poa (void);
 
-  /// Return the underlying RTCORBA_Setup pointer
-  RTCORBA_Setup *rtcorba_setup (void);
-
 private:
-  auto_ptr<RTCORBA_Setup> rtcorba_setup_;
+  PortableServer::POA_var poa_;
+
   auto_ptr<RTPOA_Setup> rtpoa_setup_;
-  auto_ptr<PriorityBand_Setup> priorityband_setup_;
-  SyncScope_Setup syncscope_setup_;
 };
 
 #if defined(__ACE_INLINE__)
 #include "RTServer_Setup.inl"
 #endif /* __ACE_INLINE__ */
 
+#include "ace/post.h"
 #endif /* TAO_PERF_RTEC_RTSERVER_SETUP_H */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.inl
index 0a2d404b767..40816da97c0 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.inl
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.inl
@@ -9,11 +9,5 @@
 ACE_INLINE PortableServer::POA_ptr
 RTServer_Setup::poa (void)
 {
-  return this->rtpoa_setup_->poa ();
-}
-
-ACE_INLINE RTCORBA_Setup *
-RTServer_Setup::rtcorba_setup (void)
-{
-  return this->rtcorba_setup_.get ();
+  return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.cpp
new file mode 100644
index 00000000000..84d42ba3bc6
--- /dev/null
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.cpp
@@ -0,0 +1,17 @@
+/**
+ * @file Shutdown.cpp
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan <coryan@uci.edu>
+ */
+#ifndef TAO_PERF_RTEC_SHUTDOWN_CPP
+#define TAO_PERF_RTEC_SHUTDOWN_CPP
+
+#include "Shutdown.h"
+
+#if !defined(__ACE_INLINE__)
+#include "Shutdown.inl"
+#endif /* __ACE_INLINE__ */
+
+#endif /* TAO_PERF_RTEC_SHUTDOWN_CPP */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.h
new file mode 100644
index 00000000000..bb5165d982a
--- /dev/null
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.h
@@ -0,0 +1,35 @@
+/**
+ * @file Shutdown.h
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan <coryan@uci.edu>
+ */
+#ifndef TAO_PERF_RTEC_SHUTDOWN_H
+#define TAO_PERF_RTEC_SHUTDOWN_H
+
+#include "ace/config-all.h"
+#include "ace/CORBA_macros.h"
+
+/**
+ * @class Shutdown
+ *
+ * @brief Helper functor to call the shutdown() method of a class.
+ */
+template<class Client>
+class Shutdown
+{
+public:
+  void operator() (Client *client
+                   ACE_ENV_ARG_DECL);
+};
+
+#if defined(__ACE_INLINE__)
+#include "Shutdown.inl"
+#endif /* __ACE_INLINE__ */
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "Shutdown.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#endif /* TAO_PERF_RTEC_SHUTDOWN_H */
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.inl
new file mode 100644
index 00000000000..5c169567ba2
--- /dev/null
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.inl
@@ -0,0 +1,14 @@
+/**
+ * @file Shutdown.inl
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan <coryan@uci.edu>
+ */
+
+template<class Client> ACE_INLINE void
+Shutdown<Client>::operator () (Client *client
+                               ACE_ENV_ARG_DECL)
+{
+  client->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
index 0f11f150ad5..ee4800dc3d3 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
@@ -7,6 +7,7 @@
  */
 
 #include "Supplier.h"
+#include "Implicit_Deactivator.h"
 
 ACE_RCSID(TAO_PERF_RTEC, Supplier, "$Id$")
 
@@ -66,20 +67,16 @@ Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL)
     proxy = this->proxy_consumer_._retn ();
   }
 
+  Implicit_Deactivator deactivator (this
+                                    ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
   ACE_TRY
     {
       proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
-
-  PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  PortableServer::ObjectId_var id = poa->servant_to_id (this
-                                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
 }
 
 void