Thu May 31 19:13:32 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com>

6 files changed, 255 insertions, 46 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index f334b26f05a..f161e016020 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,16 @@
+Thu May 31 19:13:32 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * orbsvcs/orbsvcs/RtecUDPAdmin.idl:
+          Clean up typo in comment.
+
+        * orbsvcs/tests/EC_MT_Mcast/AddrServer.h:
+        * orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp:
+          Move the dependency on ace/INET_Addr.h into the cpp.
+
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/Makefile.am:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc:
+          regenerated Makefile.am to get automake builds working.
+
 Thu May 31 13:17:00 UTC 2007  Simon Massey  <sma@prismtech.com>
 
         * tao/GIOP_Message_Base.cpp:
@@ -21,12 +34,12 @@ Wed May 30 20:18:11 UTC 2007  Yan Dai  <dai_y@ociweb.com>
         tao/*Seq.pidl will generate code to include the DDS version
         of the generated code instead of TAO version sequence code
         so it supports DDS serialization.
-        
+
         * TAO_IDL/be/be_global.cpp:
         * TAO_IDL/be_include/be_global.h:
 
           Added gen_dcps_type_support_only flag.
-          
+
         * TAO_IDL/be/be_codegen.cpp:
         * TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp:
         * TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp:
@@ -34,11 +47,11 @@ Wed May 30 20:18:11 UTC 2007  Yan Dai  <dai_y@ociweb.com>
           Generated code similar to before with -Gdcps except using #if 0
           to disable TAO specific code when -Gdcpsonly is given.
           The DDS CORBA::*Seq generated code will include the
-          TAO CORBA::*Seq generated code so both TAO and DDS 
+          TAO CORBA::*Seq generated code so both TAO and DDS
           functions will be available.
 
         * TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp:
-        
+
           Fixed bugs that call strlen() without check if it's nil string.
 
 Wed May 30 20:06:04 UTC 2007  Adam Mitz  <mitza@ociweb.com>
diff --git a/TAO/orbsvcs/orbsvcs/RtecUDPAdmin.idl b/TAO/orbsvcs/orbsvcs/RtecUDPAdmin.idl
index 849c4096a9e..38217d203fb 100644
--- a/TAO/orbsvcs/orbsvcs/RtecUDPAdmin.idl
+++ b/TAO/orbsvcs/orbsvcs/RtecUDPAdmin.idl
@@ -90,7 +90,7 @@ module RtecUDPAdmin
   {
     /// Get the UDP address given the event header
     /**
-     * @deprecated, applications should use get_ip_address, which
+     * @deprecated, applications should use get_address, which
      *   supports both IPv4 and IPv6 addresses.
      * @param header The event header, used to fetch the type and
      *   source of the event
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp
index 7b937301170..951f5177e26 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp
@@ -2,6 +2,7 @@
 // Reused from: $TAO_ROOT/orbsvcs/examples/RtEC/MCast
 
 #include "AddrServer.h"
+#include "ace/INET_Addr.h"
 
 ACE_RCSID(EC_MT_Mcast,
           AddrServer,
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h
index 02a10bbe3b4..df931b22a8b 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 // Reused from: $TAO_ROOT/orbsvcs/examples/RtEC/MCast
 
@@ -6,7 +7,10 @@
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/RtecUDPAdminS.h"
-#include "ace/INET_Addr.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_INET_Addr;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 class AddrServer : public POA_RtecUDPAdmin::AddrServer
 {
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 ba7e9e16b05..8fe939d5343 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/Makefile.am
@@ -11,14 +11,157 @@
 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
-if BUILD_EXCEPTIONS
+
+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 += EchoEventConsumer
 
@@ -29,36 +172,70 @@ EchoEventConsumer_CPPFLAGS = \
   -I$(TAO_BUILDDIR) \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common
+  -I$(srcdir)/../Common \
+  -DACE_HAS_IPV6
 
 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 = \
-  $(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
+  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_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 = \
@@ -68,34 +245,46 @@ EchoEventSupplier_CPPFLAGS = \
   -I$(TAO_BUILDDIR) \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../Common
+  -I$(srcdir)/../Common \
+  -DACE_HAS_IPV6
 
 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 = \
-  $(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
+  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_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/RTEC_MCast_Federated.mpc b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/RTEC_MCast_Federated.mpc
index 20b3d7bf071..7ded0a1c4a6 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,7 +1,15 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Barrier.idl
+  }
+  custom_only = 1
+}
+
 project(*Supplier): namingexe, rteventexe, rtevent_serv {
+  after += *idl
   exename   = EchoEventSupplier
 
   specific(automake) {
@@ -10,10 +18,6 @@ project(*Supplier): namingexe, rteventexe, rtevent_serv {
     includes += ../Common
   }
 
-  IDL_Files {
-    Barrier.idl
-  }
-
   Source_Files {
     SimpleAddressServer.cpp
     BarrierC.cpp
@@ -23,6 +27,7 @@ project(*Supplier): namingexe, rteventexe, rtevent_serv {
 }
 
 project(*Consumer): namingexe, rteventexe,  {
+  after += *idl
   exename   = EchoEventConsumer
 
   specific(automake) {
@@ -38,6 +43,7 @@ project(*Consumer): namingexe, rteventexe,  {
 }
 
 project(*AddrServer): namingexe, rtevent_serv {
+  after += *idl
   exename = AddrServer
 
   specific(automake) {
@@ -46,10 +52,6 @@ project(*AddrServer): namingexe, rtevent_serv {
     includes += ../Common
   }
 
-  IDL_Files {
-    Barrier.idl
-  }
-
   Source_Files {
     BarrierC.cpp
     BarrierS.cpp