diff options
Diffstat (limited to 'orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated')
5 files changed, 9 insertions, 113 deletions
diff --git a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp b/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp index 10c7ff35b06..8708015e3d0 100644 --- a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp +++ b/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp @@ -22,7 +22,7 @@ EchoEventConsumer_i::EchoEventConsumer_i(CORBA::ORB_ptr orb, int event_limit) void EchoEventConsumer_i::push(const RtecEventComm::EventSet& events) { // Loop through the events, looking for shutdown events. - for (u_int i = 0; i < events.length (); ++i) + for (u_int i = 0; i < events.length (); ++i) { //ACE_OS::printf("."); // Extract event data from the any. @@ -37,14 +37,14 @@ void EchoEventConsumer_i::push(const RtecEventComm::EventSet& events) << " source: " << events[i].header.source; #if !defined (TAO_LACKS_EVENT_CHANNEL_ANY) - if (events[i].data.any_value >>= eventData) + if (events[i].data.any_value >>= eventData) { out << " text: " << eventData; } #else if (events[i].data.payload.length() > 0) { - out << " text: " << + out << " text: " << (const char *)events[i].data.payload.get_buffer(); } #endif /* !TAO_LACKS_EVENT_CHANNEL_ANY */ diff --git a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp b/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp index 50216f31ff9..ed54c02d3d9 100644 --- a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp +++ b/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp @@ -150,7 +150,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) RtecUDPAdmin::AddrServer::_narrow(tmpobj.in()); // Create and initialize the sender object - TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> sender = + PortableServer::Servant_var<TAO_ECG_UDP_Sender> sender = TAO_ECG_UDP_Sender::create(); TAO_ECG_UDP_Out_Endpoint endpoint; // need to be explicit about the address type when built with @@ -179,7 +179,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) sender->connect (sub); // Create and initialize the receiver - TAO_EC_Servant_Var<TAO_ECG_UDP_Receiver> receiver = + PortableServer::Servant_var<TAO_ECG_UDP_Receiver> receiver = TAO_ECG_UDP_Receiver::create(); // TAO_ECG_UDP_Receiver::init() takes a TAO_ECG_Refcounted_Endpoint. @@ -200,7 +200,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) auto_ptr<TAO_ECG_Mcast_EH> mcast_eh(new TAO_ECG_Mcast_EH (receiver.in())); mcast_eh->reactor (orb->orb_core ()->reactor ()); mcast_eh->open (ec.in()); - ACE_AUTO_PTR_RESET(eh,mcast_eh.release(),ACE_Event_Handler); + ACE_auto_ptr_reset(eh,mcast_eh.release()); //eh.reset(mcast_eh.release()); } else { auto_ptr<TAO_ECG_UDP_EH> udp_eh (new TAO_ECG_UDP_EH (receiver.in())); @@ -209,7 +209,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (udp_eh->open (local_addr) == -1) ACE_ERROR ((LM_ERROR,"Cannot open EH\n")); - ACE_AUTO_PTR_RESET(eh,udp_eh.release(),ACE_Event_Handler); + ACE_auto_ptr_reset(eh,udp_eh.release()); //eh.reset(udp_eh.release()); } diff --git a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/Makefile.am b/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/Makefile.am deleted file mode 100644 index ba7e9e16b05..00000000000 --- a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/Makefile.am +++ /dev/null @@ -1,105 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.RTEC_MCast_Federated_Consumer.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += EchoEventConsumer - -EchoEventConsumer_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(srcdir)/../Common - -EchoEventConsumer_SOURCES = \ - EchoEventConsumerMain.cpp \ - EchoEventConsumer_i.cpp \ - 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 -endif BUILD_CORBA_MESSAGING - -## Makefile.RTEC_MCast_Federated_Supplier.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += EchoEventSupplier - -EchoEventSupplier_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -I$(srcdir)/../Common - -EchoEventSupplier_SOURCES = \ - EchoEventSupplierMain.cpp \ - EchoEventSupplier_i.cpp \ - SimpleAddressServer.cpp \ - 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 - -endif !BUILD_ACE_FOR_TAO -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl b/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl index 747d3611fde..ca08884713e 100755 --- a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl +++ b/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl @@ -99,7 +99,7 @@ $consumer2->DeleteFile ($ns_ior); $supplier1->DeleteFile ($ec1_ior); $supplier2->DeleteFile ($ec2_ior); -$NS = $nservice->CreateProcess("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $nservice->CreateProcess("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "$debug -o $ns_ns_ior $end_point:$ns_port"); my $sp1_args = "$debug -ORBInitRef NameService=file://$supplier1_ns_ior ". "-ORBSvcConf $supplier1_sp_conf $end_point -iorfile $supplier1_ec1_ior"; diff --git a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/supplier.conf b/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/supplier.conf index 5ec352ab7be..eb17a579188 100644 --- a/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/supplier.conf +++ b/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/supplier.conf @@ -1,2 +1,3 @@ # $Id$ + static EC_Factory "-ECobserver basic -ECConsumerControl Reactive" |