ChangeLogTag:Wed Jul 21 02:36:51 1999 Nanbor Wang <nanbor@cs.wustl.edu>

11 files changed, 13 insertions, 13 deletions

diff --git a/TAO/examples/Callback_Quoter/run_test.pl b/TAO/examples/Callback_Quoter/run_test.pl
index 5b2983d380e..3e4ac9098be 100755
--- a/TAO/examples/Callback_Quoter/run_test.pl
+++ b/TAO/examples/Callback_Quoter/run_test.pl
@@ -18,7 +18,7 @@ $NS = Process::Create ("..".$DIR_SEPARATOR.
                        "..".$DIR_SEPARATOR.
 		       "orbsvcs".$DIR_SEPARATOR.
                        "Naming_Service".$DIR_SEPARATOR.
-                       "Naming_Server".$EXE_EXT,
+                       "Naming_Service".$EXE_EXT,
                        " -o $ns_ior ");
 
 if (ACE::waitforfile_timed ($ns_ior, 5) == -1) {
diff --git a/TAO/examples/Quoter/run_test.pl b/TAO/examples/Quoter/run_test.pl
index 22e901ece37..72d6fbc2351 100755
--- a/TAO/examples/Quoter/run_test.pl
+++ b/TAO/examples/Quoter/run_test.pl
@@ -49,7 +49,7 @@ sub name_server
   my $args = "$other -o $nsiorfile";
   my $prog = "..$DIR_SEPARATOR..$DIR_SEPARATOR"."orbsvcs$DIR_SEPARATOR".
              "Naming_Service$DIR_SEPARATOR".
-             "Naming_Server$EXE_EXT";
+             "Naming_Service$EXE_EXT";
 
   $NS = Process::Create ($prog, $args);
 }
diff --git a/TAO/orbsvcs/Naming_Service/Makefile b/TAO/orbsvcs/Naming_Service/Makefile
index 77be48faefb..8a14dafdbac 100644
--- a/TAO/orbsvcs/Naming_Service/Makefile
+++ b/TAO/orbsvcs/Naming_Service/Makefile
@@ -12,7 +12,7 @@ SRC = Naming_Server.cpp Naming_Service.cpp
 
 LDLIBS  = -lorbsvcs -lTAO
 
-BIN2 = Naming_Server
+BIN2 = Naming_Service
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
 #### don't try to build here.
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl b/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl
index de0dd0171b9..a0c9e68d9c4 100755
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl
@@ -24,8 +24,8 @@ sub name_server
       ."..".$DIR_SEPARATOR
 	."..".$DIR_SEPARATOR
 	  ."Naming_Service".$DIR_SEPARATOR
-	."Naming_Server ".$EXE_EXT;
-    print ("\nNaming_Server $args\n");
+	."Naming_Service ".$EXE_EXT;
+    print ("\nNaming_Service $args\n");
     $NS = Process::Create ($prog, $args);
     if (ACE::waitforfile_timed ($nsior, 5) == -1) {
       print STDERR "ERROR: cannot find naming service IOR file\n";
diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl b/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl
index 1c657f3b0bf..78ee631e29b 100755
--- a/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl
+++ b/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl
@@ -31,7 +31,7 @@ sub cosec_multiple_test1
     $SV1 = Process::Create ("..".$DIR_SEPARATOR
 			    ."..".$DIR_SEPARATOR
 			    ."Naming_Service".$DIR_SEPARATOR
-			    ."Naming_Server".$EXE_EXT, "");
+			    ."Naming_Service".$EXE_EXT, "");
 
     sleep 10;
 
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
index b77427295a9..cd610c1bd7c 100755
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
@@ -16,7 +16,7 @@ $status = 0;
 $NS = Process::Create ("..".$DIR_SEPARATOR.
                        "..".$DIR_SEPARATOR.
                        "Naming_Service".$DIR_SEPARATOR.
-                       "Naming_Server".$EXE_EXT,
+                       "Naming_Service".$EXE_EXT,
                        " -o $NS_ior ");
 
 if (ACE::waitforfile_timed ($NS_ior, 5) == -1) {
diff --git a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl
index 757c34edf68..632c6e1b316 100755
--- a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl
@@ -15,7 +15,7 @@ $status = 0;
 $NS = Process::Create ("..".$DIR_SEPARATOR.
                        "..".$DIR_SEPARATOR.
                        "Naming_Service".$DIR_SEPARATOR.
-                       "Naming_Server".$EXE_EXT,
+                       "Naming_Service".$EXE_EXT,
                        " -o $NS_ior ");
 if (ACE::waitforfile_timed ($NS_ior, 5) == -1) {
   print STDERR "ERROR: waiting for naming service IOR file\n";
diff --git a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
index 1ae68d5be58..950053d6afd 100755
--- a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
@@ -41,7 +41,7 @@ unlink $ns_ior;
 $NS = Process::Create ("..".$DIR_SEPARATOR.
                        "..".$DIR_SEPARATOR.
                        "Naming_Service".$DIR_SEPARATOR.
-                       "Naming_Server".$EXE_EXT,
+                       "Naming_Service".$EXE_EXT,
                        " -o $ns_ior ");
 
 if (ACE::waitforfile_timed ($ns_ior, 5) == -1) {
diff --git a/TAO/orbsvcs/tests/Event_Latency/run_test.pl b/TAO/orbsvcs/tests/Event_Latency/run_test.pl
index 05dc50eaf67..0c2eade7460 100755
--- a/TAO/orbsvcs/tests/Event_Latency/run_test.pl
+++ b/TAO/orbsvcs/tests/Event_Latency/run_test.pl
@@ -16,7 +16,7 @@ $status = 0;
 $NS = Process::Create ("..".$DIR_SEPARATOR
 		       ."..".$DIR_SEPARATOR
 		       ."Naming_Service".$DIR_SEPARATOR
-		       ."Naming_Server".$EXE_EXT,
+		       ."Naming_Service".$EXE_EXT,
 		       " -o $NS_ior ");
 
 if (ACE::waitforfile_timed ($NS_ior, 5) == -1) {
diff --git a/TAO/orbsvcs/tests/Property/run_test.pl b/TAO/orbsvcs/tests/Property/run_test.pl
index 3b20f1e86bd..54c1cec55fd 100755
--- a/TAO/orbsvcs/tests/Property/run_test.pl
+++ b/TAO/orbsvcs/tests/Property/run_test.pl
@@ -22,13 +22,13 @@ sub name_server
 {
     my $args = " -o $nsior";
     my $prog =
-    print STDERR ("\nNaming_Server: $args\n");
+    print STDERR ("\nNaming_Service: $args\n");
 
     unlink $nsior;
     $NS = Process::Create ("..".$DIR_SEPARATOR
 			   ."..".$DIR_SEPARATOR
 			   ."Naming_Service".$DIR_SEPARATOR
-			   ."Naming_Server".$EXE_EXT, $args);
+			   ."Naming_Service".$EXE_EXT, $args);
     if (ACE::waitforfile_timed ($nsior, 5) == -1) {
       print STDERR "ERROR: cannot find naming service IOR file\n";
       $NS->Kill (); $NS->TimedWait (1);
diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
index 41f57836989..5d72e95adaa 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
@@ -31,7 +31,7 @@ sub name_server
   my $args = "@_ "."-ORBnameserviceport $ns_multicast_port -o $iorfile";
   my $prog = "..$DIR_SEPARATOR..$DIR_SEPARATOR".
       "Naming_Service".$DIR_SEPARATOR.
-          "Naming_Server".$EXE_EXT;
+          "Naming_Service".$EXE_EXT;
 
   unlink $iorfile;
   $NS = Process::Create ($prog, $args);