From 537b51aeaba4791480b2776023f8543998753fe8 Mon Sep 17 00:00:00 2001 From: msmit Date: Tue, 21 Sep 2010 10:27:42 +0000 Subject: Tue Sep 21 10:30:11 UTC 2010 Marcel Smit * NEWS: * docs/notification/monitor.html: * docs/orbsvcs.html: * orbsvcs/DevGuideExamples/NotifyService/EventSequence/run_test.pl: * orbsvcs/DevGuideExamples/NotifyService/Filtering/run_test.pl: * orbsvcs/DevGuideExamples/NotifyService/Messenger/run_test.pl: * orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/run_test.pl: * orbsvcs/DevGuideExamples/NotifyService/QoSProperties/run_test.pl: * orbsvcs/DevGuideExamples/NotifyService/RTNotify/run_test.pl: * orbsvcs/DevGuideExamples/ValueTypes/Notify/run_test.pl: * orbsvcs/Notify_Service/Notify_Service.mpc: * orbsvcs/examples/Notify/Filter/run_test.pl: * orbsvcs/examples/Notify/Lanes/run_test.pl: * orbsvcs/examples/Notify/Subscribe/run_test.pl: * orbsvcs/examples/Notify/ThreadPool/run_test.pl: * orbsvcs/tests/Bug_3387_Regression/run_test.pl: * orbsvcs/tests/Notify/Basic/run_test.pl: * orbsvcs/tests/Notify/Basic/run_test_ipv6.pl: * orbsvcs/tests/Notify/Blocking/run_test.pl: * orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl: * orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl: * orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl: * orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl: * orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl: * orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl: * orbsvcs/tests/Notify/Discarding/run_test.pl: * orbsvcs/tests/Notify/Lanes/run_test.pl: * orbsvcs/tests/Notify/MC/run_test.pl: * orbsvcs/tests/Notify/MT_Dispatching/run_test.pl: * orbsvcs/tests/Notify/Ordering/run_test.pl: * orbsvcs/tests/Notify/Persistent_Filter/run_test.pl: * orbsvcs/tests/Notify/Persistent_POA/run_test.pl: * orbsvcs/tests/Notify/Reconnecting/run_test.pl: * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl: * orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl: * orbsvcs/tests/Notify/Structured_Filter/run_test.pl: * orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl: * orbsvcs/tests/Notify/ThreadPool/run_test.pl: * orbsvcs/tests/Notify/Timeout/run_test.pl: * orbsvcs/tests/Notify/Validate_Client/run_test.pl: * orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl: * orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl: * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl: * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl: * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl: * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl: * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl: * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl: Renamed Notify_Service to tao_cosnotification. --- .../DevGuideExamples/NotifyService/EventSequence/run_test.pl | 2 +- TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/run_test.pl | 2 +- TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/run_test.pl | 2 +- .../DevGuideExamples/NotifyService/OfferSubscriptions/run_test.pl | 2 +- .../DevGuideExamples/NotifyService/QoSProperties/run_test.pl | 2 +- TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/run_test.pl | 2 +- TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/run_test.pl | 2 +- TAO/orbsvcs/Notify_Service/Notify_Service.mpc | 4 ++-- TAO/orbsvcs/examples/Notify/Filter/run_test.pl | 2 +- TAO/orbsvcs/examples/Notify/Lanes/run_test.pl | 2 +- TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl | 2 +- TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl | 2 +- TAO/orbsvcs/tests/Bug_3387_Regression/run_test.pl | 2 +- TAO/orbsvcs/tests/Notify/Basic/run_test.pl | 2 +- TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl | 2 +- TAO/orbsvcs/tests/Notify/Blocking/run_test.pl | 2 +- TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl | 2 +- TAO/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl | 8 ++++---- TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl | 4 ++-- TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl | 2 +- TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl | 2 +- TAO/orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl | 4 ++-- TAO/orbsvcs/tests/Notify/Discarding/run_test.pl | 2 +- TAO/orbsvcs/tests/Notify/Lanes/run_test.pl | 2 +- TAO/orbsvcs/tests/Notify/MC/run_test.pl | 2 +- TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl | 2 +- TAO/orbsvcs/tests/Notify/Ordering/run_test.pl | 2 +- TAO/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl | 2 +- TAO/orbsvcs/tests/Notify/Persistent_POA/run_test.pl | 8 ++++---- TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl | 4 ++-- TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl | 2 +- TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl | 2 +- TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl | 2 +- TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl | 2 +- TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl | 2 +- TAO/orbsvcs/tests/Notify/Timeout/run_test.pl | 4 ++-- TAO/orbsvcs/tests/Notify/Validate_Client/run_test.pl | 2 +- TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl | 2 +- TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl | 2 +- .../performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl | 2 +- .../scripts/3_Path_Period_10ms_Lanes/run_test.pl | 2 +- .../performance-tests/scripts/Max_Throughput/Notify/run_test.pl | 2 +- .../scripts/Max_Throughput/Notify_RTCORBA/run_test.pl | 2 +- .../performance-tests/scripts/Paths_vs_Throughput/run_notify.pl | 2 +- .../performance-tests/scripts/Paths_vs_Throughput/run_test.pl | 2 +- 45 files changed, 56 insertions(+), 56 deletions(-) (limited to 'TAO/orbsvcs') diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/run_test.pl b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/run_test.pl index 737f4ab9046..5ee0413137e 100755 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/run_test.pl @@ -47,7 +47,7 @@ $NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service"; $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile"); -$NotifyService = "$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service"; +$NotifyService = "$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"; $NFS = $nfs->CreateProcess ($NotifyService, "-ORBInitRef NameService=file://$nfs_nsiorfile ". "-IORoutput $nfs_nfsiorfile"); $SRV = $srv->CreateProcess ("MessengerServer", "-ORBdebuglevel $debug_level ". diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/run_test.pl b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/run_test.pl index 3332eeb8e15..370768d288c 100755 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/run_test.pl @@ -44,7 +44,7 @@ $srv->DeleteFile ($srviorfile); $NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service"; $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile"); -$NotifyService = "$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service"; +$NotifyService = "$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"; $NFS = $nfs->CreateProcess ($NotifyService, "-ORBInitRef NameService=file://$nfs_nsiorfile ". "-IORoutput $nfs_nfsiorfile"); $SRV = $srv->CreateProcess ("MessengerServer", "-ORBdebuglevel $debug_level ". diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/run_test.pl b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/run_test.pl index 737f4ab9046..5ee0413137e 100755 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/run_test.pl @@ -47,7 +47,7 @@ $NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service"; $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile"); -$NotifyService = "$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service"; +$NotifyService = "$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"; $NFS = $nfs->CreateProcess ($NotifyService, "-ORBInitRef NameService=file://$nfs_nsiorfile ". "-IORoutput $nfs_nfsiorfile"); $SRV = $srv->CreateProcess ("MessengerServer", "-ORBdebuglevel $debug_level ". diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/run_test.pl b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/run_test.pl index fa81c4c1f62..bf5bf948cc7 100755 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/run_test.pl @@ -45,7 +45,7 @@ $NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service"; $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile"); -$NotifyService = "$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service"; +$NotifyService = "$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"; $NFS = $nfs->CreateProcess ($NotifyService, "-ORBInitRef NameService=file://$nfs_nsiorfile ". "-IORoutput $nfs_nfsiorfile"); $SRV = $srv->CreateProcess ("MessengerServer", "-ORBdebuglevel $debug_level ". diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/run_test.pl b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/run_test.pl index 737f4ab9046..5ee0413137e 100755 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/run_test.pl @@ -47,7 +47,7 @@ $NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service"; $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile"); -$NotifyService = "$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service"; +$NotifyService = "$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"; $NFS = $nfs->CreateProcess ($NotifyService, "-ORBInitRef NameService=file://$nfs_nsiorfile ". "-IORoutput $nfs_nfsiorfile"); $SRV = $srv->CreateProcess ("MessengerServer", "-ORBdebuglevel $debug_level ". diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/run_test.pl b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/run_test.pl index 227d221bab4..c1cf113fddc 100755 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/run_test.pl @@ -53,7 +53,7 @@ $NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service"; $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile"); -$NotifyService = "$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service"; +$NotifyService = "$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"; $NFS = $nfs->CreateProcess ($NotifyService, "-ORBInitRef NameService=file://$nfs_nsiorfile ". "-IORoutput $nfs_nfsiorfile ". "-ORBSvcConf $con_conconf"); diff --git a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/run_test.pl b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/run_test.pl index 4f096515287..68bf6c94e06 100755 --- a/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/ValueTypes/Notify/run_test.pl @@ -39,7 +39,7 @@ $nfs->DeleteFile ($nfsiorfile); $con->DeleteFile ($eciorfile); $sup->DeleteFile ($eciorfile); -$NotifyService = "$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service"; +$NotifyService = "$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"; $NFS = $nfs->CreateProcess ($NotifyService, " -boot ". "-orblistenendpoints iiop://:$port ". "-NoNameSvc ". diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc index 5d3536e9ee6..ffa18ca3302 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc +++ b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc @@ -17,7 +17,7 @@ project(TAO_Notify_Service) : orbsvcslib, orbsvcs_output, install, valuetype, or } project(Notify_Service) : orbsvcsexe, install, tao_notify_service, notify_monitor_control { - exename = Notify_Service + exename = tao_cosnotification Source_Files { Notify_Server.cpp } @@ -26,7 +26,7 @@ project(Notify_Service) : orbsvcsexe, install, tao_notify_service, notify_monito project(NT_Notify_Service) : orbsvcsexe, install, tao_notify_service, notify_monitor_control { avoids += ace_for_tao requires += winnt - exename = NT_Notify_Service + exename = tao_nt_cosnotification Source_Files { NT_Notify_Server.cpp NT_Notify_Service.cpp diff --git a/TAO/orbsvcs/examples/Notify/Filter/run_test.pl b/TAO/orbsvcs/examples/Notify/Filter/run_test.pl index 65c729bd492..246bb3587c9 100755 --- a/TAO/orbsvcs/examples/Notify/Filter/run_test.pl +++ b/TAO/orbsvcs/examples/Notify/Filter/run_test.pl @@ -38,7 +38,7 @@ $nfs->DeleteFile ($nfsiorfile); $NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", " -o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service", +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", " -o $ns_nsiorfile"); $Notify_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile "; diff --git a/TAO/orbsvcs/examples/Notify/Lanes/run_test.pl b/TAO/orbsvcs/examples/Notify/Lanes/run_test.pl index ce75dd5530a..d7e527d2ec2 100755 --- a/TAO/orbsvcs/examples/Notify/Lanes/run_test.pl +++ b/TAO/orbsvcs/examples/Notify/Lanes/run_test.pl @@ -60,7 +60,7 @@ $sup->DeleteFile ($supiorfile); $NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", " -o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service"); +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"); $Notify_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile -ORBSvcConf $nfs_nfsconf "; $SUP = $sup->CreateProcess ("Supplier"); diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl b/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl index 9dc4a12037d..958a75d77d7 100755 --- a/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl +++ b/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl @@ -41,7 +41,7 @@ $nfs->DeleteFile ($nfsiorfile); $NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", " -o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service"); +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"); $Notify_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile "; $SUB = $sub->CreateProcess ("Subscribe"); diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl b/TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl index 0d6d069a962..490e4eb991e 100755 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl @@ -66,7 +66,7 @@ $sup->DeleteFile ($supiorfile); $NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", " -o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service"); +$NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"); $Notify_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile -ORBSvcConf $nfs_nfsconf -ORBDebugLevel $debug"; $SUP = $sup->CreateProcess ("Supplier"); diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_3387_Regression/run_test.pl index 90e063d85cd..72ff9d36223 100755 --- a/TAO/orbsvcs/tests/Bug_3387_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_3387_Regression/run_test.pl @@ -53,7 +53,7 @@ $server->DeleteFile ($msngr_ior); $NMS = $nm_service->CreateProcess("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", "-ORBdebuglevel $debug_level -o $nm_ns_ior"); -$NFS = $nt_service->CreateProcess("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service", +$NFS = $nt_service->CreateProcess("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBdebuglevel $debug_level -ORBInitRef NameService=file://$nt_ns_ior ". "-IORoutput $nt_nt_ior -UseSeparateDispatchingORB 1 ". "-ORBSvcConf $nt_svc_conf"); diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl index d932d53a3d1..4be819ee2dc 100755 --- a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl @@ -130,7 +130,7 @@ for $config (@test_configs) { my $nfs_config = $nfs->LocalFile ($config); - $NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service", + $NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", ' '.$dispatch_opt.' '. "-ORBInitRef NameService=file://$nfs_nsiorfile " . "-IORoutput $nfs_nfsiorfile " . diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl index 77fa68d147b..3f1de9a55e9 100755 --- a/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl +++ b/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl @@ -130,7 +130,7 @@ for $config (@test_configs) { my $nfs_config = $nfs->LocalFile ($config); - $NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service", + $NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", ' '.$dispatch_opt.' '. "-ORBInitRef NameService=file://$nfs_nsiorfile " . "-IORoutput $nfs_nfsiorfile " . diff --git a/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl b/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl index 920ae28ce41..f919037e4a9 100755 --- a/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl @@ -48,7 +48,7 @@ $con->DeleteFile ($supiorfile); $NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", "-ORBEndpoint iiop://$host:$port ". "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service", +$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl index a3dfdb4af87..cf8780d2ece 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl @@ -48,7 +48,7 @@ $con->DeleteFile ($supiorfile); $NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", "-ORBEndpoint iiop://$host:$port ". "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service", +$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl index 94a2ecff147..76161b1c493 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/run_test.pl @@ -45,7 +45,7 @@ if ($#ARGV >= 0 && $ARGV[0] eq '-p') { $consumer_runtime = 20; } -my $NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service", +my $NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", "-ORBDebugLevel $debug_level ". "-NoNameSvc -IORoutput $nfs_nfsiorfile $svcconf " . "-ORBEndpoint iiop://$host:$port"); @@ -54,7 +54,7 @@ my $CON = $con->CreateProcess ("consumer", "$nts_ref -t $consumer_runtime"); my $FLT = $flt->CreateProcess ("filter", "$nts_ref"); -print "\n*********** Starting the Notify_Service ***********\n\n"; +print "\n*********** Starting the Notify Service ***********\n\n"; $NFS_status = $NFS->Spawn (); if ($NFS_status != 0) { print STDERR "ERROR: Notify Service returned $NFS_status\n"; @@ -90,7 +90,7 @@ if ($CON_status != 0) { sleep(5); if ($persistent_test == 1) { - print "*********** Killing the first Notify_Service ***********\n"; + print "*********** Killing the first Notify Service ***********\n"; $NFS_status = $NFS->TerminateWaitKill ($nfs->ProcessStopWaitInterval()); if ($NFS_status != 0) { print STDERR "ERROR: Notification Service returned $NFS_status\n"; @@ -101,7 +101,7 @@ if ($persistent_test == 1) { $nfs->DeleteFile ($nfsiorfile); - print "*********** Starting the second Notify_Service ***********\n"; + print "*********** Starting the second Notify Service ***********\n"; print STDERR $NFS->CommandLine (). "\n"; $NFS_status = $NFS->Spawn (); if ($NFS_status != 0) { diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl index c2db939f062..fe2911ccc8d 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl @@ -51,7 +51,7 @@ $con->DeleteFile ($supiorfile); $NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", " -ORBEndpoint iiop://$ns_host:$ns_port"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service", +$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", "-ORBInitRef NameService=corbaloc::" . "$ns_host:$ns_port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . @@ -212,7 +212,7 @@ $nfs->DeleteFile ($nfsiorfile); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service", +$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", "-ORBInitRef NameService=corbaloc::" . "$ns_host:$ns_port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl index 89adc2131a9..ff8f6cd98d4 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl @@ -52,7 +52,7 @@ $con2->DeleteFile ($supiorfile); $NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", "-ORBEndpoint iiop://$host:$port ". "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service", +$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl index 2c7ea9306ad..9a895e124bc 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl @@ -42,7 +42,7 @@ $SV1 = $server1->CreateProcess ("../../../Naming_Service/Naming_Service", "-ORBEndpoint iiop://$hostname:$port " . "-o $server1_ior1file"); -$SV2 = $server2->CreateProcess ("../../../Notify_Service/Notify_Service", +$SV2 = $server2->CreateProcess ("../../../Notify_Service/tao_cosnotification", "-ORBdebuglevel $debug_level " . "-ORBInitRef NameService=iioploc://$hostname:$port/NameService " . "-IORoutput $server2_ior2file " . diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl index e2e8a36d14f..868bb9bcb7e 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/run_test.pl @@ -34,7 +34,7 @@ $server1->DeleteFile($ior1file); $hostname = $server1->HostName (); $port = $server1->RandomPort (); -$SV1 = $server1->CreateProcess ("../../../Notify_Service/Notify_Service", +$SV1 = $server1->CreateProcess ("../../../Notify_Service/tao_cosnotification", "-ORBdebuglevel $debug_level " . "-NoNameSvc -IORoutput $server1_ior1file $svcconf " . "-ORBEndpoint iiop://$hostname:$port"); @@ -49,7 +49,7 @@ $CL = $client->CreateProcess ("consumer", "-t $consumer_runtime"); -print "\n*********** Starting the Notify_Service ***********\n\n"; +print "\n*********** Starting the Notify Service ***********\n\n"; print $SV1->CommandLine ()."\n"; $server_status = $SV1->Spawn (); diff --git a/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl b/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl index d845bcd2de5..f967b37a6f4 100755 --- a/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl @@ -68,7 +68,7 @@ foreach my $arg (@ARGV) { $NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", "-ORBEndpoint iiop://$host:$port -o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service", +$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl index a2de8ac8d5c..a6a2be33292 100755 --- a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl @@ -66,7 +66,7 @@ $client2->DeleteFile($client_ior); $SV1 = $server1->CreateProcess ("../../../Naming_Service/Naming_Service", "-o $server1_ior1file"); -$SV2 = $server2->CreateProcess ("../../../Notify_Service/Notify_Service", +$SV2 = $server2->CreateProcess ("../../../Notify_Service/tao_cosnotification", "-ORBInitRef NameService=file://$server2_ior1file " . "-IORoutput $server2_ior2file " . "-ORBSvcConf $server2_conf"); diff --git a/TAO/orbsvcs/tests/Notify/MC/run_test.pl b/TAO/orbsvcs/tests/Notify/MC/run_test.pl index fd5d46ad8ba..46bbb5f90b7 100755 --- a/TAO/orbsvcs/tests/Notify/MC/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/MC/run_test.pl @@ -88,7 +88,7 @@ if ($nfs->PutFile ($notify_conf) == -1) { my $NS = $ns->CreateProcess("../../../Naming_Service/Naming_Service", "-ORBEndpoint iiop://$host:$port -o $nsiorfile"); -my $NFS = $nfs->CreateProcess("../../../Notify_Service/Notify_Service", +my $NFS = $nfs->CreateProcess("../../../Notify_Service/tao_cosnotification", "-ORBDebugLevel $debug_level ". "$nscorbaloc " . "-IORoutput $nfs_nfsiorfile " . diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl b/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl index 6c2ce6a6810..02e834e6610 100755 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl @@ -71,7 +71,7 @@ $con->DeleteFile ($coniorfile); $NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service"); +$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification"); $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile ". " -IORoutput $nfs_nfsiorfile"; diff --git a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl index 815c8362fa9..ca86865b677 100755 --- a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl @@ -68,7 +68,7 @@ foreach my $arg (@ARGV) { $NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", "-ORBEndpoint iiop://$host:$port -o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service", +$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl index a23511063a8..79cdf8ef1ab 100755 --- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl @@ -50,7 +50,7 @@ $nfs->DeleteFile ($persistent_000); $NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service"); +$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification"); $NFS_Args = "-ORBSvcConf $nfs_svc_conf -ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile "; $SUP = $sup->CreateProcess ("supplier"); diff --git a/TAO/orbsvcs/tests/Notify/Persistent_POA/run_test.pl b/TAO/orbsvcs/tests/Notify/Persistent_POA/run_test.pl index 5a855a090e0..95b857adc67 100755 --- a/TAO/orbsvcs/tests/Notify/Persistent_POA/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Persistent_POA/run_test.pl @@ -53,7 +53,7 @@ $con->DeleteFile ($supiorfile); $NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", "-ORBEndpoint iiop://$host:$port ". "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service", +$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", "-ORBEndpoint iiop://$nfs_host:$nfs_port " . "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . @@ -82,7 +82,7 @@ if ($ns->WaitForFileTimed ($nsiorfile,$ns->ProcessStartWaitInterval()) == -1) { exit 1; } -print "*********** Starting the first Notify_Service ***********\n"; +print "*********** Starting the first Notify Service ***********\n"; $NFS_status = $NFS->Spawn (); if ($NFS_status != 0) { print STDERR "ERROR: Notify Service returned $NFS_status\n"; @@ -124,7 +124,7 @@ if ($SUP_status != 0) { print "*********** Allowing time to register the ec ***********\n"; sleep(3); -print "*********** Killing the first Notify_Service ***********\n"; +print "*********** Killing the first Notify Service ***********\n"; $NFS_status = $NFS->Kill ($nfs->ProcessStopWaitInterval()); if ($NFS_status != 0) { print STDERR "ERROR: Notify Service returned $NFS_status\n"; @@ -134,7 +134,7 @@ if ($NFS_status != 0) { } sleep(1); -print "*********** Starting the second Notify_Service ***********\n"; +print "*********** Starting the second Notify Service ***********\n"; my $args = $NFS->Arguments(); my $l = index($args, $nfs_nfsiorfile); substr($args, $l, length($nfs_nfsiorfile)) = $nfs_nfs2iorfile; diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl b/TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl index 238e2230830..c480127704c 100755 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/run_test.pl @@ -127,7 +127,7 @@ my $ns_args = "-ORBSvcConf $nfs_svcconf $ns_base_args"; # Delete the all of the files used in the test # Define the processes first -my $NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/Notify_Service"); +my $NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"); my $CON = $con->CreateProcess ("Consumer"); my $SUP = $sup->CreateProcess ("Supplier"); @@ -597,7 +597,7 @@ $nfs->DeleteFile ($save_001); $nfs->DeleteFile ($eventpersist); $sup->DeleteFile ($supplier_pause); -## Wait a bit to avoid lingering sockets from the previous Notify_Service +## Wait a bit to avoid lingering sockets from the previous tao_cosnotification sleep(3); $NFS->Arguments("-ORBSvcConf $nfs_st_both $ns_base_args"); diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl index bc55c1e5e0c..24e4d4eb7ed 100755 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/run_test.pl @@ -44,7 +44,7 @@ $con->DeleteFile ($supiorfile); $NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", "-ORBEndpoint iiop://$host:$port"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service", +$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl index e07c4db5e43..e94fe5eb118 100755 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl @@ -44,7 +44,7 @@ $con->DeleteFile ($supiorfile); $NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", "-ORBEndpoint iiop://$host:$port"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service", +$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl index 31aeb78a3fc..f636489f797 100755 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl @@ -48,7 +48,7 @@ $con->DeleteFile ($supiorfile); $NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", "-ORBEndpoint iiop://$host:$port ". "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service", +$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl index 77c757099e6..0fe29359df1 100755 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl @@ -48,7 +48,7 @@ $con->DeleteFile ($supiorfile); $NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", "-ORBEndpoint iiop://$host:$port ". "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service", +$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", "-ORBInitRef NameService=iioploc://" . "$host:$port/NameService " . "-IORoutput $nfs_nfsiorfile -ORBSvcConf " . diff --git a/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl b/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl index 06e96624354..c5fd9aea8da 100755 --- a/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl @@ -54,7 +54,7 @@ $con->DeleteFile ($supiorfile); $NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", " -o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../Notify_Service/Notify_Service"); +$NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification"); $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile -ORBSvcConf $nfs_nfsconffile"; $SUP = $sup->CreateProcess ("../Driver/Notify_Tests_Driver"); diff --git a/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl b/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl index 55eb2bc6d09..46173206ea3 100755 --- a/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl @@ -51,7 +51,7 @@ $con->DeleteFile ($supiorfile); my $NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", "-o $ns_nsiorfile"); -my $NFS = $ns->CreateProcess ("../../../Notify_Service/Notify_Service", +my $NFS = $ns->CreateProcess ("../../../Notify_Service/tao_cosnotification", "-ORBInitRef NameService=file://$nfs_nsiorfile " . "-IORoutput $nfs_nfsiorfile -Timeout 750"); my $SUP = $ns->CreateProcess("Structured_Supplier", @@ -137,7 +137,7 @@ if ($con->PutFile ($supiorfile) == -1) { } ## Wait for the supplier to create the event channel in -## the Notify_Service and register it with the Name Service +## the tao_cosnotification and register it with the Name Service sleep(2); $CON_status = $CON->SpawnWaitKill ($con->ProcessStartWaitInterval()+5); diff --git a/TAO/orbsvcs/tests/Notify/Validate_Client/run_test.pl b/TAO/orbsvcs/tests/Notify/Validate_Client/run_test.pl index e58ae336829..bd749040b32 100755 --- a/TAO/orbsvcs/tests/Notify/Validate_Client/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Validate_Client/run_test.pl @@ -39,7 +39,7 @@ $server->DeleteFile($iorbase); $client->DeleteFile ($persistent_file_xml); $client->DeleteFile ($persistent_file_000); -$SV = $server->CreateProcess ("../../../Notify_Service/Notify_Service", +$SV = $server->CreateProcess ("../../../Notify_Service/tao_cosnotification", "-ORBdebuglevel $debug_level " . "-NoNameSvc " . "-IORoutput $server_iorfile " . diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl index 6f11a7fcb5d..32aba73bf0b 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl @@ -41,7 +41,7 @@ my $initref = "-ORBInitRef NameService=iioploc://$host:$port/NameService "; $NS = $nm_service->CreateProcess ("../../../../Naming_Service/Naming_Service", "-ORBEndpoint iiop://$host:$port -o $ns_naming_ior"); -$TS = $nt_service->CreateProcess ("../../../../Notify_Service/Notify_Service", $initref. +$TS = $nt_service->CreateProcess ("../../../../Notify_Service/tao_cosnotification", $initref. "-IORoutput $ts_notify_ior -ORBSvcConf $ts_notify_conf"); $STS = $supplier->CreateProcess ("Structured_Supplier", $initref. "-o $supplier_supplier_ior"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl index 200c2019316..69e324c8d16 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl @@ -34,7 +34,7 @@ $test->DeleteFile ($naming_ior); $NM_SV = $nm_service->CreateProcess ("../../../../Naming_Service/Naming_Service", "-o $nm_service_nmiorfile"); $T = $test->CreateProcess ("RedGreen_Test", "-ORBInitRef NameService=file://$test_nmiorfile"); -$NT_SV = $nt_service->CreateProcess ("../../../../Notify_Service/Notify_Service", ""); +$NT_SV = $nt_service->CreateProcess ("../../../../Notify_Service/tao_cosnotification", ""); $nm_service_status = $NM_SV->Spawn (); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl index 540f585bbd0..8e0dbe7d00c 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/run_test.pl @@ -87,7 +87,7 @@ $con->DeleteFile ($supiorfile); $NS = $ns->CreateProcess ("../../../../../Naming_Service/Naming_Service", "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../../../Notify_Service/Notify_Service"); +$NFS = $nfs->CreateProcess ("../../../../../Notify_Service/tao_cosnotification"); $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile -ORBSvcConf $nfs_nfsconffile"; $SUP = $sup->CreateProcess ("../../../Driver/Notify_Tests_Driver"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl index 5d3fb306395..0c7f93d71ca 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/run_test.pl @@ -87,7 +87,7 @@ $con->DeleteFile ($supiorfile); $NS = $ns->CreateProcess ("../../../../../Naming_Service/Naming_Service", "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../../../Notify_Service/Notify_Service"); +$NFS = $nfs->CreateProcess ("../../../../../Notify_Service/tao_cosnotification"); $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile -IORoutput $nfs_nfsiorfile -ORBSvcConf $nfs_nfsconffile"; $SUP = $sup->CreateProcess ("../../../Driver/Notify_Tests_Driver"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl index 9a2e6577459..c2e31c0bf46 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/run_test.pl @@ -87,7 +87,7 @@ $sup->DeleteFile ($shighdat); $NS = $ns->CreateProcess ("../../../../../../Naming_Service/Naming_Service", "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../../../../Notify_Service/Notify_Service"); +$NFS = $nfs->CreateProcess ("../../../../../../Notify_Service/tao_cosnotification"); $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile ". "-IORoutput $nfs_nfsiorfile ". "-ORBSvcConf $nfs_nfsconffile"; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl index 9d339a00db7..b1d83123955 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/run_test.pl @@ -87,7 +87,7 @@ $sup->DeleteFile ($shighdat); $NS = $ns->CreateProcess ("../../../../../../Naming_Service/Naming_Service", "-o $ns_nsiorfile"); -$NFS = $nfs->CreateProcess ("../../../../../../Notify_Service/Notify_Service"); +$NFS = $nfs->CreateProcess ("../../../../../../Notify_Service/tao_cosnotification"); $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile ". "-IORoutput $nfs_nfsiorfile ". "-ORBSvcConf $nfs_nfsconffile"; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl index 78e68f62431..f68ba51f2fc 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_notify.pl @@ -69,7 +69,7 @@ $nt_service->DeleteFile($nt_ior); $NM_SV = $nm_service->CreateProcess ("../../../../../Naming_Service/Naming_Service", "-ORBDebugLevel $debug_level -o $nm_service_nm_ior"); -$NT_SV = $nt_service->CreateProcess ("../../../../../Notify_Service/Notify_Service", +$NT_SV = $nt_service->CreateProcess ("../../../../../Notify_Service/tao_cosnotification", "-ORBInitRef NameService=file://$nt_service_nm_ior ". "-IORoutput $nt_service_nt_ior ". "-ORBSvcConf $nt_service_nt_conf ". diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl index b6bc4c2b26e..e1f6a1f8033 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/run_test.pl @@ -83,7 +83,7 @@ $other_path_opconffile = $other_path->LocalFile($other_paths_conf); $NM_SV = $nm_service->CreateProcess ("../../../../../Naming_Service/Naming_Service", "-o $nm_service_nmiorfile $debug"); -$NT_SV = $nt_service->CreateProcess ("../../../../../Notify_Service/Notify_Service", +$NT_SV = $nt_service->CreateProcess ("../../../../../Notify_Service/tao_cosnotification", "-ORBInitRef NameService=file://$nt_service_nmiorfile ". "-IORoutput $nt_service_ntiorfile ". "-ORBSvcConf $nt_service_ntconffile $debug"); -- cgit v1.2.1