Fri Jun 1 22:32:52 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com>

10 files changed, 83 insertions, 448 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 5805dd0ba7a..3cb745b9f24 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,32 @@
+Fri Jun  1 22:32:52 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * NEWS:
+
+          Added a comment regarding IPv6 Mcast federation support.
+
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp:
+
+          Make use of new ip address equality test in ACE_INET_Addr.
+
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/Makefile.am:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/README:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc:
+          Removed references to the barrier and the distributed address
+          server, they were not needed for the test. For cross platform
+          validation of the address server there is now a separate test
+          case.
+
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/supplier.conf:
+
+          Added a ConsumerControl specification so that a manually run
+          supplier doesn't start spinning when the consumer goes away.
+
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/AddrServerMain.cpp:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/Barrier.idl:
+
+          Removed these files, they were proved to be useless.
+
 Fri Jun  1 19:03:46 UTC 2007  Ciju John  <johnc at ociweb dot com>
 
         * TAO_IDL/fe/lex.yy.cpp:
diff --git a/TAO/NEWS b/TAO/NEWS
index c359fe45d1b..8e4612fa4f5 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -14,6 +14,9 @@ USER VISIBLE CHANGES BETWEEN TAO-1.5.8 and TAO-1.5.9
 . When using AMI collocated in case of exceptions they are deliverd
   to the reply handler instead of passed back to the caller
 
+. Added support for IPv6 multicast addresses when federating RTEvent
+  channels.
+
 USER VISIBLE CHANGES BETWEEN TAO-1.5.7 and TAO-1.5.8
 ====================================================
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
index 07d399ad3aa..a201234c375 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
@@ -47,10 +47,7 @@ TAO_ECG_UDP_Out_Endpoint::is_loopback (const ACE_INET_Addr& from)
        i != this->ifs_ + this->if_count_;
        ++i)
     {
-      if (i->get_addr_size() == from.get_addr_size() &&
-          ACE_OS::memcmp( i->get_addr(),
-                          from.get_addr(),
-                          from.get_addr_size()))
+      if (i->is_ip_equal(from))
         return true;
     }
   return false;
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/AddrServerMain.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/AddrServerMain.cpp
deleted file mode 100644
index 625f37449b2..00000000000
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/AddrServerMain.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-// $Id$
-
-// AddrServerMain.cpp
-// Main program for a common Address server instance to be shared by all
-// event channels
-
-#include "SimpleAddressServer.h"
-#include "BarrierS.h"
-
-#include "orbsvcs/CosNamingC.h"
-
-#include "ace/Barrier.h"
-#include "ace/Task.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/OS_NS_strings.h"
-#include <fstream>
-
-class Barrier_i : public virtual POA_Barrier
-{
-public:
-  Barrier_i (int count) : barrier_(count)
-  {
-    ACE_DEBUG ((LM_DEBUG,"Barrier, count = %d\n", count));
-  }
-
-  void wait (void)
-  {
-    ACE_DEBUG ((LM_DEBUG,"%t entering wait%d\n"));
-    this->barrier_.wait();
-    ACE_DEBUG ((LM_DEBUG,"%t exiting wait%d\n"));
-  }
-
-private:
-  ACE_Barrier barrier_;
-};
-
-class ORB_Task : public ACE_Task_Base
-{
-public:
-  ORB_Task (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) {}
-
-  int svc () { this->orb_->run(); return 1; }
-
-private:
-  CORBA::ORB_var orb_;
-};
-
-int main (int argc, char* argv[])
-{
-  try
-  {
-    // Initialize the ORB.
-    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
-
-    const char* address = "localhost";
-    int num_nodes = 2;
-
-    u_short port = 12345;
-
-    for (int i = 0; argv[i] != 0; i++)
-      {
-        if (ACE_OS::strcasecmp(argv[i], "-address") == 0)
-          {
-            if (argv[i+1] != 0)
-              address = argv[++i];
-            else
-              ACE_ERROR_RETURN ((LM_ERROR, "Missing address\n"),0);
-          }
-        else if (ACE_OS::strcasecmp(argv[i], "-port") == 0)
-          {
-            if (argv[i+1] != 0)
-              port = ACE_OS::atoi(argv[++i]);
-            else
-              ACE_ERROR_RETURN ((LM_ERROR, "Missing port\n"),0);
-          }
-        else if (ACE_OS::strcasecmp(argv[i], "-nodes") == 0)
-          {
-            if (argv[i+1] != 0)
-              num_nodes = ACE_OS::atoi(argv[++i]);
-            else
-              ACE_ERROR_RETURN ((LM_ERROR, "Missing node count\n"),0);
-          }
-      }
-
-    // Get the POA
-    CORBA::Object_var tmpobj = orb->resolve_initial_references ("RootPOA");
-    PortableServer::POA_var poa = PortableServer::POA::_narrow (tmpobj.in ());
-    PortableServer::POAManager_var poa_manager = poa->the_POAManager ();
-    poa_manager->activate ();
-
-    // Find the Naming Service.
-    tmpobj = orb->resolve_initial_references("NameService");
-    CosNaming::NamingContextExt_var root_context =
-      CosNaming::NamingContextExt::_narrow(tmpobj.in());
-
-    // Initialize the address server with the desired address.
-    // This will be used by the sender object and the multicast
-    // receiver.
-    ACE_INET_Addr send_addr (port, address);
-    SimpleAddressServer addr_srv_impl (send_addr);
-
-    PortableServer::ObjectId_var oid = poa->activate_object(&addr_srv_impl);
-    tmpobj = poa->id_to_reference(oid.in());
-
-    // Bind the Addr server using Naming Services
-    CosNaming::Name_var name = root_context->to_name("Echo_address");
-    root_context->rebind(name.in(), tmpobj.in());
-
-    // Activate a barrier object
-    Barrier_i barrier_impl(num_nodes);
-
-    oid = poa->activate_object(&barrier_impl);
-    tmpobj = poa->id_to_reference(oid.in());
-
-    name = root_context->to_name ("Echo_barrier");
-    root_context->rebind(name.in(), tmpobj.in());
-
-    // run the ORB
-    ORB_Task orb_task(orb.in());
-    orb_task.activate ( THR_NEW_LWP | THR_JOINABLE,
-                        num_nodes+1);
-    orb_task.wait();
-    orb->destroy();
-    return 0;
-  }
-  catch (CORBA::Exception& exc)
-  {
-    ACE_ERROR ((LM_ERROR,
-    "Caught CORBA::Exception\n%s (%s)\n",
-    exc._name (), exc._rep_id ()));
-  }
-  return 1;
-}
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/Barrier.idl b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/Barrier.idl
deleted file mode 100644
index 6a92f9d161b..00000000000
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/Barrier.idl
+++ /dev/null
@@ -1,9 +0,0 @@
-// $Id$
-
-/// A simple way to have a distributed synchronization point for a specific
-/// number of participants.
-interface Barrier {
-  /// Wait until the implementation specified number of participants have
-  /// called, then simply return.
-  void wait ();
-};
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
index 664945f931d..b1535e20373 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
@@ -5,7 +5,6 @@
 
 #include "EchoEventSupplier_i.h"
 #include "SimpleAddressServer.h"
-#include "BarrierC.h"
 
 #include "orbsvcs/RtecEventCommC.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
@@ -29,8 +28,6 @@
 const RtecEventComm::EventSourceID MY_SOURCE_ID  = ACE_ES_EVENT_SOURCE_ANY + 1;
 const RtecEventComm::EventType     MY_EVENT_TYPE = ACE_ES_EVENT_UNDEFINED + 1;
 
-const int EVENT_DELAY_MS = 10;
-
 // Initialize the ORB.
 
 int main (int argc, char* argv[])
@@ -141,19 +138,12 @@ int main (int argc, char* argv[])
     ACE_INET_Addr send_addr (port, address);
     SimpleAddressServer addr_srv_impl (send_addr);
 
-    try
-      {
-        tmpobj = root_context->resolve_str ("Echo_address");
-      }
-    catch (const ::CosNaming::NamingContext::NotFound &)
-      {
-        // Create an instance of the addr server for local use
+    // Create an instance of the addr server for local use
 
-        PortableServer::ObjectId_var addr_srv_oid =
-          poa->activate_object(&addr_srv_impl);
-        tmpobj =
-          poa->id_to_reference(addr_srv_oid.in());
-      }
+    PortableServer::ObjectId_var addr_srv_oid =
+      poa->activate_object(&addr_srv_impl);
+    tmpobj =
+      poa->id_to_reference(addr_srv_oid.in());
 
     RtecUDPAdmin::AddrServer_var addr_srv =
       RtecUDPAdmin::AddrServer::_narrow(tmpobj.in());
@@ -162,11 +152,17 @@ int main (int argc, char* argv[])
     TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> sender =
                                 TAO_ECG_UDP_Sender::create();
     TAO_ECG_UDP_Out_Endpoint endpoint;
-    if (endpoint.dgram ().open (ACE_Addr::sap_any) == -1) {
-      ACE_ERROR_RETURN ((LM_ERROR,
-       "Cannot open send endpoint\n"),
-      1);
-    }
+    // need to be explicit about the address type when built with
+    // IPv6 support, otherwise SOCK_DGram::open defaults to ipv6 when
+    // given a sap_any address. This causes trouble on at least solaris
+    // and windows, or at most on not-linux.
+    if (endpoint.dgram ().open (ACE_Addr::sap_any,
+                                send_addr.get_type()) == -1)
+      {
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot open send endpoint\n"),
+                          1);
+      }
 
    // TAO_ECG_UDP_Sender::init() takes a TAO_ECG_Refcounted_Endpoint.
     // If we don't clone our endpoint and pass &endpoint, the sender will
@@ -221,20 +217,6 @@ int main (int argc, char* argv[])
       //eh.reset(udp_eh.release());
     }
 
-    // Check to see if there is a Barrier server available and if so,
-    // wait for it.
-     try
-      {
-        tmpobj = root_context->resolve_str ("Echo_barrier");
-        Barrier_var barrier = Barrier::_narrow (tmpobj.in());
-        if (!CORBA::is_nil(barrier.in()))
-            barrier->wait();
-      }
-    catch (const ::CORBA::Exception &)
-      {
-        // no worries, just keep going.
-      }
-
     // Create an event (just a string in this case).
     const CORBA::String_var eventData = CORBA::string_dup(ecname);
 
@@ -259,7 +241,7 @@ int main (int argc, char* argv[])
     ACE_DEBUG ((LM_DEBUG,
     "Starting main loop\n"));
 
-    const int EVENT_DELAY_MS = 10;
+    const int EVENT_DELAY_MS = 1000;
 
     while (1) {
       consumer->push (event);
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/Makefile.am
index 8fe939d5343..ba7e9e16b05 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/Makefile.am
@@ -11,157 +11,14 @@
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
 
-## Makefile.RTEC_MCast_Federated_Idl.am
-
-BUILT_SOURCES = \
-  BarrierC.cpp \
-  BarrierC.h \
-  BarrierC.inl \
-  BarrierS.cpp \
-  BarrierS.h \
-  BarrierS.inl \
-  BarrierS_T.cpp \
-  BarrierS_T.h \
-  BarrierS_T.inl
-
-CLEANFILES = \
-  Barrier-stamp \
-  BarrierC.cpp \
-  BarrierC.h \
-  BarrierC.inl \
-  BarrierS.cpp \
-  BarrierS.h \
-  BarrierS.inl \
-  BarrierS_T.cpp \
-  BarrierS_T.h \
-  BarrierS_T.inl
-
-BarrierC.cpp BarrierC.h BarrierC.inl BarrierS.cpp BarrierS.h BarrierS.inl BarrierS_T.cpp BarrierS_T.h BarrierS_T.inl: Barrier-stamp
-
-Barrier-stamp: $(srcdir)/Barrier.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Barrier.idl
-	@touch "$@"
-
-
-noinst_HEADERS = \
-  Barrier.idl
-
-## Makefile.RTEC_MCast_Federated_AddrServer.am
-
-if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
-
-BUILT_SOURCES += \
-  BarrierC.cpp \
-  BarrierC.h \
-  BarrierC.inl \
-  BarrierS.cpp \
-  BarrierS.h \
-  BarrierS.inl \
-  BarrierS_T.cpp \
-  BarrierS_T.h \
-  BarrierS_T.inl
-
-CLEANFILES += \
-  Barrier-stamp \
-  BarrierC.cpp \
-  BarrierC.h \
-  BarrierC.inl \
-  BarrierS.cpp \
-  BarrierS.h \
-  BarrierS.inl \
-  BarrierS_T.cpp \
-  BarrierS_T.h \
-  BarrierS_T.inl
-
-BarrierC.cpp BarrierC.h BarrierC.inl BarrierS.cpp BarrierS.h BarrierS.inl BarrierS_T.cpp BarrierS_T.h BarrierS_T.inl: Barrier-stamp
-
-Barrier-stamp: $(srcdir)/Barrier.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Barrier.idl
-	@touch "$@"
-
-noinst_PROGRAMS += AddrServer
-
-AddrServer_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common \
-  -DACE_HAS_IPV6
-
-AddrServer_SOURCES = \
-  AddrServerMain.cpp \
-  BarrierC.cpp \
-  BarrierS.cpp \
-  SimpleAddressServer.cpp \
-  BarrierC.h \
-  BarrierC.inl \
-  BarrierS.h \
-  BarrierS.inl \
-  BarrierS_T.h \
-  BarrierS_T.inl \
-  SimpleAddressServer.h
-
-AddrServer_LDADD = \
-  libTAO_RTEvent_Serv.la \
-  libTAO_RTEvent_Skel.la \
-  libTAO_RTEvent.la \
-  libTAO_Svc_Utils.la \
-  libTAO_Messaging.la \
-  libTAO_PI.la \
-  libTAO_CodecFactory.la \
-  libTAO_PortableServer.la \
-  libTAO_Valuetype.la \
-  libTAO_CosNaming.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  libACE.la
-
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_CORBA_MESSAGING
-
 ## Makefile.RTEC_MCast_Federated_Consumer.am
 
 if BUILD_CORBA_MESSAGING
-
-BUILT_SOURCES += \
-  BarrierC.cpp \
-  BarrierC.h \
-  BarrierC.inl \
-  BarrierS.cpp \
-  BarrierS.h \
-  BarrierS.inl \
-  BarrierS_T.cpp \
-  BarrierS_T.h \
-  BarrierS_T.inl
-
-CLEANFILES += \
-  Barrier-stamp \
-  BarrierC.cpp \
-  BarrierC.h \
-  BarrierC.inl \
-  BarrierS.cpp \
-  BarrierS.h \
-  BarrierS.inl \
-  BarrierS_T.cpp \
-  BarrierS_T.h \
-  BarrierS_T.inl
-
-BarrierC.cpp BarrierC.h BarrierC.inl BarrierS.cpp BarrierS.h BarrierS.inl BarrierS_T.cpp BarrierS_T.h BarrierS_T.inl: Barrier-stamp
-
-Barrier-stamp: $(srcdir)/Barrier.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Barrier.idl
-	@touch "$@"
+if BUILD_EXCEPTIONS
 
 noinst_PROGRAMS += EchoEventConsumer
 
@@ -172,70 +29,36 @@ EchoEventConsumer_CPPFLAGS = \
   -I$(TAO_BUILDDIR) \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common \
-  -DACE_HAS_IPV6
+  -I$(srcdir)/../Common
 
 EchoEventConsumer_SOURCES = \
-  BarrierC.cpp \
-  BarrierS.cpp \
   EchoEventConsumerMain.cpp \
   EchoEventConsumer_i.cpp \
-  BarrierC.h \
-  BarrierC.inl \
-  BarrierS.h \
-  BarrierS.inl \
-  BarrierS_T.h \
-  BarrierS_T.inl \
   EchoEventConsumer_i.h
 
 EchoEventConsumer_LDADD = \
-  libTAO_RTEvent_Skel.la \
-  libTAO_RTEvent.la \
-  libTAO_Svc_Utils.la \
-  libTAO_Messaging.la \
-  libTAO_PI.la \
-  libTAO_CodecFactory.la \
-  libTAO_PortableServer.la \
-  libTAO_Valuetype.la \
-  libTAO_CosNaming.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  libACE.la
-
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.RTEC_MCast_Federated_Supplier.am
 
 if BUILD_CORBA_MESSAGING
+if BUILD_EXCEPTIONS
 if !BUILD_ACE_FOR_TAO
 
-BUILT_SOURCES += \
-  BarrierC.cpp \
-  BarrierC.h \
-  BarrierC.inl \
-  BarrierS.h \
-  BarrierS.inl \
-  BarrierS_T.cpp \
-  BarrierS_T.h \
-  BarrierS_T.inl
-
-CLEANFILES += \
-  Barrier-stamp \
-  BarrierC.cpp \
-  BarrierC.h \
-  BarrierC.inl \
-  BarrierS.h \
-  BarrierS.inl \
-  BarrierS_T.cpp \
-  BarrierS_T.h \
-  BarrierS_T.inl
-
-BarrierC.cpp BarrierC.h BarrierC.inl BarrierS.h BarrierS.inl BarrierS_T.cpp BarrierS_T.h BarrierS_T.inl: Barrier-stamp
-
-Barrier-stamp: $(srcdir)/Barrier.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Barrier.idl
-	@touch "$@"
-
 noinst_PROGRAMS += EchoEventSupplier
 
 EchoEventSupplier_CPPFLAGS = \
@@ -245,46 +68,34 @@ EchoEventSupplier_CPPFLAGS = \
   -I$(TAO_BUILDDIR) \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common \
-  -DACE_HAS_IPV6
+  -I$(srcdir)/../Common
 
 EchoEventSupplier_SOURCES = \
-  BarrierC.cpp \
   EchoEventSupplierMain.cpp \
   EchoEventSupplier_i.cpp \
   SimpleAddressServer.cpp \
-  BarrierC.h \
-  BarrierC.inl \
-  BarrierS.h \
-  BarrierS.inl \
-  BarrierS_T.h \
-  BarrierS_T.inl \
   EchoEventSupplier_i.h \
   SimpleAddressServer.h
 
 EchoEventSupplier_LDADD = \
-  libTAO_RTEvent_Serv.la \
-  libTAO_RTEvent_Skel.la \
-  libTAO_RTEvent.la \
-  libTAO_Svc_Utils.la \
-  libTAO_Messaging.la \
-  libTAO_PI.la \
-  libTAO_CodecFactory.la \
-  libTAO_PortableServer.la \
-  libTAO_Valuetype.la \
-  libTAO_CosNaming.la \
-  libTAO_AnyTypeCode.la \
-  libTAO.la \
-  libACE.la
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_ACE_FOR_TAO
+endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
-
-ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = foreign
-
 ## Clean up template repositories, etc.
 clean-local:
 	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/README b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/README
index 8f1b47d3e44..548f8a03a48 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/README
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/README
@@ -124,23 +124,7 @@ SimpleAddressServer.{h,cpp}
   to listen to based on consumer subscriptions.  This simple
   implementation always returns the same address.
 
--------------------------------------------------------------------------
-
-AddrServerMain.cpp
-
-  A main wrapper for running a stand-alone SimpleAddressServer instance.
-  This is used to support a test that spans multiple hosts to insure
-  proper functionality of the address server.
-
--------------------------------------------------------------------------
-
-Barrier.idl
 
-  This idl file defines a simple interface that presents a barrier for
-  synchronizing multiple senders. The implementation is in the stand
-  alone address server, which must be told how many clients to expect.
-  It then starts that number of threads plus an additional thread so
-  that an ACE_Barrier may be used to implement the waiting.
 
 Exeuction via Perl Script
 -------------------------
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc
index 7ded0a1c4a6..d3e2d7cc20d 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc
@@ -1,15 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*idl): taoidldefaults {
-  IDL_Files {
-    Barrier.idl
-  }
-  custom_only = 1
-}
-
 project(*Supplier): namingexe, rteventexe, rtevent_serv {
-  after += *idl
   exename   = EchoEventSupplier
 
   specific(automake) {
@@ -20,14 +12,12 @@ project(*Supplier): namingexe, rteventexe, rtevent_serv {
 
   Source_Files {
     SimpleAddressServer.cpp
-    BarrierC.cpp
     EchoEventSupplierMain.cpp
     EchoEventSupplier_i.cpp
   }
 }
 
 project(*Consumer): namingexe, rteventexe,  {
-  after += *idl
   exename   = EchoEventConsumer
 
   specific(automake) {
@@ -41,22 +31,3 @@ project(*Consumer): namingexe, rteventexe,  {
     EchoEventConsumer_i.cpp
   }
 }
-
-project(*AddrServer): namingexe, rtevent_serv {
-  after += *idl
-  exename = AddrServer
-
-  specific(automake) {
-    includes += $(srcdir)/../Common
-  } else {
-    includes += ../Common
-  }
-
-  Source_Files {
-    BarrierC.cpp
-    BarrierS.cpp
-    AddrServerMain.cpp
-    SimpleAddressServer.cpp
-  }
-
-}
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/supplier.conf b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/supplier.conf
index d9eeea24f43..5ec352ab7be 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/supplier.conf
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/supplier.conf
@@ -1,2 +1,2 @@
 # $Id$
-static EC_Factory "-ECobserver basic"
+static EC_Factory "-ECobserver basic -ECConsumerControl Reactive"