diff options
Diffstat (limited to 'TAO')
120 files changed, 366 insertions, 132 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 59b18edd509..798f6813eb5 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,236 @@ +Wed Sep 22 08:50:43 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * NEWS: + * TAO-INSTALL.html: + + * examples/Advanced/ch_18/run_test.pl: + + * examples/Callback_Quoter/run_test.pl: + + * examples/Quoter/run_test.pl: + + * examples/RTCORBA/Activity/run_test.pl: + + * examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl: + + * examples/RTScheduling/MIF_Scheduler/run_test.pl: + + * examples/ior_corbaloc/run_test.pl: + + * orbsvcs/DevGuideExamples/EventServices/OMG_Basic/run_test.pl: + + * orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/run_test.pl: + + * orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/run_test.pl: + + * orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/run_test.pl: + + * orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/run_test.pl: + + * orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/run_test.pl: + + * orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/run_test.pl: + + * orbsvcs/DevGuideExamples/NamingService/Messenger/run_test.pl: + + * orbsvcs/DevGuideExamples/NamingService/Naming_Client/run_test.pl: + + * orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/run_test.pl: + + * orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/run_test.pl: + + * orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/run_test.pl: + + * 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/NotifyService/SupplierSideNC/run_test.pl: + + * orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/run_test.pl: + + * orbsvcs/Naming_Service/Naming_Service.mpc: + + * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test.pl: + * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test2.pl: + + * orbsvcs/examples/CosEC/TypedSimple/run_test.pl: + + * orbsvcs/examples/LoadBalancing/run_test.pl: + + * orbsvcs/examples/Log/Basic/run_test.pl: + + * orbsvcs/examples/Log/Event/run_test.pl: + + * orbsvcs/examples/Log/Notify/run_test.pl: + + * orbsvcs/examples/Log/RTEvent/run_test.pl: + + * 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/examples/RtEC/IIOPGateway/consumerec_crash.pl: + * orbsvcs/examples/RtEC/IIOPGateway/run_test.pl: + + * orbsvcs/examples/RtEC/Simple/run_test.pl: + + * orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl: + + * orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl: + + * orbsvcs/tests/AVStreams/Component_Switching/run_test.pl: + + * orbsvcs/tests/AVStreams/Full_Profile/run_test.pl: + + * orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl: + + * orbsvcs/tests/AVStreams/Multicast/run_test.pl: + + * orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl: + + * orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl: + + * orbsvcs/tests/AVStreams/Pluggable/run_test.pl: + + * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl: + + * orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl: + + * orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl: + + * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl: + + * orbsvcs/tests/BiDir_CORBALOC/run_test.pl: + + * orbsvcs/tests/Bug_1334_Regression/run_test.pl: + + * orbsvcs/tests/Bug_2777_Regression/run_test.pl: + + * orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl: + + * orbsvcs/tests/Bug_3387_Regression/run_test.pl: + + * orbsvcs/tests/CosEvent/Timeout/run_test.pl: + + * orbsvcs/tests/EC_Custom_Marshal/run_test.pl: + + * orbsvcs/tests/EC_Multiple/run_test.pl: + + * orbsvcs/tests/EC_Throughput/run_test.pl: + * orbsvcs/tests/EC_Throughput/run_test_overflow.pl: + + * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl: + + * orbsvcs/tests/HTIOP/Hello/run_test.pl: + + * orbsvcs/tests/ImplRepo/NameService/run_test.pl: + + * orbsvcs/tests/Interoperable_Naming/run_test.pl: + + * orbsvcs/tests/Log/Basic_Log_Test/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_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_3646c_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/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/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/2_Hops/run_test.pl: + + * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl: + + * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl: + + * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl: + + * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl: + + * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/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: + + * orbsvcs/tests/Property/run_test.pl: + + * orbsvcs/tests/Redundant_Naming/run_test.pl: + + * orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl: + + * orbsvcs/tests/Simple_Naming/run_test.pl: + * orbsvcs/tests/Simple_Naming/run_test_ffp.pl: + * orbsvcs/tests/Simple_Naming/run_test_ipv6.pl: + + * tests/Bug_2791_Regression/README: + + * tests/Bug_3299_Regression/README: + + * tests/Bug_3479_Regression/README: + + * tests/DII_AMI_Forward/README: + + * utils/nslist/run_test.pl: + Renamed 'Naming_Service' to 'tao_cosnaming' + Wed Sep 22 08:25:54 UTC 2010 Marcel Smit <msmit@remedy.nl> * NEWS: @@ -23,6 +23,7 @@ USER VISIBLE CHANGES BETWEEN TAO-1.8.2 and TAO-1.8.3 * 'Notify_Logging_Service' to 'tao_tls_notify' * 'Event_Logging_Service' to 'tao_tls_event' * 'RTEvent_Logging_Service' to 'tao_tls_rtevent' + * 'Naming_Service' to 'tao_cosnaming' USER VISIBLE CHANGES BETWEEN TAO-1.8.1 and TAO-1.8.2 ==================================================== diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html index 48d23fab5ca..6c542749ced 100644 --- a/TAO/TAO-INSTALL.html +++ b/TAO/TAO-INSTALL.html @@ -126,7 +126,7 @@ bundle as a single piece instead of trying to mix and match things up.<P> </P> <P>If you wish to compile the ORB services distributed with TAO, - including the <CODE>Naming_Service</CODE> you + including the <CODE>Naming Service</CODE> you must include <CODE>$TAO_ROOT/orbsvcs</CODE> to the list above. Please see the <A HREF="docs/configurations.html#orbsvcs">TAO configuration documentation</a> diff --git a/TAO/examples/Advanced/ch_18/run_test.pl b/TAO/examples/Advanced/ch_18/run_test.pl index a6f17fc19f9..8939b1228fa 100755 --- a/TAO/examples/Advanced/ch_18/run_test.pl +++ b/TAO/examples/Advanced/ch_18/run_test.pl @@ -23,8 +23,8 @@ sub name_server "..$DIR_SEPARATOR". "..$DIR_SEPARATOR". "orbsvcs$DIR_SEPARATOR". - "Naming_Service$DIR_SEPARATOR". - "Naming_Service$EXE_EXT"; + "tao_cosnaming$DIR_SEPARATOR". + "tao_cosnaming$EXE_EXT"; $NS = Process::Create ($prog,""); } diff --git a/TAO/examples/Callback_Quoter/run_test.pl b/TAO/examples/Callback_Quoter/run_test.pl index 0b6f3736642..e0d91599927 100755 --- a/TAO/examples/Callback_Quoter/run_test.pl +++ b/TAO/examples/Callback_Quoter/run_test.pl @@ -41,7 +41,7 @@ $starget->DeleteFile($nsiorbase); # Programs that are run $NS = $nstarget->CreateProcess ( - "../../orbsvcs/Naming_Service/Naming_Service", + "../../orbsvcs/Naming_Service/tao_cosnaming", "-o $nstarget_nsiorfile"); $N = $ntarget->CreateProcess ( "notifier", @@ -59,7 +59,7 @@ print STDERR "================ Remote test\n"; $ns_status = $NS->Spawn (); if ($ns_status != 0) { - print STDERR "ERROR: Naming_Service returned $ns_status\n"; + print STDERR "ERROR: tao_cosnaming returned $ns_status\n"; exit 1; } @@ -136,7 +136,7 @@ if ($n_status != 0) { $ns_status = $NS->TerminateWaitKill ($nstarget->ProcessStopWaitInterval()); if ($ns_status != 0) { - print STDERR "ERROR: Naming_Service returned $ns_status\n"; + print STDERR "ERROR: tao_cosnaming returned $ns_status\n"; $status = 1; } diff --git a/TAO/examples/Quoter/run_test.pl b/TAO/examples/Quoter/run_test.pl index 628daee89e6..fdee51487df 100755 --- a/TAO/examples/Quoter/run_test.pl +++ b/TAO/examples/Quoter/run_test.pl @@ -89,7 +89,7 @@ $cltarget->DeleteFile($nsiorbase); # Programs that are run $NS = $nstarget->CreateProcess ( - "../../orbsvcs/Naming_Service/Naming_Service", + "../../orbsvcs/Naming_Service/tao_cosnaming", "-o $nstarget_nsiorfile"); $LC = $lctarget->CreateProcess ( "../../orbsvcs/LifeCycle_Service/tao_coslifecycle", @@ -112,7 +112,7 @@ $CL = $cltarget->CreateProcess ( $ns_status = $NS->Spawn (); if ($ns_status != 0) { - print STDERR "ERROR: Naming_Service returned $ns_status\n"; + print STDERR "ERROR: tao_cosnaming returned $ns_status\n"; exit 1; } @@ -241,7 +241,7 @@ if ($lc_status != 0) { $ns_status = $NS->TerminateWaitKill ($nstarget->ProcessStopWaitInterval()); if ($ns_status != 0) { - print STDERR "ERROR: Naming_Service returned $ns_status\n"; + print STDERR "ERROR: tao_cosnaming returned $ns_status\n"; $status = 1; } diff --git a/TAO/examples/RTCORBA/Activity/run_test.pl b/TAO/examples/RTCORBA/Activity/run_test.pl index 1f0115873e1..6a9be73acda 100755 --- a/TAO/examples/RTCORBA/Activity/run_test.pl +++ b/TAO/examples/RTCORBA/Activity/run_test.pl @@ -43,7 +43,7 @@ $client1->DeleteFile($iorfile); my $client2_iorfile = $client2->LocalFile ($iorfile); $client2->DeleteFile($iorfile); -$SV = $server->CreateProcess ("../../../orbsvcs/Naming_Service/Naming_Service", +$SV = $server->CreateProcess ("../../../orbsvcs/Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level " . "-o $server_iorfile"); @@ -56,7 +56,7 @@ $CL2 = $client2->CreateProcess ("activity", "-ORBSvcConf $server_conf " . "-Started_Flag $client2_flag_file"); -print STDERR "Running Naming_Service\n"; +print STDERR "Running tao_cosnaming\n"; $server_status = $SV->Spawn (); diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl index 20490fd8247..804303058e4 100755 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/run_test.pl @@ -40,7 +40,7 @@ $client->DeleteFile($iorbase); $nstarget->DeleteFile($iorbase); $starter->DeleteFile($iorbase); -$NS = $nstarget->CreateProcess ("../../../orbsvcs/Naming_Service/Naming_Service", +$NS = $nstarget->CreateProcess ("../../../orbsvcs/Naming_Service/tao_cosnaming", "-o $nstarget_iorfile"); $SV = $server->CreateProcess ("test", "-ORBInitRef NameService=file://$server_iorfile ". diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/run_test.pl b/TAO/examples/RTScheduling/MIF_Scheduler/run_test.pl index f7baaf9b50f..8f70a9bbebe 100755 --- a/TAO/examples/RTScheduling/MIF_Scheduler/run_test.pl +++ b/TAO/examples/RTScheduling/MIF_Scheduler/run_test.pl @@ -40,7 +40,7 @@ $client->DeleteFile($iorbase); $nstarget->DeleteFile($iorbase); $starter->DeleteFile($iorbase); -$NS = $nstarget->CreateProcess ("../../../orbsvcs/Naming_Service/Naming_Service", +$NS = $nstarget->CreateProcess ("../../../orbsvcs/Naming_Service/tao_cosnaming", "-o $nstarget_iorfile"); $SV = $server->CreateProcess ("test", "-ORBInitRef NameService=file://$server_iorfile ". diff --git a/TAO/examples/ior_corbaloc/run_test.pl b/TAO/examples/ior_corbaloc/run_test.pl index d2418fa918b..e3c0eb60e29 100755 --- a/TAO/examples/ior_corbaloc/run_test.pl +++ b/TAO/examples/ior_corbaloc/run_test.pl @@ -27,7 +27,7 @@ my @servers = ( my @iorbases = ("ns1.ior", "ns2.ior", "ns2.ior"); my @SV_NAMES = ("STATUS", "STATUS1", "STATUS"); -# We run two Naming_Service processes. One on an arbitrary port, +# We run two tao_cosnaming processes. One on an arbitrary port, # and one on the corbaloc: default port of 2809 my @nstargets = ( (PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\n"), @@ -56,7 +56,7 @@ for ($i = 0; $i <= $#nstargets; $i++) { } my $NS = $nstargets[$i]->CreateProcess ( - "../../orbsvcs/Naming_Service/Naming_Service", + "../../orbsvcs/Naming_Service/tao_cosnaming", "-ORBListenEndpoints iiop://$TARGETHOSTNAME:$ns_orb_ports[$i] ". "-o $ns_iorfile -m 0"); diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/run_test.pl b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/run_test.pl index 4b976483bd1..4c76be57bf1 100755 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/run_test.pl @@ -37,7 +37,7 @@ $es->DeleteFile ($esiorfile); $sleeptime = 10; -$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service"; +$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"; $NS = $ns->CreateProcess ($NameService, "-ORBdebuglevel $debug_level -ORBListenEndpoints iiop://:2809 ". " -o $ns_nsiorfile"); diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/run_test.pl b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/run_test.pl index 02f275bebc3..83f43c9c74a 100755 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/run_test.pl @@ -30,7 +30,7 @@ $ns->DeleteFile ($iorfile); $s->DeleteFile ($iorfile); $c->DeleteFile ($iorfile); -$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service"; +$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"; $NS = $ns->CreateProcess ($NameService, "-ORBdebuglevel $debug_level ". " -o $ns_iorfile"); $S = $ns->CreateProcess ("EchoEventSupplier", "-ORBInitRef NameService=file://$s_iorfile"); diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/run_test.pl b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/run_test.pl index 04612543eb8..fb08e006bcd 100755 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/run_test.pl @@ -55,7 +55,7 @@ $IF = $ifr->CreateProcess ($IFRService, "-ORBdebuglevel $debug_level ". $TAO_IFR = "$ENV{ACE_ROOT}/bin/tao_ifr"; $TI = $ti->CreateProcess ($TAO_IFR, "-ORBInitRef InterfaceRepository=file://$ti_ifriorfile ". "$idlfile"); -$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service"; +$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"; $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile"); $EventService = "$ENV{TAO_ROOT}/orbsvcs/CosEvent_Service/CosEvent_Service"; $ES = $es->CreateProcess ($EventService, " -t -o $es_esiorfile ". diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/run_test.pl b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/run_test.pl index c6af9642580..660ace51645 100755 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/run_test.pl @@ -35,7 +35,7 @@ $s->DeleteFile ($nsiorfile); $c->DeleteFile ($nsiorfile); $es->DeleteFile ($esiorfile); -$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service"; +$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"; $NS = $ns->CreateProcess ($NameService, "-ORBdebuglevel $debug_level ". " -o $ns_nsiorfile"); $EventService = "$ENV{TAO_ROOT}/orbsvcs/Event_Service/Event_Service"; diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/run_test.pl b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/run_test.pl index f5fcb921b72..fdf34dc863d 100755 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/run_test.pl @@ -48,7 +48,7 @@ $s2->DeleteFile ($nsiorfile); $c1->DeleteFile ($nsiorfile); $c2->DeleteFile ($nsiorfile); -$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service"; +$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"; $NS = $ns->CreateProcess ($NameService, "-ORBdebuglevel $debug_level ". " -o $ns_nsiorfile"); $args1 = "-ORBSvcConf $supplier_conf_file -ecname ec1 -gateway ec2"; diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/run_test.pl b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/run_test.pl index 899c5b0cd8b..95b0d8b98ec 100755 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/run_test.pl @@ -35,7 +35,7 @@ $s->DeleteFile ($nsiorfile); $c->DeleteFile ($nsiorfile); $es->DeleteFile ($esiorfile); -$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service"; +$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"; $NS = $ns->CreateProcess ($NameService, "-ORBdebuglevel $debug_level ". " -o $ns_nsiorfile"); $EventService = "$ENV{TAO_ROOT}/orbsvcs/Event_Service/Event_Service"; diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/run_test.pl b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/run_test.pl index 14ca538cf83..765814c843f 100755 --- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/run_test.pl @@ -88,7 +88,7 @@ my $c1_hostname = $c1->HostName(); my $c2_hostname = $c2->HostName(); my $ns_port = $ns->RandomPort(); -$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service"; +$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"; $NS = $ns->CreateProcess ($NameService, "$flags ". " -o $ns_nsiorfile ". "-ORBListenEndpoints iiop://$ns_hostname:$ns_port"); diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/run_test.pl b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/run_test.pl index b4208f7bc0c..0f2d197fd91 100755 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Messenger/run_test.pl @@ -30,7 +30,7 @@ $srv->DeleteFile ($nsiorfile); $cli->DeleteFile ($nsiorfile); # start Naming Service -$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service"; +$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"; $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile"); $SRV = $srv->CreateProcess ("MessengerServer", "-ORBdebuglevel $debug_level ". "-ORBInitRef NameService=file://$srv_nsiorfile"); diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/run_test.pl b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/run_test.pl index 08d8f06f3f1..abaaf01565c 100755 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Client/run_test.pl @@ -29,7 +29,7 @@ $ns->DeleteFile ($nsiorfile); $srv->DeleteFile ($nsiorfile); $cli->DeleteFile ($nsiorfile); -$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service"; +$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"; $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile"); $SRV = $srv->CreateProcess ("MessengerServer", "-ORBdebuglevel $debug_level ". "-ORBInitRef NameService=file://$srv_nsiorfile"); diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/run_test.pl b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/run_test.pl index b1e85c1940a..9f4551f95bd 100755 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/run_test.pl @@ -33,7 +33,7 @@ $cli->DeleteFile ($srviorfile); $hostname = $ns->HostName (); $port = "2809"; -$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service"; +$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"; $NS = $ns->CreateProcess ($NameService, "-ORBListenEndpoints iiop://$hostname:$port ". " -o $ns_nsiorfile"); $SRV = $srv->CreateProcess ("MessengerServer", "-ORBdebuglevel $debug_level ". diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/run_test.pl b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/run_test.pl index 15b224f02b7..4a1b59065b5 100755 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/run_test.pl @@ -30,7 +30,7 @@ my $ns_nsiorfile = $ns->LocalFile ($nsiorfile); $ns->DeleteFile ($nsiorfile); # start Naming Service -$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service"; +$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"; $NS = $ns->CreateProcess ($NameService, " -ORBListenEndpoints iiop://$TARGETHOSTNAME:$def_port ". "-o $ns_nsiorfile"); $NS_status = $NS->Spawn (); diff --git a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/run_test.pl b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/run_test.pl index 592de952646..29194259604 100755 --- a/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/NamingService/corbaname_Messenger/run_test.pl @@ -32,7 +32,7 @@ $ns->DeleteFile ($nsiorfile); $srv->DeleteFile ($msfile); # start Naming Service -$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service"; +$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"; $NS = $ns->CreateProcess ($NameService, " -ORBListenEndpoints iiop://$TARGETHOSTNAME:$def_port ". "-o $ns_nsiorfile"); $NS_status = $NS->Spawn (); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/run_test.pl b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/run_test.pl index 5ee0413137e..433637ac9c7 100755 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/run_test.pl @@ -43,7 +43,7 @@ $nfs->DeleteFile ($nfsiorfile); $srv->DeleteFile ($srviorfile); $cli->DeleteFile ($srviorfile); -$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service"; +$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"; $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile"); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/run_test.pl b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/run_test.pl index 370768d288c..1283068c3c3 100755 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/run_test.pl @@ -41,7 +41,7 @@ $cli->DeleteFile ($nsiorfile); $nfs->DeleteFile ($nfsiorfile); $srv->DeleteFile ($srviorfile); -$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service"; +$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"; $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile"); $NotifyService = "$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"; diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/run_test.pl b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/run_test.pl index 5ee0413137e..433637ac9c7 100755 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/run_test.pl @@ -43,7 +43,7 @@ $nfs->DeleteFile ($nfsiorfile); $srv->DeleteFile ($srviorfile); $cli->DeleteFile ($srviorfile); -$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service"; +$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"; $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile"); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/run_test.pl b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/run_test.pl index bf5bf948cc7..78bc07f2564 100755 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/run_test.pl @@ -41,7 +41,7 @@ $cli->DeleteFile ($nsiorfile); $nfs->DeleteFile ($nfsiorfile); $srv->DeleteFile ($srviorfile); -$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service"; +$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"; $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile"); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/run_test.pl b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/run_test.pl index 5ee0413137e..433637ac9c7 100755 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/run_test.pl @@ -43,7 +43,7 @@ $nfs->DeleteFile ($nfsiorfile); $srv->DeleteFile ($srviorfile); $cli->DeleteFile ($srviorfile); -$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service"; +$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"; $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile"); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/run_test.pl b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/run_test.pl index c1cf113fddc..a1dc636f8b7 100755 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/run_test.pl @@ -49,7 +49,7 @@ $srv->DeleteFile ($srviorfile); $cli->DeleteFile ($srviorfile); $con->DeleteFile ($confile); -$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service"; +$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"; $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile"); diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/run_test.pl b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/run_test.pl index 45e2954e5d8..b509b6b12d8 100755 --- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/run_test.pl @@ -35,7 +35,7 @@ $con->DeleteFile ($nsiorfile); $cli->DeleteFile ($nsiorfile); $srv->DeleteFile ($srviorfile); -$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service"; +$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"; $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile"); $SRV = $srv->CreateProcess ("MessengerServer", "-ORBdebuglevel $debug_level ". diff --git a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/run_test.pl b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/run_test.pl index c31c38f6837..4098f724b0f 100755 --- a/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/run_test.pl +++ b/TAO/orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/run_test.pl @@ -28,7 +28,7 @@ $ns->DeleteFile ($nsiorfile); $hostname = $ns->HostName (); $PORT=9876; -$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service"; +$NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming"; $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile ". "-ORBListenEndpoints iiop://$hostname:$PORT"); diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc index cbf8d927e2c..c22d1d3a405 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc +++ b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc @@ -2,7 +2,7 @@ // $Id$ project : orbsvcsexe, install, naming_serv, imr_client, svc_utils { - exename = Naming_Service + exename = tao_cosnaming Source_Files { Naming_Server.cpp Naming_Service.cpp diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test.pl b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test.pl index 05096ee23c4..57093562ee1 100755 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test.pl +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test.pl @@ -75,7 +75,7 @@ for ($i = 0; $i <= $#ARGV; $i++) { } } -$NS = $ns->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); $ES = $es->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/Event_Service/Event_Service", diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test2.pl b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test2.pl index 2a49b37fb6b..e7d6b5fba46 100755 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test2.pl +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test2.pl @@ -62,7 +62,7 @@ for ($i = 0; $i <= $#ARGV; $i++) { } } -$NS = $ns->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); $ES = $es->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/Event_Service/Event_Service", diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/run_test.pl b/TAO/orbsvcs/examples/CosEC/TypedSimple/run_test.pl index da0db58822c..e9158f6073b 100755 --- a/TAO/orbsvcs/examples/CosEC/TypedSimple/run_test.pl +++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/run_test.pl @@ -57,7 +57,7 @@ $IFR = $ifr->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/IFR_Service/tao_ifr_servi $TI = $ti->CreateProcess ($ENV{"ACE_ROOT"}."/bin/tao_ifr", " -ORBInitRef InterfaceRepository=file://$ti_ifriorfile ". "-I".$ENV{"TAO_ROOT"}."/orbsvcs $ti_idl"); -$NS = $ns->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); $CES = $ces->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/CosEvent_Service/CosEvent_Service", "-n CountryEventChannel -r -t -d -o $ces_cesiorfile ". diff --git a/TAO/orbsvcs/examples/LoadBalancing/run_test.pl b/TAO/orbsvcs/examples/LoadBalancing/run_test.pl index 8ad2ff3a670..3fd18b08669 100755 --- a/TAO/orbsvcs/examples/LoadBalancing/run_test.pl +++ b/TAO/orbsvcs/examples/LoadBalancing/run_test.pl @@ -55,7 +55,7 @@ $cr->DeleteFile ($srviorfile); $LM = $lm->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/LoadBalancer/LoadManager", " -o $lm_lmiorfile"); -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); $SV = $sv->CreateProcess ("server", "-o $sv_srviorfile ". diff --git a/TAO/orbsvcs/examples/Log/Basic/run_test.pl b/TAO/orbsvcs/examples/Log/Basic/run_test.pl index df1c05a213f..5378a79e349 100755 --- a/TAO/orbsvcs/examples/Log/Basic/run_test.pl +++ b/TAO/orbsvcs/examples/Log/Basic/run_test.pl @@ -31,7 +31,7 @@ $ls->DeleteFile ($nsiorfile); $cli->DeleteFile ($nsiorfile); -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); $LS = $ls->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Logging_Service/Basic_Logging_Service/tao_tls_basic", " -ORBInitRef NameService=file://$ls_nsiorfile"); diff --git a/TAO/orbsvcs/examples/Log/Event/run_test.pl b/TAO/orbsvcs/examples/Log/Event/run_test.pl index 011f61637ac..5ea2ddef0c3 100755 --- a/TAO/orbsvcs/examples/Log/Event/run_test.pl +++ b/TAO/orbsvcs/examples/Log/Event/run_test.pl @@ -33,7 +33,7 @@ $ls->DeleteFile ($nsiorfile); $con->DeleteFile ($nsiorfile); $sup->DeleteFile ($nsiorfile); -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); $LS = $ls->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Logging_Service/Event_Logging_Service/tao_tls_event", " -ORBInitRef NameService=file://$ls_nsiorfile"); diff --git a/TAO/orbsvcs/examples/Log/Notify/run_test.pl b/TAO/orbsvcs/examples/Log/Notify/run_test.pl index 2743654552d..9853f6f3f2c 100755 --- a/TAO/orbsvcs/examples/Log/Notify/run_test.pl +++ b/TAO/orbsvcs/examples/Log/Notify/run_test.pl @@ -33,7 +33,7 @@ $ls->DeleteFile ($nsiorfile); $con->DeleteFile ($nsiorfile); $sup->DeleteFile ($nsiorfile); -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); $LS = $ls->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Logging_Service/Notify_Logging_Service/tao_tls_notify", " -ORBInitRef NameService=file://$ls_nsiorfile"); diff --git a/TAO/orbsvcs/examples/Log/RTEvent/run_test.pl b/TAO/orbsvcs/examples/Log/RTEvent/run_test.pl index 65a64e82168..bf65c2e9e50 100755 --- a/TAO/orbsvcs/examples/Log/RTEvent/run_test.pl +++ b/TAO/orbsvcs/examples/Log/RTEvent/run_test.pl @@ -33,7 +33,7 @@ $ls->DeleteFile ($nsiorfile); $con->DeleteFile ($nsiorfile); $sup->DeleteFile ($nsiorfile); -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); $LS = $ls->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Logging_Service/RTEvent_Logging_Service/tao_tls_rtevent", " -ORBInitRef NameService=file://$ls_nsiorfile"); diff --git a/TAO/orbsvcs/examples/Notify/Filter/run_test.pl b/TAO/orbsvcs/examples/Notify/Filter/run_test.pl index 246bb3587c9..e5e8bbe4240 100755 --- a/TAO/orbsvcs/examples/Notify/Filter/run_test.pl +++ b/TAO/orbsvcs/examples/Notify/Filter/run_test.pl @@ -35,7 +35,7 @@ $nfs->DeleteFile ($nsiorfile); $flt->DeleteFile ($nsiorfile); $nfs->DeleteFile ($nfsiorfile); -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); $NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", diff --git a/TAO/orbsvcs/examples/Notify/Lanes/run_test.pl b/TAO/orbsvcs/examples/Notify/Lanes/run_test.pl index d7e527d2ec2..0a3dd08dc4a 100755 --- a/TAO/orbsvcs/examples/Notify/Lanes/run_test.pl +++ b/TAO/orbsvcs/examples/Notify/Lanes/run_test.pl @@ -57,7 +57,7 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); $NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"); diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl b/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl index 958a75d77d7..121fd68fd9f 100755 --- a/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl +++ b/TAO/orbsvcs/examples/Notify/Subscribe/run_test.pl @@ -38,7 +38,7 @@ $nfs->DeleteFile ($nsiorfile); $sub->DeleteFile ($nsiorfile); $nfs->DeleteFile ($nfsiorfile); -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); $NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"); diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl b/TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl index 490e4eb991e..ae2714106e6 100755 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/run_test.pl @@ -63,7 +63,7 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); $NFS = $nfs->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification"); diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/consumerec_crash.pl b/TAO/orbsvcs/examples/RtEC/IIOPGateway/consumerec_crash.pl index c5c8b9ffa01..a5a732212aa 100755 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/consumerec_crash.pl +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/consumerec_crash.pl @@ -44,7 +44,7 @@ $g->DeleteFile ($nsiorfile); $c->DeleteFile ($nsiorfile); $s->DeleteFile ($nsiorfile); -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); $T1 = $t1->CreateProcess ("EC", diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/run_test.pl b/TAO/orbsvcs/examples/RtEC/IIOPGateway/run_test.pl index c49eabe8d0c..7caef1cc8df 100755 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/run_test.pl +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/run_test.pl @@ -44,7 +44,7 @@ $g->DeleteFile ($nsiorfile); $c->DeleteFile ($nsiorfile); $s->DeleteFile ($nsiorfile); -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); $T1 = $t1->CreateProcess ("EC", diff --git a/TAO/orbsvcs/examples/RtEC/Simple/run_test.pl b/TAO/orbsvcs/examples/RtEC/Simple/run_test.pl index d8c6fb7e377..12eec8a6b82 100755 --- a/TAO/orbsvcs/examples/RtEC/Simple/run_test.pl +++ b/TAO/orbsvcs/examples/RtEC/Simple/run_test.pl @@ -35,7 +35,7 @@ $t->DeleteFile ($nsiorfile); $c->DeleteFile ($nsiorfile); $s->DeleteFile ($nsiorfile); -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); $T = $t->CreateProcess ("Service", diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl index ea296d13ca8..2969753c16c 100755 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/run_test.pl @@ -66,7 +66,7 @@ if ($sv1->PutFile ($inputfile) == -1) { exit 1; } -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); $SV = $sv->CreateProcess ("sender", " -ORBInitRef NameService=file://$sv_nsiorfile ". diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl index 084a848f01d..fc3027f3164 100755 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl @@ -48,7 +48,7 @@ if ($cl->PutFile ($inputfile) == -1) { exit 1; } -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); $SV = $sv->CreateProcess ("receiver", " -ORBDebugLevel $debug_level ". diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl index c3b9ce0b5ea..6ba74fc7770 100755 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/run_test.pl @@ -96,7 +96,7 @@ if ($sv3->PutFile ($inputfile) == -1) { exit 1; } -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBDottedDecimalAddresses 1 ". " -o $ns_nsiorfile"); $SV1 = $sv1->CreateProcess ("sender", diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl index 6a25b783a4c..4c48c39bccf 100755 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl @@ -63,7 +63,7 @@ for ($i = 0; $i <= $#ARGV; $i++) { } } -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); print STDERR "Starting Naming Service\n"; diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl index 18b97cd8e9a..78128ef34fc 100755 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/run_test.pl @@ -47,7 +47,7 @@ if ($cl->PutFile ($inputfile) == -1) { exit 1; } -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); $SV = $sv->CreateProcess ("receiver", " -ORBDebugLevel $debug_level ". diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl index 86a97208a97..0ad321e25b7 100755 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl @@ -57,7 +57,7 @@ if ($cl->PutFile ($inputfile) == -1) { exit 1; } -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); $SV1 = $sv1->CreateProcess ("server", " -ORBDebugLevel $debug_level ". diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl index 6081980fbb9..ff8ed76bf9c 100755 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl @@ -53,7 +53,7 @@ if ($cl->PutFile ($inputfile) == -1) { exit 1; } -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); $SV1 = $sv1->CreateProcess ("server", " -ORBDebugLevel $debug_level ". diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl index 322a99abd99..7e3996c2608 100755 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl @@ -47,7 +47,7 @@ if ($cl->PutFile ($inputfile) == -1) { exit 1; } -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); $SV = $sv->CreateProcess ("receiver", " -ORBDebugLevel $debug_level ". diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl index a3b1adff991..4f128a1530f 100755 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl @@ -65,7 +65,7 @@ for ($i = 0; $i <= $#ARGV; $i++) { } } -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); print STDERR "Starting Naming Service\n"; diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl index 5a0dd66571f..fe3aa213aac 100755 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl @@ -47,7 +47,7 @@ if ($cl->PutFile ($inputfile) == -1) { exit 1; } -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); $SV = $sv->CreateProcess ("receiver", " -ORBDebugLevel $debug_level ". diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl index 90377d6b61a..0dd3f388e65 100755 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/run_test.pl @@ -50,7 +50,7 @@ if ($sv->PutFile ($inputfile) == -1) { exit 1; } -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); $SV = $sv->CreateProcess ("sender", " -ORBDebugLevel $debug_level ". diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl index 42285c2f5bc..6b822f19ce1 100755 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl @@ -65,7 +65,7 @@ for ($i = 0; $i <= $#ARGV; $i++) { } } -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); print STDERR "Starting Naming Service\n"; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl index 42285c2f5bc..6b822f19ce1 100755 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl @@ -65,7 +65,7 @@ for ($i = 0; $i <= $#ARGV; $i++) { } } -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); print STDERR "Starting Naming Service\n"; diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl b/TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl index aca5e9267b2..959027251ff 100755 --- a/TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl +++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/run_test.pl @@ -30,7 +30,7 @@ my $iorbase = "test.ior"; my $server_iorfile = $server->LocalFile ($iorbase); $server->DeleteFile($iorbase); -$SV = $server->CreateProcess ("../../Naming_Service/Naming_Service", +$SV = $server->CreateProcess ("../../Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$orb_port -o $server_iorfile"); $CL = $client->CreateProcess ("TimeServer", "-ORBInitRef NameService=corbaloc:iiop:$host:$orb_port/NameService"); diff --git a/TAO/orbsvcs/tests/Bug_1334_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1334_Regression/run_test.pl index f41747f2233..a32c695222c 100755 --- a/TAO/orbsvcs/tests/Bug_1334_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_1334_Regression/run_test.pl @@ -34,7 +34,7 @@ $CLI = $ns->CreateProcess ("client"); # Fire up the Name Service # -$NS = $ns->CreateProcess ("../../Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("../../Naming_Service/tao_cosnaming", "-ORBDebugLevel $debug_level ". "-o $ns_nsiorfile"); $NS_status = $NS->Spawn (); diff --git a/TAO/orbsvcs/tests/Bug_2777_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2777_Regression/run_test.pl index 37848fcc6ec..24e9c0b3d9c 100755 --- a/TAO/orbsvcs/tests/Bug_2777_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_2777_Regression/run_test.pl @@ -57,7 +57,7 @@ my $ns_list_iorfile = $ns_list->LocalFile ($iorbase); $ns_service->DeleteFile($iorbase); $ns_list->DeleteFile($iorbase); -$NS = $ns_service->CreateProcess ("../../../../TAO/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns_service->CreateProcess ("../../../../TAO/orbsvcs/Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level -o $ns_service_iorfile ". "-ORBObjRefStyle URL -ORBEndpoint shmiop:// -ORBSvcConfDirective ". "\"dynamic SHMIOP_Factory Service_Object ". diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl b/TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl index de736f305a2..dcfb93f9dc7 100755 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/run_test_federated.pl @@ -50,9 +50,9 @@ $ns2->DeleteFile ($ns2_ior); $SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile"); $CL = $client->CreateProcess ("client", ""); -$NS1 = $ns1->CreateProcess("../../Naming_Service/Naming_Service", +$NS1 = $ns1->CreateProcess("../../Naming_Service/tao_cosnaming", "-ORBEndPoint $ns_endpoint1 -o $ns1_iorfile -m 0"); -$NS2 = $ns2->CreateProcess("../../Naming_Service/Naming_Service", +$NS2 = $ns2->CreateProcess("../../Naming_Service/tao_cosnaming", "-ORBEndPoint $ns_endpoint2 -o $ns2_iorfile -m 0"); # Run two Naming Servers diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_3387_Regression/run_test.pl index 72ff9d36223..d802120f688 100755 --- a/TAO/orbsvcs/tests/Bug_3387_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_3387_Regression/run_test.pl @@ -51,7 +51,7 @@ $consumer2->DeleteFile ($ns_ior); $nt_service->DeleteFile ($nt_ior); $server->DeleteFile ($msngr_ior); -$NMS = $nm_service->CreateProcess("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NMS = $nm_service->CreateProcess("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level -o $nm_ns_ior"); $NFS = $nt_service->CreateProcess("$ENV{TAO_ROOT}/orbsvcs/Notify_Service/tao_cosnotification", "-ORBdebuglevel $debug_level -ORBInitRef NameService=file://$nt_ns_ior ". diff --git a/TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl b/TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl index 5d48a0a3b29..5a8f794b857 100755 --- a/TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl +++ b/TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl @@ -39,7 +39,7 @@ my $client_ior1file = $client->LocalFile ($ior1file); $client->DeleteFile($ior1file); -$SV1 = $server1->CreateProcess ("$PerlACE::TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", +$SV1 = $server1->CreateProcess ("$PerlACE::TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level " . "-o $server1_ior1file"); diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl index 1337d5b8996..fcc583dd637 100755 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl @@ -31,7 +31,7 @@ $server3->DeleteFile ($naming_ior); $client->DeleteFile ($naming_ior); -$SV1 = $server1->CreateProcess ("../../Naming_Service/Naming_Service", +$SV1 = $server1->CreateProcess ("../../Naming_Service/tao_cosnaming", "-ORBNameServicePort $port " . "-o $server1_naming_ior"); diff --git a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl index 5db73ceb7a6..9c0dbe4cabd 100755 --- a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl @@ -26,7 +26,7 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("../../Naming_Service/Naming_Service", +$SV = $server->CreateProcess ("../../Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level -o $server_iorfile"); $CL = $client->CreateProcess ("EC_Multiple", diff --git a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl index d59c2fdb221..8c4e48b05b8 100755 --- a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl +++ b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl @@ -65,7 +65,7 @@ if ($T_status != 0) { print STDERR "================ Remote test\n"; -$NS = $ns->CreateProcess ("../../Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("../../Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); $ES = $es->CreateProcess ("../../Event_Service/Event_Service", diff --git a/TAO/orbsvcs/tests/EC_Throughput/run_test_overflow.pl b/TAO/orbsvcs/tests/EC_Throughput/run_test_overflow.pl index 768e8372da1..36fdce45d13 100755 --- a/TAO/orbsvcs/tests/EC_Throughput/run_test_overflow.pl +++ b/TAO/orbsvcs/tests/EC_Throughput/run_test_overflow.pl @@ -41,7 +41,7 @@ $sup2->DeleteFile ($nsiorfile); print STDERR "================ Overflow test\n"; -$NS = $ns->CreateProcess ("../../Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("../../Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); $ES = $es->CreateProcess ("../../Event_Service/Event_Service", diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl index 747d3611fde..ca08884713e 100755 --- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/run_test.pl +++ b/TAO/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/TAO/orbsvcs/tests/HTIOP/Hello/run_test.pl b/TAO/orbsvcs/tests/HTIOP/Hello/run_test.pl index 3d43aaa7419..ec0de31327f 100755 --- a/TAO/orbsvcs/tests/HTIOP/Hello/run_test.pl +++ b/TAO/orbsvcs/tests/HTIOP/Hello/run_test.pl @@ -49,7 +49,7 @@ foreach $i (@ARGV) { } } -$NS = $ns_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns_service->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", "-ORBSvcConf $ns_service_srv_conf -ORBEndpoint \"iiop://;". "htiop://$host:$name_port\" -o $ns_service_ns_ior"); diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl index 5cfc27fd95a..01ce896aabc 100755 --- a/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl +++ b/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl @@ -42,7 +42,7 @@ $IMR = $imr->CreateProcess ("../../../ImplRepo_Service/ImplRepo_Service"); $ACT = $act->CreateProcess ("../../../ImplRepo_Service/ImR_Activator"); -$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service"); +$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming"); my $ns_cmd = $NS->Executable(); my $ns_ns_cmd = $imr->LocalFile ($ns_cmd); diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/run_test.pl b/TAO/orbsvcs/tests/Interoperable_Naming/run_test.pl index eb89e694837..3d21cdd25f0 100755 --- a/TAO/orbsvcs/tests/Interoperable_Naming/run_test.pl +++ b/TAO/orbsvcs/tests/Interoperable_Naming/run_test.pl @@ -26,7 +26,7 @@ my $client_iorfile = $client->LocalFile ($iorbase); $server->DeleteFile($iorbase); $client->DeleteFile($iorbase); -$SV = $server->CreateProcess ("../../Naming_Service/Naming_Service", +$SV = $server->CreateProcess ("../../Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level " . "-o $server_iorfile"); $CL = $client->CreateProcess ("client", "-s -ORBInitRef NameService=file://$client_iorfile"); diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl b/TAO/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl index 12e1db302b6..f4f800fa36c 100755 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/run_test.pl @@ -29,7 +29,7 @@ $ns_service->DeleteFile ($iorbase); $lg_service->DeleteFile ($iorbase); $client->DeleteFile ($iorbase); -$NS = $ns_service->CreateProcess ("../../../Naming_Service/Naming_Service", +$NS = $ns_service->CreateProcess ("../../../Naming_Service/tao_cosnaming", "-o $ns_iorfile"); $LS = $lg_service->CreateProcess ("../../../Logging_Service/Basic_Logging_Service/tao_tls_basic", "-ORBInitRef NameService=file://$lg_iorfile"); diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl index 4be819ee2dc..18bb43b7e11 100755 --- a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl @@ -88,7 +88,7 @@ else { @test_configs = @ARGV; } -$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); $NS_status = $NS->Spawn (); diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl index 3f1de9a55e9..fd4cf5dd974 100755 --- a/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl +++ b/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl @@ -88,7 +88,7 @@ else { @test_configs = @ARGV; } -$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); $NS_status = $NS->Spawn (); diff --git a/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl b/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl index f919037e4a9..c8049870a7b 100755 --- a/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Blocking/run_test.pl @@ -45,7 +45,7 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port ". "-o $ns_nsiorfile"); $NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", 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 cf8780d2ece..3bcef988967 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/run_test.pl @@ -45,7 +45,7 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port ". "-o $ns_nsiorfile"); $NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", 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 fe2911ccc8d..628d56e77ea 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/run_test.pl @@ -48,7 +48,7 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://$ns_host:$ns_port"); $NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", 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 ff8f6cd98d4..b1a0704fbc5 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/run_test.pl @@ -49,7 +49,7 @@ $sup->DeleteFile ($supiorfile); $con1->DeleteFile ($supiorfile); $con2->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port ". "-o $ns_nsiorfile"); $NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", 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 9a895e124bc..68621bd68c7 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_3646a_Regression/run_test.pl @@ -37,7 +37,7 @@ $server2->DeleteFile($ior2file); $hostname = $server1->HostName (); $port = $server1->RandomPort (); -$SV1 = $server1->CreateProcess ("../../../Naming_Service/Naming_Service", +$SV1 = $server1->CreateProcess ("../../../Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level " . "-ORBEndpoint iiop://$hostname:$port " . "-o $server1_ior1file"); diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl index c21727fe388..8e22b4e2ccb 100755 --- a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/run_test.pl @@ -41,7 +41,7 @@ $hostname = $server1->HostName (); $port = $server1->RandomPort (); -$SV1 = $server1->CreateProcess ("../../../Naming_Service/Naming_Service", +$SV1 = $server1->CreateProcess ("../../../Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level " . "-ORBEndpoint iiop://$hostname:$port " . "-o $server1_ior1file"); diff --git a/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl b/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl index f967b37a6f4..561fb5199e1 100755 --- a/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Discarding/run_test.pl @@ -65,7 +65,7 @@ foreach my $arg (@ARGV) { } } -$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port -o $ns_nsiorfile"); $NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", diff --git a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl b/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl index a6a2be33292..b77703511bd 100755 --- a/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Lanes/run_test.pl @@ -63,7 +63,7 @@ my $client2_client_ior = $client2->LocalFile ($client_ior); $client2->DeleteFile($ior1file); $client2->DeleteFile($client_ior); -$SV1 = $server1->CreateProcess ("../../../Naming_Service/Naming_Service", +$SV1 = $server1->CreateProcess ("../../../Naming_Service/tao_cosnaming", "-o $server1_ior1file"); $SV2 = $server2->CreateProcess ("../../../Notify_Service/tao_cosnotification", diff --git a/TAO/orbsvcs/tests/Notify/MC/run_test.pl b/TAO/orbsvcs/tests/Notify/MC/run_test.pl index 46bbb5f90b7..9f91eb1ea4d 100755 --- a/TAO/orbsvcs/tests/Notify/MC/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/MC/run_test.pl @@ -86,7 +86,7 @@ if ($nfs->PutFile ($notify_conf) == -1) { exit 1; } -my $NS = $ns->CreateProcess("../../../Naming_Service/Naming_Service", +my $NS = $ns->CreateProcess("../../../Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port -o $nsiorfile"); my $NFS = $nfs->CreateProcess("../../../Notify_Service/tao_cosnotification", "-ORBDebugLevel $debug_level ". diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl b/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl index 02e834e6610..6ab17265e41 100755 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/run_test.pl @@ -68,7 +68,7 @@ $con->DeleteFile ($coniorfile); }, ); -$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); $NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification"); diff --git a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl index ca86865b677..5d8f51278f9 100755 --- a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl @@ -65,7 +65,7 @@ foreach my $arg (@ARGV) { } } -$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port -o $ns_nsiorfile"); $NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl index 79cdf8ef1ab..7c75cc1a151 100755 --- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/run_test.pl @@ -47,7 +47,7 @@ $nfs->DeleteFile ($nfsiorfile); $nfs->DeleteFile ($persistent_xml); $nfs->DeleteFile ($persistent_000); -$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); $NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification"); diff --git a/TAO/orbsvcs/tests/Notify/Persistent_POA/run_test.pl b/TAO/orbsvcs/tests/Notify/Persistent_POA/run_test.pl index 95b857adc67..5b675c57c69 100755 --- a/TAO/orbsvcs/tests/Notify/Persistent_POA/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Persistent_POA/run_test.pl @@ -50,7 +50,7 @@ $sup->DeleteFile ($nfs2iorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port ". "-o $ns_nsiorfile"); $NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", 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 24e4d4eb7ed..5339c6bf664 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 @@ -42,7 +42,7 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port"); $NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", "-ORBInitRef NameService=iioploc://" . 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 e94fe5eb118..f01efb1d81a 100755 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl @@ -42,7 +42,7 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port"); $NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", "-ORBInitRef NameService=iioploc://" . diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl b/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl index f636489f797..51105e42a9d 100755 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/run_test.pl @@ -45,7 +45,7 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port ". "-o $ns_nsiorfile"); $NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", 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 0fe29359df1..282592ff95d 100755 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/run_test.pl @@ -45,7 +45,7 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port ". "-o $ns_nsiorfile"); $NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification", diff --git a/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl b/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl index c5fd9aea8da..49f88ff5158 100755 --- a/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/ThreadPool/run_test.pl @@ -51,7 +51,7 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -$NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); $NFS = $nfs->CreateProcess ("../../../Notify_Service/tao_cosnotification"); diff --git a/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl b/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl index 46173206ea3..04384ec2fa9 100755 --- a/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/Timeout/run_test.pl @@ -49,7 +49,7 @@ $nfs->DeleteFile ($nfsiorfile); $sup->DeleteFile ($supiorfile); $con->DeleteFile ($supiorfile); -my $NS = $ns->CreateProcess ("../../../Naming_Service/Naming_Service", +my $NS = $ns->CreateProcess ("../../../Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); my $NFS = $ns->CreateProcess ("../../../Notify_Service/tao_cosnotification", "-ORBInitRef NameService=file://$nfs_nsiorfile " . 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 32aba73bf0b..88fc0406dd1 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/run_test.pl @@ -39,7 +39,7 @@ my $host = $nm_service->HostName(); my $initref = "-ORBInitRef NameService=iioploc://$host:$port/NameService "; -$NS = $nm_service->CreateProcess ("../../../../Naming_Service/Naming_Service", +$NS = $nm_service->CreateProcess ("../../../../Naming_Service/tao_cosnaming", "-ORBEndpoint iiop://$host:$port -o $ns_naming_ior"); $TS = $nt_service->CreateProcess ("../../../../Notify_Service/tao_cosnotification", $initref. "-IORoutput $ts_notify_ior -ORBSvcConf $ts_notify_conf"); 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 69e324c8d16..cd32f090a3e 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/run_test.pl @@ -32,7 +32,7 @@ $nt_service->DeleteFile ($notify_ior); $nt_service->DeleteFile ($naming_ior); $test->DeleteFile ($naming_ior); -$NM_SV = $nm_service->CreateProcess ("../../../../Naming_Service/Naming_Service", "-o $nm_service_nmiorfile"); +$NM_SV = $nm_service->CreateProcess ("../../../../Naming_Service/tao_cosnaming", "-o $nm_service_nmiorfile"); $T = $test->CreateProcess ("RedGreen_Test", "-ORBInitRef NameService=file://$test_nmiorfile"); $NT_SV = $nt_service->CreateProcess ("../../../../Notify_Service/tao_cosnotification", ""); 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 8e0dbe7d00c..1154c82070a 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 @@ -85,7 +85,7 @@ $con->DeleteFile ($supiorfile); # DeleteFile($file) or die "Could not delete $file"; #} -$NS = $ns->CreateProcess ("../../../../../Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("../../../../../Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); $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/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 0c7f93d71ca..7d4bd7e216f 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 @@ -85,7 +85,7 @@ $con->DeleteFile ($supiorfile); # DeleteFile($file) or die "Could not delete $file"; #} -$NS = $ns->CreateProcess ("../../../../../Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("../../../../../Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); $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/2_Hops/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl index 7ba4be37cda..393c5812cb4 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops/run_test.pl @@ -44,7 +44,7 @@ $supplier->DeleteFile ($consumer_ior); $consumer->DeleteFile ($naming_ior); $consumer->DeleteFile ($consumer_ior); -$NM = $nm_service->CreateProcess ("../../../../../../Naming_Service/Naming_Service", +$NM = $nm_service->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level -o $nm_service_nmiorfile"); $SP = $supplier->CreateProcess ("../../../../Driver/Notify_Tests_Driver", diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl index 766d4286349..3a759aeb3b2 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/2_Hops_RTCORBA/run_test.pl @@ -44,7 +44,7 @@ $supplier->DeleteFile ($consumer_ior); $consumer->DeleteFile ($naming_ior); $consumer->DeleteFile ($consumer_ior); -$NM = $nm_service->CreateProcess ("../../../../../../Naming_Service/Naming_Service", +$NM = $nm_service->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level -o $nm_service_nmiorfile"); $SP = $supplier->CreateProcess ("../../../../Driver/Notify_Tests_Driver", diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl index 276d14817fd..3ca61b9dda4 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops/run_test.pl @@ -60,7 +60,7 @@ $sup->DeleteFile ($reliorfile); $con->DeleteFile ($chighdat); $sup->DeleteFile ($shighdat); -$NS = $ns->CreateProcess ("../../../../../../Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); $SUP = $sup->CreateProcess ("../../../../Driver/Notify_Tests_Driver"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl index 716e97cb155..520c3289059 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/3_Hops_RTCORBA/run_test.pl @@ -60,7 +60,7 @@ $sup->DeleteFile ($reliorfile); $con->DeleteFile ($chighdat); $sup->DeleteFile ($shighdat); -$NS = $ns->CreateProcess ("../../../../../../Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); $SUP = $sup->CreateProcess ("../../../../Driver/Notify_Tests_Driver"); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl index 8774d46bf67..6b0f5032ee3 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated/run_test.pl @@ -30,7 +30,7 @@ my $collocated_iorfile = $collocated->LocalFile($iorbase); $nm_service->DeleteFile($iorbase); $collocated->DeleteFile($iorbase); -$NM_SV = $nm_service->CreateProcess ("../../../../../../Naming_Service/Naming_Service", +$NM_SV = $nm_service->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level -o $nm_service_iorfile"); $CL = $collocated->CreateProcess ("../../../../Driver/Notify_Tests_Driver", diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl index 865a3a106ca..009ac28cfad 100755 --- a/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl +++ b/TAO/orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Colocated_RTCORBA/run_test.pl @@ -32,7 +32,7 @@ my $collocated_iorfile = $collocated->LocalFile($iorbase); $nm_service->DeleteFile($iorbase); $collocated->DeleteFile($iorbase); -$NM_SV = $nm_service->CreateProcess ("../../../../../../Naming_Service/Naming_Service", +$NM_SV = $nm_service->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming", "-ORBdebuglevel $debug_level -o $nm_service_iorfile"); $CL = $collocated->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 c2e31c0bf46..7348bd02884 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 @@ -85,7 +85,7 @@ $con->DeleteFile ($supiorfile); $con->DeleteFile ($chighdat); $sup->DeleteFile ($shighdat); -$NS = $ns->CreateProcess ("../../../../../../Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); $NFS = $nfs->CreateProcess ("../../../../../../Notify_Service/tao_cosnotification"); $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile ". 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 b1d83123955..0e1050e731a 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 @@ -85,7 +85,7 @@ $con->DeleteFile ($supiorfile); $con->DeleteFile ($chighdat); $sup->DeleteFile ($shighdat); -$NS = $ns->CreateProcess ("../../../../../../Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("../../../../../../Naming_Service/tao_cosnaming", "-o $ns_nsiorfile"); $NFS = $nfs->CreateProcess ("../../../../../../Notify_Service/tao_cosnotification"); $NFS_Args = "-ORBInitRef NameService=file://$nfs_nsiorfile ". 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 f68ba51f2fc..be792c12a4a 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 @@ -66,7 +66,7 @@ $nm_service->DeleteFile($nm_ior); $nt_service->DeleteFile($nm_ior); $nt_service->DeleteFile($nt_ior); -$NM_SV = $nm_service->CreateProcess ("../../../../../Naming_Service/Naming_Service", +$NM_SV = $nm_service->CreateProcess ("../../../../../Naming_Service/tao_cosnaming", "-ORBDebugLevel $debug_level -o $nm_service_nm_ior"); $NT_SV = $nt_service->CreateProcess ("../../../../../Notify_Service/tao_cosnotification", 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 e1f6a1f8033..4ea15e40ba8 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 @@ -81,7 +81,7 @@ $nt_service_ntconffile = $nt_service->LocalFile($notify_conf); $high_path_hpconffile = $high_path->LocalFile($high_path_conf); $other_path_opconffile = $other_path->LocalFile($other_paths_conf); -$NM_SV = $nm_service->CreateProcess ("../../../../../Naming_Service/Naming_Service", +$NM_SV = $nm_service->CreateProcess ("../../../../../Naming_Service/tao_cosnaming", "-o $nm_service_nmiorfile $debug"); $NT_SV = $nt_service->CreateProcess ("../../../../../Notify_Service/tao_cosnotification", "-ORBInitRef NameService=file://$nt_service_nmiorfile ". diff --git a/TAO/orbsvcs/tests/Property/run_test.pl b/TAO/orbsvcs/tests/Property/run_test.pl index b25091d754b..bc53ac19b04 100755 --- a/TAO/orbsvcs/tests/Property/run_test.pl +++ b/TAO/orbsvcs/tests/Property/run_test.pl @@ -33,9 +33,9 @@ $n_service->DeleteFile($iorbase); $SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level ". "-ORBInitRef NameService=file://$server_iorfile"); $CL = $client->CreateProcess ("client", "-ORBInitRef NameService=file://$client_iorfile"); -$NS = $n_service->CreateProcess ("../../Naming_Service/Naming_Service", "-o $n_service_iorfile"); +$NS = $n_service->CreateProcess ("../../Naming_Service/tao_cosnaming", "-o $n_service_iorfile"); -print STDERR "Starting Naming_Service\n"; +print STDERR "Starting tao_cosnaming\n"; $n_service_status = $NS->Spawn (); diff --git a/TAO/orbsvcs/tests/Redundant_Naming/run_test.pl b/TAO/orbsvcs/tests/Redundant_Naming/run_test.pl index c20ddc54ed2..849a56c486c 100755 --- a/TAO/orbsvcs/tests/Redundant_Naming/run_test.pl +++ b/TAO/orbsvcs/tests/Redundant_Naming/run_test.pl @@ -78,7 +78,7 @@ else { # in files to find the individual copies of the Naming Servers. my $args = "-ORBEndPoint $ns_endpoint1 -o $test_iorfile1 -m 0 -r NameService"; -my $prog = "$startdir/../../Naming_Service/Naming_Service"; +my $prog = "$startdir/../../Naming_Service/tao_cosnaming"; $NS1 = $test->CreateProcess ("$prog", "$args"); @@ -94,7 +94,7 @@ if ($test->WaitForFileTimed ($iorfile1, } $args = "-ORBEndPoint $ns_endpoint2 -o $test_iorfile2 -m 0 -r NameService"; -$prog = "$startdir/../../Naming_Service/Naming_Service"; +$prog = "$startdir/../../Naming_Service/tao_cosnaming"; $NS2 = $test->CreateProcess ("$prog", "$args"); diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl index b1f3d5b0f84..90c93878d60 100755 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/run_test.pl @@ -66,7 +66,7 @@ $cli->DeleteFile ($nsiorfile); sub name_server { my $args = "-ORBNameServicePort $ns_multicast_port -o $ns_nsiorfile -m 1 @_"; - my $prog = "../../../Naming_Service/Naming_Service"; + my $prog = "../../../Naming_Service/tao_cosnaming"; $NS = $ns->CreateProcess ($prog, $args); $ns->DeleteFile ($nsiorfile); @@ -178,7 +178,7 @@ foreach $o (@opts) { } ## For some reason, only on Windows XP, we need to - ## wait before starting another Naming_Service when + ## wait before starting another tao_cosnaming when ## the mmap persistence option is used if ($^O eq "MSWin32") { sleep(1); diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl index 3cf845a3e17..78cfc80e755 100755 --- a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl +++ b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl @@ -67,7 +67,7 @@ $test->DeleteFile($persistent_log_file); sub name_server { my $args = "-ORBMulticastDiscoveryEndpoint $multicast:$ns_multicast_port -o $test_iorfile -m 1 @_"; - my $prog = "$startdir/../../Naming_Service/Naming_Service"; + my $prog = "$startdir/../../Naming_Service/tao_cosnaming"; $SV = $test->CreateProcess ("$prog", "$args"); @@ -151,7 +151,7 @@ foreach $o (@opts) { $SV->Kill (); ## For some reason, only on Windows XP, we need to - ## wait before starting another Naming_Service when + ## wait before starting another tao_cosnaming when ## the mmap persistence option is used if ($^O eq "MSWin32") { sleep(1); diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl index 75d04a4e2fa..5ef2c750ed4 100755 --- a/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl +++ b/TAO/orbsvcs/tests/Simple_Naming/run_test_ffp.pl @@ -44,7 +44,7 @@ $test->DeleteFile($persistent_ior_file); sub name_server { my $args = "-ORBNameServicePort $ns_multicast_port -o $test_iorfile -m 1 @_"; - my $prog = "../../Naming_Service/Naming_Service"; + my $prog = "../../Naming_Service/tao_cosnaming"; $SV = $test->CreateProcess ("$prog", "$args"); @@ -125,7 +125,7 @@ foreach $o (@opts) { $SV->Kill (); ## For some reason, only on Windows XP, we need to - ## wait before starting another Naming_Service when + ## wait before starting another tao_cosnaming when ## the mmap persistence option is used if ($^O eq "MSWin32") { sleep(1); diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl index bd1aba10894..363ca918d35 100755 --- a/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl +++ b/TAO/orbsvcs/tests/Simple_Naming/run_test_ipv6.pl @@ -67,7 +67,7 @@ $test->DeleteFile($persistent_ior_file); sub name_server { my $args = "-ORBMulticastDiscoveryEndpoint $multicast:$ns_multicast_port -o $test_iorfile -m 1 @_"; - my $prog = "$startdir/../../Naming_Service/Naming_Service"; + my $prog = "$startdir/../../Naming_Service/tao_cosnaming"; $SV = $test->CreateProcess ("$prog", "$args"); @@ -150,7 +150,7 @@ foreach $o (@opts) { $SV->Kill (); ## For some reason, only on Windows XP, we need to - ## wait before starting another Naming_Service when + ## wait before starting another tao_cosnaming when ## the mmap persistence option is used if ($^O eq "MSWin32") { sleep(1); diff --git a/TAO/tests/Bug_2791_Regression/README b/TAO/tests/Bug_2791_Regression/README index 62d67c6dc92..fa4c08553c1 100755 --- a/TAO/tests/Bug_2791_Regression/README +++ b/TAO/tests/Bug_2791_Regression/README @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ This test confirms that the reference count for a valuetype factory is decremented when the valuetype factory is unregistered via ORB::unregister_value_factory(). Before, the reference diff --git a/TAO/tests/Bug_3299_Regression/README b/TAO/tests/Bug_3299_Regression/README index f769a679628..4bb3faf68a0 100644 --- a/TAO/tests/Bug_3299_Regression/README +++ b/TAO/tests/Bug_3299_Regression/README @@ -1,4 +1,4 @@ -# $Id:$ +# $Id$ This test checks that the client side ORB *doesn't* transparently reinvoke COMPLETED_MAYBE exceptions. diff --git a/TAO/tests/Bug_3479_Regression/README b/TAO/tests/Bug_3479_Regression/README index bccd449a6f0..1e796087d76 100644 --- a/TAO/tests/Bug_3479_Regression/README +++ b/TAO/tests/Bug_3479_Regression/README @@ -1,5 +1,5 @@ /** -$Id:$ +$Id$ This is a clone of the Hello World test. The differences are that an out string argument is used rather than having ::get_string return string. diff --git a/TAO/tests/DII_AMI_Forward/README b/TAO/tests/DII_AMI_Forward/README index 4ec6a7896b8..2c493a3c740 100644 --- a/TAO/tests/DII_AMI_Forward/README +++ b/TAO/tests/DII_AMI_Forward/README @@ -1,5 +1,5 @@ /** -$Id:$ +$Id$ @page DII_AMI_Forward Test README File diff --git a/TAO/utils/nslist/run_test.pl b/TAO/utils/nslist/run_test.pl index 2b67bd9427e..025ec46d67a 100755 --- a/TAO/utils/nslist/run_test.pl +++ b/TAO/utils/nslist/run_test.pl @@ -37,7 +37,7 @@ $server4->DeleteFile ($naming_ior); $client->DeleteFile ($naming_ior); -$NS = $server1->CreateProcess ("../../orbsvcs/Naming_Service/Naming_Service", ""); +$NS = $server1->CreateProcess ("../../orbsvcs/Naming_Service/tao_cosnaming", ""); $LS = $server2->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_nslist", ""); $AD = $server3->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_nsadd", ""); $DL = $server4->CreateProcess ("$ENV{ACE_ROOT}/bin/tao_nsdel", ""); |