ChangeLogTag:Mon May 31 19:32:29 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

30 files changed, 265 insertions, 286 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index ecc05470bc0..31a6783fc11 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,38 @@
+Mon May 31 19:32:29 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* docs/releasenotes/ec.html:
+	* examples/POA/Default_Servant/README:
+	* examples/POA/Forwarding/README:
+	* examples/POA/Generic_Servant/README:
+	* examples/POA/On_Demand_Activation/README:
+	* examples/Simulator/README:
+	* orbsvcs/Naming_Service/README:
+	* orbsvcs/orbsvcs/Event/RT_Task.cpp:
+	* orbsvcs/tests/start_services:
+	* orbsvcs/tests/AVStreams/benchmark/server.cpp:
+	* orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.cpp:
+	* orbsvcs/tests/AVStreams/mpeg/source/server/augmented_server.cpp:
+	* orbsvcs/tests/AVStreams/mpeg/source/server/server.cpp:
+	* orbsvcs/tests/EC_Multiple/README:
+	* orbsvcs/tests/EC_Multiple/run_dynamic:
+	* orbsvcs/tests/EC_Multiple/run_latency:
+	* orbsvcs/tests/EC_Multiple/run_overhead:
+	* orbsvcs/tests/EC_Multiple/run_schedule:
+	* orbsvcs/tests/EC_Multiple/run_throughput:
+	* orbsvcs/tests/EC_Multiple/run_utilization:
+	* performance-tests/Cubit/COOL/IDL_Cubit/README:
+	* performance-tests/Cubit/CORBAplus/MT_Cubit/server/svr.cpp:
+	* performance-tests/Cubit/TAO/DII_Cubit/README:
+	* performance-tests/Thruput/CORBAplus/run_server:
+	* performance-tests/Thruput/TAO/new_server_test:
+	* performance-tests/Thruput/TAO/run_server:
+	* tests/NestedUpcall/MT_Client_Test/README:
+	* tests/NestedUpcall/Reactor/README:
+	* tests/NestedUpcall/Triangle_Test/README:
+	  Removed all references to the -ORBhost or -ORBport options,
+	  first because the default values work in most cases and second
+	  because the options are obsolete (-ORBenpoint replaces both).
+
 Mon May 31 19:21:59 1999  Ossama Othman  <othman@cs.wustl.edu>
 
 	* tao/UIOP_Acceptor.cpp:
diff --git a/TAO/docs/releasenotes/ec.html b/TAO/docs/releasenotes/ec.html
index a78acc6c6fe..00a0b54f316 100644
--- a/TAO/docs/releasenotes/ec.html
+++ b/TAO/docs/releasenotes/ec.html
@@ -92,13 +92,12 @@ Compile everything under <TT>$TAO_ROOT/orbsvcs</TT>, this needs, obviously,
 and the IDL compiler in <TT>$TAO_ROOT/TAO_IDL</TT>.</LI>
 
 <P>Run the naming service, the scheduling service, the event service and
-the test in <TT>$TAO_ROOT/TAO/orbsvcs/tests/Event_Latency</TT>; remember
-to give a different port to each one, using the <TT>-ORBport</TT> option.
+the test in <TT>$TAO_ROOT/TAO/orbsvcs/tests/Event_Latency</TT>.
 As in:
 <P><TT>$ cd $TAO_ROOT/orbsvcs</TT>
-<P><TT>$ cd Naming_Service ; ./Naming_Service -ORBport 10000 &amp;</TT>
-<P><TT>$ cd Event_Service ; ./Event_Service -ORBport 0 &amp;</TT>
-<P><TT>$ cd tests/Event_Latency ; ./Event_Latency -ORBport 0 -m 20 -j &amp;</TT>
+<P><TT>$ cd Naming_Service ; ./Naming_Service &amp;</TT>
+<P><TT>$ cd Event_Service ; ./Event_Service &amp;</TT>
+<P><TT>$ cd tests/Event_Latency ; ./Event_Latency -m 20 -j &amp;</TT>
 <P>You may want to run each program in a separate window. Try using a fixed
 port number for the <TT>Naming Service</TT> so you can use the <TT>NameService</TT>
 environment variable.
diff --git a/TAO/examples/POA/Default_Servant/README b/TAO/examples/POA/Default_Servant/README
index d64c59dbe80..e4fe4e37088 100644
--- a/TAO/examples/POA/Default_Servant/README
+++ b/TAO/examples/POA/Default_Servant/README
@@ -24,7 +24,7 @@ SERVER:
 
 	1. To run the server, type
 	
-	   % server [-ORBport port] [-ORBobjrefstyle URL] [-ORBhost host]
+	   % server [-ORBobjrefstyle URL]
 			
 CLIENT:
 ======
diff --git a/TAO/examples/POA/Forwarding/README b/TAO/examples/POA/Forwarding/README
index aea0bfe129f..0acbf8615f6 100644
--- a/TAO/examples/POA/Forwarding/README
+++ b/TAO/examples/POA/Forwarding/README
@@ -26,23 +26,23 @@ the above documentation about location forwarding.
 
 To run the test for the POA approach do the following:
 
-% server -o server2 -ORBport 10040 -ORBobjrefstyle url
-% server -f server2 -o server1 -ORBport 10041 -ORBobjrefstyle url
+% server -o server2 -ORBobjrefstyle url
+% server -f server2 -o server1 -ORBobjrefstyle url
 % client -f server1 -i 5
 
 A similar invocation for the servant locator approach can be done as
 follows (basically just the switches are different):
 
-% server -p server2 -ORBport 10040 -ORBobjrefstyle url
-% server -g server2 -p server1 -ORBport 10041 -ORBobjrefstyle url
+% server -p server2 -ORBobjrefstyle url
+% server -g server2 -p server1 -ORBobjrefstyle url
 % client -g server1 -i 5
 
 For additional features try using the first server with the POA
 apporach and the second with the servant locator approach:
 
-% server -o server3 -ORBport 10040 -ORBobjrefstyle url  
-% server -g server3 -p server2 -ORBport 10041 -ORBobjrefstyle url
-% server -f server2 -o server1 -ORBport 10043 -ORBobjrefstyle url
+% server -o server3 -ORBobjrefstyle url  
+% server -g server3 -p server2 -ORBobjrefstyle url
+% server -f server2 -o server1 -ORBobjrefstyle url
 % client -f server1 -i 8
 
 The first two calls will be called on server1, then the location
diff --git a/TAO/examples/POA/Generic_Servant/README b/TAO/examples/POA/Generic_Servant/README
index 05ee0f2a18e..b7dcab67d42 100644
--- a/TAO/examples/POA/Generic_Servant/README
+++ b/TAO/examples/POA/Generic_Servant/README
@@ -19,6 +19,6 @@ Typing
 
 To run the client, type 
 
-% client [-ORBport port] -k IOR
+% client -k IOR
 
 where IOR can be got from the server output.
diff --git a/TAO/examples/POA/On_Demand_Activation/README b/TAO/examples/POA/On_Demand_Activation/README
index b23a801ef6f..392210c8131 100644
--- a/TAO/examples/POA/On_Demand_Activation/README
+++ b/TAO/examples/POA/On_Demand_Activation/README
@@ -42,7 +42,7 @@ USAGE:
 
 You can use the run_test.pl perl script or follow these directions:
 
-%server [-ORBport port] [-ORBobjrefstyle URL] [-f IOR file]
+%server [-ORBobjrefstyle URL] [-f IOR file]
 
 client:
 ======
diff --git a/TAO/examples/Simulator/README b/TAO/examples/Simulator/README
index 0b4dd6d3db3..eaa65807e63 100644
--- a/TAO/examples/Simulator/README
+++ b/TAO/examples/Simulator/README
@@ -211,21 +211,21 @@ Starting:
                 script is located in $TAO_ROOT/orbsvcs/tests.
 
         Event Supplier (simulation data):
-                Event_Sup -ORBport 10040 -f MLF.dat -m 1000
+                Event_Sup -f MLF.dat -m 1000
 
                 // -m 1000 for 1000 events sent by the supplier
                 // -f MLF.dat to read scheduling data from this file as input
 
 
         Logging Supplier (live latency and latency jitter data):
-                Logging_Sup -ORBport 10040 -f MLF.dat -m 1000
+                Logging_Sup -f MLF.dat -m 1000
 
                 // -m 1000 for 1000 events sent by the supplier
                 // -f MLF.dat to read operation names from this file as input
 
 
         Dual EC Supplier (live latency and jitter data over two channels):
-                DualEC_Sup -ORBport 10040 -f MLF.dat -m 1000
+                DualEC_Sup -f MLF.dat -m 1000
 
                 // -m 1000 for 1000 events sent by the supplier
                 // -f MLF.dat to read operation names from this file as input
@@ -248,7 +248,7 @@ Starting:
 
 
         DOVE MIB:
-                DOVEMIB -ORBport 10041 -f myfile -m 100
+                DOVEMIB -f myfile -m 100
 
                 // -m 100 for storing the next 100 events
                 // -f <name of the file in which it will be stored>
diff --git a/TAO/orbsvcs/Naming_Service/README b/TAO/orbsvcs/Naming_Service/README
index 509e3023530..c5814b5883a 100644
--- a/TAO/orbsvcs/Naming_Service/README
+++ b/TAO/orbsvcs/Naming_Service/README
@@ -7,8 +7,7 @@ client "resolve_initial_references()" requests.
 To Run:
 ======
 
-% Naming_Service [-ORBport port]
-                 [-ORBobjrefstyle url]
+% Naming_Service [-ORBobjrefstyle url]
                  [-ORBnameserviceport nsport]
                  [-o ior_output_file]
                  [-p pid_file_name]
@@ -86,7 +85,7 @@ all their bindings.  When "-f" option is specified:
 Sample Run:
 ==========
 
-% Naming_Service -ORBport 20000 -ORBobjrefstyle url -ORBnameserviceport 19999
+% Naming_Service -ORBobjrefstyle url -ORBnameserviceport 19999
 starting up daemon <unknown>
 opening dynamic service Resource_Factory
 did dynamic on Resource_Factory, error = 0
diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
index 6289676a0a5..96902d641ad 100644
--- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp
@@ -78,12 +78,12 @@ ACE_RT_Task::ACE_RT_Task (RtecScheduler::Scheduler_ptr scheduler)
 {
   if (CORBA::is_nil (scheduler))
     {
-      this->scheduler_ = 
+      this->scheduler_ =
         RtecScheduler::Scheduler::_duplicate (ACE_Scheduler_Factory::server ());
     }
   else
     {
-      this->scheduler_ = 
+      this->scheduler_ =
         RtecScheduler::Scheduler::_duplicate (scheduler);
     }
 }
@@ -102,8 +102,7 @@ ACE_RT_Task::svc (void)
 
 #if 0
       static char* const argv[] = {
-        "task",
-        "-ORBport", "0",
+        "task"
       };
       int argc = sizeof (argv)/sizeof (argv[0]);
       CORBA::ORB_var orb =
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/server.cpp b/TAO/orbsvcs/tests/AVStreams/benchmark/server.cpp
index 6e58bc77123..73222c61835 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/server.cpp
@@ -28,23 +28,23 @@ ACE_RCSID(benchmark, server, "$Id$")
 
 //     if (TAO_ORB_Core_instance ()->reactor ()->register_handler
 //         (this, ACE_Event_Handler::NULL_MASK) == -1)
-//       ACE_ERROR_RETURN ((LM_ERROR, 
-//                          "%p\n", 
+//       ACE_ERROR_RETURN ((LM_ERROR,
+//                          "%p\n",
 //                          "register_handler"),
 //                         -1);
 
 //    // handles these signals.
 //     //   this->sig_set.fill_set ();
-//  //     this->sig_set.sig_add (SIGCHLD);  
-//  //     this->sig_set.sig_add (SIGBUS); 
-//  //     this->sig_set.sig_add (SIGINT); 
+//  //     this->sig_set.sig_add (SIGCHLD);
+//  //     this->sig_set.sig_add (SIGBUS);
+//  //     this->sig_set.sig_add (SIGINT);
 //  //     this->sig_set.sig_add (SIGTERM);
-   
+
 //    // Register the signal handler object to catch the signals.  if
-//  //    if (TAO_ORB_Core_instance ()->reactor ()->register_handler 
+//  //    if (TAO_ORB_Core_instance ()->reactor ()->register_handler
 //  //        (this->sig_set, this) == -1)
-//  //      ACE_ERROR_RETURN ((LM_ERROR, 
-//  //                         "%p\n", 
+//  //      ACE_ERROR_RETURN ((LM_ERROR,
+//  //                         "%p\n",
 //  //                         "register_handler"),
 //  //                      -1);
 //    return 0;
@@ -57,14 +57,14 @@ ACE_RCSID(benchmark, server, "$Id$")
 //    return this->handle_;
 //  }
 
-//  int 
+//  int
 //  AV_Server_Sig_Handler::handle_input (ACE_HANDLE)
 //  {
 //    ACE_DEBUG ((LM_DEBUG, "(%t) handling asynchonrous input...\n"));
 //    return 0;
 //  }
 
-//  int 
+//  int
 //  AV_Server_Sig_Handler::shutdown (ACE_HANDLE, ACE_Reactor_Mask)
 //  {
 //    ACE_DEBUG ((LM_DEBUG, "(%t) closing down Sig_Handler...\n"));
@@ -75,11 +75,11 @@ ACE_RCSID(benchmark, server, "$Id$")
 //  // object.  In our simple example, we are simply catching SIGALRM,
 //  // SIGINT, and SIGQUIT.  Anything else is logged and ignored.
 //  //
-//  // There are several advantages to using this approach.  First, 
+//  // There are several advantages to using this approach.  First,
 //  // the behavior triggered by the signal is handled in the main event
-//  // loop, rather than in the signal handler.  Second, the ACE_Reactor's 
-//  // signal handling mechanism eliminates the need to use global signal 
-//  // handler functions and data. 
+//  // loop, rather than in the signal handler.  Second, the ACE_Reactor's
+//  // signal handling mechanism eliminates the need to use global signal
+//  // handler functions and data.
 
 //  //  int
 //  //  AV_Server_Sig_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
@@ -121,7 +121,7 @@ Server::Server (void)
 {
 }
 
-        
+
 // Initializes the mpeg server
 int
 Server::init (int argc,
@@ -135,11 +135,11 @@ Server::init (int argc,
                                      env);
   TAO_CHECK_ENV_RETURN (env,
                         -1);
-  
-  CORBA::ORB_var orb = 
+
+  CORBA::ORB_var orb =
     this->orb_manager_.orb ();
 
-  PortableServer::POA_var child_poa = 
+  PortableServer::POA_var child_poa =
     this->orb_manager_.child_poa ();
 
 
@@ -150,10 +150,10 @@ Server::init (int argc,
 
   if (my_name_client_.init (orb.in ()) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       " (%P|%t) Unable to initialize "
-		       "the TAO_Naming_Client. \n"),
-		      -1);  
-  
+                       " (%P|%t) Unable to initialize "
+                       "the TAO_Naming_Client. \n"),
+                      -1);
+
   // Register the video mmdevice object with the ORB
   switch (this->strategy_)
     {
@@ -181,7 +181,7 @@ Server::init (int argc,
   CosNaming::Name server_mmdevice_name (1);
   server_mmdevice_name.length (1);
   server_mmdevice_name [0].id = CORBA::string_dup ("Bench_Server_MMDevice");
-  
+
   // Register the video control object with the naming server.
   this->my_name_client_->bind (server_mmdevice_name,
                                this->mmdevice_->_this (env),
@@ -232,7 +232,7 @@ Server::parse_args (int argc,char **argv)
           break;
         }
     }
-  ACE_OS::sprintf (buf,"%s -ORBport 0 -ORBobjrefstyle url",child_name);
+  ACE_OS::sprintf (buf,"%s -ORBobjrefstyle url",child_name);
   this->process_options_.command_line (buf);
   return 0;
 }
@@ -256,7 +256,7 @@ Server::run (CORBA::Environment& env)
               "event loop %p\n",
               "run_event_loop"));
   return 0;
-  
+
 }
 
 Server::~Server (void)
@@ -266,7 +266,7 @@ Server::~Server (void)
 
   if (this->mmdevice_ != 0)
     delete this->mmdevice_;
-  
+
 }
 
 
@@ -289,7 +289,7 @@ main (int argc, char **argv)
       return -1;
     }
   TAO_ENDTRY;
-  
+
   return 0;
 }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.cpp
index dfd21ba020e..fc631faf1cb 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.cpp
@@ -7,11 +7,8 @@ ACE_RCSID(mpeg_client, Command_Handler, "$Id$")
 
   static int temp_argc = 5;
 static char *temp_argv [] = {"Command_Handler",
-                              "-ORBobjrefstyle",
-                              "url",
-                         "-ORBport",
-                         "0"
-  };
+                             "-ORBobjrefstyle", "url"
+};
 
 Command_Handler::Command_Handler (ACE_HANDLE command_handle)
   :command_suspended_ (UNSUSPENDED),
@@ -46,7 +43,7 @@ Command_Handler::parse_args (int argc,char **argv)
 {
   ACE_Get_Opt get_opts (argc,argv,"h:");
   int c;
-  
+
   while ((c= get_opts ()) != -1)
     switch (c)
       {
@@ -82,7 +79,7 @@ Command_Handler::init (int argc,
 {
   this->argc_ = temp_argc;
   this->argv_ = temp_argv;
-  
+
   // Increase the debug_level so that we can see the output
   this->parse_args (argc, argv);
   TAO_debug_level++;
@@ -101,10 +98,10 @@ Command_Handler::init (int argc,
 
       // Initialize the naming services
       if (my_name_client_.init (orb_manager_.orb ()) != 0)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to initialize "
-			   "the TAO_Naming_Client. \n"),
-			  -1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize "
+                           "the TAO_Naming_Client. \n"),
+                          -1);
 
       char receiver_file[BUFSIZ];
 
@@ -118,7 +115,7 @@ Command_Handler::init (int argc,
           ACE_OS::fprintf (fp,"%s",ior.in ());
           ACE_OS::fclose (fp);
         }
-      
+
       // initialize the client signal handler.
       if (this->client_sig_handler_.register_handler () < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -296,18 +293,18 @@ Command_Handler::handle_input (ACE_HANDLE fd)
     {
       // Weird hack coming up:
       if (fd == cmdSocket)
-	{
-	  val = OurCmdRead ((char*)&cmd, 1);
-	  this->busy_ = 1;
-	  this->client_sig_handler_.TimerProcessing ();
-	}
+        {
+          val = OurCmdRead ((char*)&cmd, 1);
+          this->busy_ = 1;
+          this->client_sig_handler_.TimerProcessing ();
+        }
       //  ACE_DEBUG ((LM_DEBUG, "val: %d, cmd: %d\n", val, cmd));
       // if we get an interrupt while reading we go back to the event loop
       if (val == 1)
-	{
-	  this->busy_ = 0;
+        {
+          this->busy_ = 0;
           return 0;
-	}
+        }
 
       //      fprintf(stderr, "CTR: cmd received - %d\n", cmd);
       TAO_TRY
@@ -741,8 +738,8 @@ Command_Handler::init_audio_channel (char *audiofile)
 
     /*
     fprintf(stderr, "AF Audio para: encode %d, ch %d, sps %d, bps %d.\n",
-	    para.para.encodeType, para.para.channels,
-	    para.para.samplesPerSecond, para.para.bytesPerSample);
+            para.para.encodeType, para.para.channels,
+            para.para.samplesPerSecond, para.para.bytesPerSample);
      */
     {
       int flag = 1;
@@ -756,8 +753,8 @@ Command_Handler::init_audio_channel (char *audiofile)
       shared->totalSamples = reply->totalSamples;
 
       fprintf(stderr, "Audio: samples %d, sps %d, bps %d\n",
-	      shared->totalSamples, shared->AFPara.samplesPerSecond,
-	      shared->AFPara.bytesPerSample);
+              shared->totalSamples, shared->AFPara.samplesPerSecond,
+              shared->AFPara.bytesPerSample);
 
       SetAudioParameter(&shared->audioPara);
     }
@@ -830,8 +827,8 @@ Command_Handler::set_mmdevice (CORBA::Object_ptr audio_mmdevice,
   TAO_TRY
     {
       audio_mmdevice_ior =
-	this->orb_manager_.orb ()->object_to_string (audio_mmdevice,
-						     TAO_TRY_ENV);
+        this->orb_manager_.orb ()->object_to_string (audio_mmdevice,
+                                                     TAO_TRY_ENV);
       TAO_CHECK_ENV;
       ACE_DEBUG ((LM_DEBUG,"audio_mmdevice ior is %s\n",audio_mmdevice_ior));
       video_mmdevice_ior =
@@ -1023,7 +1020,7 @@ Command_Handler::init_video_channel (char *videofile)
              ACE_OS::perror ("CTR error on open CTR-VB socketpair");
               ACE_OS::exit (1);
             }
-    
+
       if (VBpid == -1)
         {
           switch (VBpid = ACE_OS::fork ())
@@ -1248,7 +1245,7 @@ Command_Handler::fast_forward (void)
           shared->patternSize;
 
         shared->VStimeAdvance =
-	  max(shared->config.VStimeAdvance, DEFAULT_VStimeAdvance) * 1000;
+          max(shared->config.VStimeAdvance, DEFAULT_VStimeAdvance) * 1000;
         if (shared->VStimeAdvance < shared->usecPerFrame)
           shared->VStimeAdvance = shared->usecPerFrame;
 
@@ -1304,14 +1301,14 @@ Command_Handler::fast_backward (void)
       NewCmd(CmdFB);
       shared->needHeader = 0;
       shared->framesPerSecond = shared->config.fbFPS /
-			     shared->patternSize;
+                             shared->patternSize;
       shared->usecPerFrame = (int)(1000000.0 / (float)shared->config.fbFPS) *
-			     shared->patternSize;
+                             shared->patternSize;
 
       shared->VStimeAdvance =
-	  max(shared->config.VStimeAdvance, DEFAULT_VStimeAdvance) * 1000;
+          max(shared->config.VStimeAdvance, DEFAULT_VStimeAdvance) * 1000;
       if (shared->VStimeAdvance < shared->usecPerFrame)
-	shared->VStimeAdvance = shared->usecPerFrame;
+        shared->VStimeAdvance = shared->usecPerFrame;
 
       para->VStimeAdvance = shared->VStimeAdvance;
       para->sn = shared->cmdsn;
@@ -1564,10 +1561,10 @@ Command_Handler::play (int auto_exp,
         fbstate = 1;
         fb_startup = 1;
 
-    
+
           fprintf (stderr, "CTR init frate: %f minupf %d, shared->upf %d\n",
           frate, minupf, shared->usecPerFrame);
-    
+
       }
     }
 
@@ -1792,7 +1789,7 @@ Command_Handler::stop (void)
 
   if (shared->live && videoSocket >= 0) {
     Fprintf(stderr, "CTR live video stat: average disp frame rate: %5.2f fps\n",
-	    shared->pictureRate * displayedFrames / shared->nextFrame);
+            shared->pictureRate * displayedFrames / shared->nextFrame);
   }
   unsigned char tmp = CmdDONE;
   //  ACE_DEBUG ((LM_DEBUG,"(%P|%t) command_handler::Stop :nextFrame=%d\n",shared->nextFrame));
@@ -1899,7 +1896,7 @@ Command_Handler::connect_to_video_server (void)
   ACE_NEW_RETURN (this->video_client_mmdevice_,
                   TAO_MMDevice (this->video_reactive_strategy_),
                   -1);
-  
+
   this->orb_manager_.activate_under_child_poa ("Video_Client_MMDevice",
                                                this->video_client_mmdevice_,
                                                TAO_TRY_ENV);
@@ -2000,7 +1997,7 @@ Decode_Notification_Handler::get_handle (void) const
 }
 
 int
-Decode_Notification_Handler::handle_input (ACE_HANDLE fd) 
+Decode_Notification_Handler::handle_input (ACE_HANDLE fd)
 {
   ACE_DEBUG ((LM_DEBUG,"Decode_Notification_Handler::handle_input \n"));
   char message[BUFSIZ];
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/augmented_server.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/augmented_server.cpp
index f89e174b869..dc0e01a5d91 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/augmented_server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/augmented_server.cpp
@@ -366,8 +366,8 @@ AV_Server::AV_Server (void)
     video_process_strategy_ (&video_process_options_),
     audio_process_strategy_ (&audio_process_options_)
 {
-  this->video_process_options_.command_line ("./vs -ORBport 0 -ORBobjrefstyle url");
-  this->audio_process_options_.command_line ("./as -ORBport 0 -ORBobjrefstyle url");
+  this->video_process_options_.command_line ("./vs -ORBobjrefstyle url");
+  this->audio_process_options_.command_line ("./as -ORBobjrefstyle url");
 }
 
 // %% move to the destructor or sig handler
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/server.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/server.cpp
index dd2f7cf2f21..32424b94aea 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/server.cpp
@@ -15,13 +15,13 @@ Audio_MMDevice::Audio_MMDevice (TAO_AV_Endpoint_Process_Strategy *endpoint_strat
 {
 }
 
-AVStreams::StreamEndPoint_B_ptr  
-Audio_MMDevice::create_B (AVStreams::StreamCtrl_ptr the_requester, 
-                        AVStreams::VDev_out the_vdev, 
-                        AVStreams::streamQoS &the_qos, 
-                        CORBA::Boolean_out met_qos, 
-                        char *&named_vdev, 
-                        const AVStreams::flowSpec &the_spec,  
+AVStreams::StreamEndPoint_B_ptr
+Audio_MMDevice::create_B (AVStreams::StreamCtrl_ptr the_requester,
+                        AVStreams::VDev_out the_vdev,
+                        AVStreams::streamQoS &the_qos,
+                        CORBA::Boolean_out met_qos,
+                        char *&named_vdev,
+                        const AVStreams::flowSpec &the_spec,
                         CORBA::Environment &env)
 {
   ACE_DEBUG ((LM_DEBUG,"(%P|%t) Audio_MMDevice::create_B called \n"));
@@ -67,23 +67,23 @@ AV_Server_Sig_Handler::register_handler (void)
 
    if (TAO_ORB_Core_instance ()->reactor ()->register_handler
        (this, ACE_Event_Handler::NULL_MASK) == -1)
-     ACE_ERROR_RETURN ((LM_ERROR, 
-                        "%p\n", 
+     ACE_ERROR_RETURN ((LM_ERROR,
+                        "%p\n",
                         "register_handler"),
                        -1);
 
   // handles these signals.
    //   this->sig_set.fill_set ();
-   this->sig_set.sig_add (SIGCHLD);  
-   this->sig_set.sig_add (SIGBUS); 
-   this->sig_set.sig_add (SIGINT); 
+   this->sig_set.sig_add (SIGCHLD);
+   this->sig_set.sig_add (SIGBUS);
+   this->sig_set.sig_add (SIGINT);
    this->sig_set.sig_add (SIGTERM);
 
   // Register the signal handler object to catch the signals.  if
-  if (TAO_ORB_Core_instance ()->reactor ()->register_handler 
+  if (TAO_ORB_Core_instance ()->reactor ()->register_handler
       (this->sig_set, this) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
-                       "%p\n", 
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p\n",
                        "register_handler"),
                       -1);
   return 0;
@@ -96,14 +96,14 @@ AV_Server_Sig_Handler::get_handle (void) const
   return this->handle_;
 }
 
-int 
+int
 AV_Server_Sig_Handler::handle_input (ACE_HANDLE)
 {
   ACE_DEBUG ((LM_DEBUG, "(%t) handling asynchonrous input...\n"));
   return 0;
 }
 
-int 
+int
 AV_Server_Sig_Handler::shutdown (ACE_HANDLE, ACE_Reactor_Mask)
 {
   ACE_DEBUG ((LM_DEBUG, "(%t) closing down Sig_Handler...\n"));
@@ -111,7 +111,7 @@ AV_Server_Sig_Handler::shutdown (ACE_HANDLE, ACE_Reactor_Mask)
 }
 
 // This method handles all the signals that are being caught by this
-// object.  
+// object.
 
 int
 AV_Server_Sig_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
@@ -145,11 +145,11 @@ AV_Server_Sig_Handler::clear_child (int sig)
 {
   int pid;
   int status;
-  
+
   //  ACE_DEBUG ((LM_DEBUG,"(%P|%t) AV_Server: Reaping the children\n"));
   // reap the children
-  while ((pid = ACE_OS::waitpid (-1, 
-                                 &status, 
+  while ((pid = ACE_OS::waitpid (-1,
+                                 &status,
                                  WNOHANG)) > 0)
   {
     if (pid == AV_Server::current_pid_)
@@ -161,10 +161,10 @@ AV_Server_Sig_Handler::clear_child (int sig)
 
     // decrement the count of number of active children
     Mpeg_Global::session_num --;
-    
-    if (status == 0) 
+
+    if (status == 0)
       continue;
-    
+
     //    ACE_DEBUG ((LM_DEBUG, "(%P|%t) AV_Server: child %d (status %d)\n", pid, status));
   }
   return;
@@ -192,7 +192,7 @@ AV_Server_Sig_Handler::remove_names (void)
   CosNaming::Name video_server_mmdevice_name (1);
   video_server_mmdevice_name.length (1);
   video_server_mmdevice_name [0].id = CORBA::string_dup ("Video_Server_MMDevice");
-  
+
   // Register the video control object with the naming server.
   naming_context->unbind (video_server_mmdevice_name,
                           TAO_TRY_ENV);
@@ -201,7 +201,7 @@ AV_Server_Sig_Handler::remove_names (void)
   CosNaming::Name audio_server_mmdevice_name (1);
   audio_server_mmdevice_name.length (1);
   audio_server_mmdevice_name [0].id = CORBA::string_dup ("Audio_Server_MMDevice");
-  
+
   // Register the audio control object with the naming server.
   naming_context->unbind (audio_server_mmdevice_name,
                           TAO_TRY_ENV);
@@ -224,7 +224,7 @@ AV_Server_Sig_Handler::int_handler (int sig)
 
   this->remove_names ();
   TAO_ORB_Core_instance ()->orb ()->shutdown ();
-  ACE_DEBUG ((LM_DEBUG, 
+  ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) AV server killed by signal %d\n",
               sig));
 }
@@ -241,8 +241,8 @@ AV_Server::AV_Server (void)
   :video_process_strategy_ (&video_process_options_),
    audio_process_strategy_ (&audio_process_options_)
 {
-  this->video_process_options_.command_line ("./vs -ORBport 0 -ORBobjrefstyle url");
-  this->audio_process_options_.command_line ("./as -ORBport 0 -ORBobjrefstyle url");
+  this->video_process_options_.command_line ("./vs -ORBobjrefstyle url");
+  this->audio_process_options_.command_line ("./as -ORBobjrefstyle url");
 }
 
 // %% move to the destructor or sig handler
@@ -250,13 +250,13 @@ void
 AV_Server::on_exit_routine (void)
 {
   // %% what does the following do
-  if (Mpeg_Global::parentpid != ACE_OS::getpid ()) 
+  if (Mpeg_Global::parentpid != ACE_OS::getpid ())
     {
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Process is exiting\n"));
       return;
     }
-  
+
   // %% what does the following do
   if (Mpeg_Global::live_audio > 1)
     ExitLiveAudio ();
@@ -307,7 +307,7 @@ AV_Server::parse_args (int argc,
   return 0;
 }
 
-        
+
 // Initializes the mpeg server
 int
 AV_Server::init (int argc,
@@ -323,11 +323,11 @@ AV_Server::init (int argc,
                                      env);
   TAO_CHECK_ENV_RETURN (env,
                         -1);
-  
-  CORBA::ORB_var orb = 
+
+  CORBA::ORB_var orb =
     this->orb_manager_.orb ();
 
-  PortableServer::POA_var child_poa = 
+  PortableServer::POA_var child_poa =
     this->orb_manager_.child_poa ();
 
   result = this->parse_args (argc, argv);
@@ -339,9 +339,9 @@ AV_Server::init (int argc,
   // Initialize the naming services
   if (my_name_client_.init (this->orb_manager_.orb ()) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-		       " (%P|%t) Unable to initialize "
-		       "the TAO_Naming_Client. \n"),
-		      -1);
+                       " (%P|%t) Unable to initialize "
+                       "the TAO_Naming_Client. \n"),
+                      -1);
 
   // Register the video mmdevice object with the ORB
   ACE_NEW_RETURN (this->video_mmdevice_,
@@ -360,7 +360,7 @@ AV_Server::init (int argc,
   CosNaming::Name video_server_mmdevice_name (1);
   video_server_mmdevice_name.length (1);
   video_server_mmdevice_name [0].id = CORBA::string_dup ("Video_Server_MMDevice");
-  
+
   // Register the video control object with the naming server.
   this->my_name_client_->bind (video_server_mmdevice_name,
                                this->video_mmdevice_->_this (env),
@@ -374,7 +374,7 @@ AV_Server::init (int argc,
                               env);
       TAO_CHECK_ENV_RETURN (env,-1);
     }
-  
+
 
   // Register the audio mmdevice object with the ORB
   ACE_NEW_RETURN (this->audio_mmdevice_,
@@ -393,7 +393,7 @@ AV_Server::init (int argc,
   CosNaming::Name audio_server_mmdevice_name (1);
   audio_server_mmdevice_name.length (1);
   audio_server_mmdevice_name [0].id = CORBA::string_dup ("Audio_Server_MMDevice");
-  
+
   // Register the audio control object with the naming server.
   this->my_name_client_->bind (audio_server_mmdevice_name,
                         this->audio_mmdevice_->_this (env),
@@ -407,7 +407,7 @@ AV_Server::init (int argc,
                               env);
       TAO_CHECK_ENV_RETURN (env,-1);
     }
-  
+
 
 
   // Register the various signal handlers with the reactor.
@@ -442,7 +442,7 @@ AV_Server::run (CORBA::Environment& env){
               "event loop %p\n",
               "run_event_loop"));
   return 0;
-  
+
 }
 
 AV_Server::~AV_Server (void)
@@ -470,9 +470,6 @@ main (int argc, char **argv)
       return -1;
     }
   TAO_ENDTRY;
-  
+
   return 0;
 }
-
-
-
diff --git a/TAO/orbsvcs/tests/EC_Multiple/README b/TAO/orbsvcs/tests/EC_Multiple/README
index 1d18fa5275c..14119bdfd87 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/README
+++ b/TAO/orbsvcs/tests/EC_Multiple/README
@@ -10,7 +10,7 @@ precomputed schedule, etc.
         A simple test is that uses a pre-computed schedule would be:
 
 # Run the Naming Service
-$ ../../Naming_Service/Naming_Service -ORBport 0 
+$ ../../Naming_Service/Naming_Service
   -p NameService.pid -o NameService.ior
 # If the multicast location does not work for your use:
 #
@@ -22,12 +22,12 @@ $ ../../Naming_Service/Naming_Service -ORBport 0
 
 # Run the first EC, supplier generates events <1> and <2> consumer
 # subscribes to events <1> and <3>
-$ ./EC_Multiple -ORBport 0 -l ECM1 -r ECM2 -s runtime -p ECM1.pid \
+$ ./EC_Multiple -l ECM1 -r ECM2 -s runtime -p ECM1.pid \
   -h 1,1,1,250000,100,1,2,1,3
 
 # Run the second EC, supplier generates events <4> and <3> consumer
 # subscribes to events <4> and <2>
-$ ./EC_Multiple -ORBport 0 -l ECM2 -r ECM1 -s runtime -p ECM2.pid \
+$ ./EC_Multiple -l ECM2 -r ECM1 -s runtime -p ECM2.pid \
   -h 1,1,1,250000,100,4,3,4,2
 
 # Notice how the consumer receives both local and remote events, but
diff --git a/TAO/orbsvcs/tests/EC_Multiple/run_dynamic b/TAO/orbsvcs/tests/EC_Multiple/run_dynamic
index 7d2a0c94a99..9a1e98fc31c 100755
--- a/TAO/orbsvcs/tests/EC_Multiple/run_dynamic
+++ b/TAO/orbsvcs/tests/EC_Multiple/run_dynamic
@@ -3,11 +3,6 @@
 # $Id$
 #
 
-if [ -z "$NameServicePort" ]; then
-  NameServicePort=0
-  export NameServicePort
-fi
-
 # The number of messages to send.
 MSG_COUNT=100
 
@@ -37,7 +32,7 @@ trap 'done=1; \
 
 for s in $HP_SUPPLIERS; do
   for c in $LP_CONSUMERS; do
-    ../../Naming_Service/Naming_Service -ORBport $NameServicePort \
+    ../../Naming_Service/Naming_Service \
         -ORBobjrefstyle url -o NameService.ior >/dev/null 2>&1 &
     NameServicePID=$!
     sleep 2
@@ -48,11 +43,11 @@ for s in $HP_SUPPLIERS; do
     export NameService
 
     echo Consumers = $c Suppliers = $s
-#    ./EC_Multiple -ORBport 0 -l ECM3 -s local -d sched \
+#    ./EC_Multiple -l ECM3 -s local -d sched \
 #      -h ${s},${s},0,${HP_INTERVAL},${MSG_COUNT},1,2,1,2 \
 #      -w 1,${c},0,${LP_INTERVAL},${MSG_COUNT},3,4,3,4 > \
 #        DYN.LCL.S${s}.C${c}.log 2>&1
-    ./EC_Multiple -ORBport 0 -l ECM3 -s runtime \
+    ./EC_Multiple -l ECM3 -s runtime \
       -h ${s},${s},0,${HP_INTERVAL},${MSG_COUNT},1,2,1,2 \
       -w 1,${c},0,${LP_INTERVAL},${MSG_COUNT},3,4,3,4 > \
         DYN.LCL.S${s}.C${c}.log 2>&1
diff --git a/TAO/orbsvcs/tests/EC_Multiple/run_latency b/TAO/orbsvcs/tests/EC_Multiple/run_latency
index 70fe09d3446..b387707ac5b 100755
--- a/TAO/orbsvcs/tests/EC_Multiple/run_latency
+++ b/TAO/orbsvcs/tests/EC_Multiple/run_latency
@@ -3,11 +3,6 @@
 # $Id$
 #
 
-if [ -z "$NameServicePort" ]; then
-  NameServicePort=0
-  export NameServicePort
-fi
-
 # The number of messages to send.
 MSG_COUNT=100
 
@@ -23,28 +18,28 @@ HP_INTERVAL=250000
 
 for s in $HP_SUPPLIERS; do
   for c in $HP_CONSUMERS; do
-    ../../Naming_Service/Naming_Service -ORBport $NameServicePort \
+    ../../Naming_Service/Naming_Service \
         -o NameService.ior -p NameService.pid >/dev/null 2>&1 &
     sleep 2
     NameService=`cat NameService.ior`
     export NameService
 
     echo Consumers = $c Suppliers = $s
-    ./EC_Multiple -ORBport 0 -l ECM1 -p ECM1.pid -s runtime \
+    ./EC_Multiple -l ECM1 -p ECM1.pid -s runtime \
       -h ${s},${c},0,${HP_INTERVAL},${MSG_COUNT},1,2,1,2 > \
         LTC.LCL.S${s}.C${c}.log 2>&1
     kill `cat NameService.pid`
 
-   ../../Naming_Service/Naming_Service -ORBport $NameServicePort \
+   ../../Naming_Service/Naming_Service \
         -o NameService.ior -p NameService.pid >/dev/null 2>&1 &
     sleep 2
     NameService=`cat NameService.ior`
     export NameService
 
-    ./EC_Multiple -ORBport 0 -l ECM1 -r ECM2 -p ECM1.pid -s runtime \
+    ./EC_Multiple -l ECM1 -r ECM2 -p ECM1.pid -s runtime \
       -h ${s},${c},0,${HP_INTERVAL},${MSG_COUNT},1,2,1,3 > \
       LTC.ECM1.S${s}.C${c}.log 2>&1 &
-    ./EC_Multiple -ORBport 0 -l ECM2 -r ECM1 -p ECM2.pid -s runtime \
+    ./EC_Multiple -l ECM2 -r ECM1 -p ECM2.pid -s runtime \
       -h ${s},${c},0,${HP_INTERVAL},${MSG_COUNT},4,3,4,2 > \
       LTC.ECM2.S${s}.C${c}.log 2>&1 &
     sleep 2
diff --git a/TAO/orbsvcs/tests/EC_Multiple/run_overhead b/TAO/orbsvcs/tests/EC_Multiple/run_overhead
index fb77d3d7b93..bcafe566537 100755
--- a/TAO/orbsvcs/tests/EC_Multiple/run_overhead
+++ b/TAO/orbsvcs/tests/EC_Multiple/run_overhead
@@ -3,11 +3,6 @@
 # $Id$
 #
 
-if [ -z "$NameServicePort" ]; then
-  NameServicePort=0
-  export NameServicePort
-fi
-
 MSG_INTERVAL=5000 # 50000
 # The interval between the messages, in usecs
 
@@ -32,31 +27,31 @@ RPT_MSGS=1000
 for i in $RPT_ITER; do
   echo Short circuit RPT test $i
   sleep 1
-  ./EC_Multiple -ORBport 0 -l EC1 -s RUNTIME1 \
+  ./EC_Multiple -l EC1 -s RUNTIME1 \
     -a 1 -b 2 -c 2 -p EC1.pid -m $RPT_MSGS -u $UTL_COUNT \
     -i $MSG_INTERVAL -x > OVH.RPT.X.${i}.log 2>&1
 
   echo Local RPT EC test $i
-  ../../Naming_Service/Naming_Service -ORBport $NameServicePort \
+  ../../Naming_Service/Naming_Service \
     -o NameService.ior -p NameService.pid >/dev/null 2>&1 &
   sleep 2
   NameService=`cat NameService.ior`
   export NameService
-  ./EC_Multiple -ORBport 0 -l EC1 -s RUNTIME1 \
+  ./EC_Multiple -l EC1 -s RUNTIME1 \
     -a 1 -b 2 -c 2 -p EC1.pid -m $RPT_MSGS -u $UTL_COUNT \
     -i $MSG_INTERVAL > OVH.RPT.LCL.${i}.log 2>&1
   kill `cat NameService.pid`
 
   echo Remote RPT EC test $i
-  ../../Naming_Service/Naming_Service -ORBport $NameServicePort \
+  ../../Naming_Service/Naming_Service \
     -o NameService.ior -p NameService.pid >/dev/null 2>&1 &
   sleep 2
   NameService=`cat NameService.ior`
   export NameService
-  ./EC_Multiple -ORBport 0 -l EC1 -r EC2 -s RUNTIME1 -o RUNTIME2 \
+  ./EC_Multiple -l EC1 -r EC2 -s RUNTIME1 -o RUNTIME2 \
     -a 1 -b 2 -c 3 -p EC1.pid -m $RPT_MSGS -u $UTL_COUNT \
     -i $MSG_INTERVAL > OVH.RPT.RMT1.${i}.log 2>&1 &
-  ./EC_Multiple -ORBport 0 -l EC2 -r EC1 -s RUNTIME2 -o RUNTIME1 \
+  ./EC_Multiple -l EC2 -r EC1 -s RUNTIME2 -o RUNTIME1 \
     -a 4 -b 3 -c 2 -p EC2.pid -m $RPT_MSGS -u $UTL_COUNT \
     -i $MSG_INTERVAL > OVH.RPT.RMT2.${i}.log 2>&1 &
   sleep 2
@@ -76,7 +71,7 @@ exit 0
 for i in $MSG_COUNTS; do
   echo Short circuit test $i
   sleep 1
-  ./EC_Multiple -ORBport 0 -l EC1 -s RUNTIME1 \
+  ./EC_Multiple -l EC1 -s RUNTIME1 \
     -a 1 -b 2 -c 2 -m $i -u $UTL_COUNT \
     -i $MSG_INTERVAL -x > OVH.X.${i}.log 2>&1
 done
@@ -84,7 +79,7 @@ done
 # Generate the local data, i.e. what is the overhead of using the local EC.
 for i in $MSG_COUNTS; do
   echo Local EC test $i
-  ../../Naming_Service/Naming_Service -ORBport $NameServicePort \
+  ../../Naming_Service/Naming_Service \
     -o NameService.ior -p NameService.pid >/dev/null 2>&1 &
   sleep 2
   NameService=`cat NameService.ior`
@@ -99,15 +94,15 @@ done
 # can be as high as 2 msec
 for i in $MSG_COUNTS; do
   echo Remote EC test $i
-  ../../Naming_Service/Naming_Service -ORBport $NameServicePort \
+  ../../Naming_Service/Naming_Service \
     -o NameService.ior -p NameService.pid >/dev/null 2>&1 &
   sleep 2
   NameService=`cat NameService.ior`
   export NameService
-  ./EC_Multiple -ORBport 0 -l EC1 -r EC2 -s RUNTIME1 -o RUNTIME2 \
+  ./EC_Multiple -l EC1 -r EC2 -s RUNTIME1 -o RUNTIME2 \
     -a 1 -b 2 -c 3 -p EC1.pid -m $i -u $UTL_COUNT \
     -i $MSG_INTERVAL > OVH.RMT1.${i}.log 2>&1 &
-  ./EC_Multiple -ORBport 0 -l EC2 -r EC1 -s RUNTIME2 -o RUNTIME1 \
+  ./EC_Multiple -l EC2 -r EC1 -s RUNTIME2 -o RUNTIME1 \
     -a 4 -b 3 -c 2 -p EC2.pid -m $i -u $UTL_COUNT \
     -i $MSG_INTERVAL > OVH.RMT2.${i}.log 2>&1 &
   sleep 2
diff --git a/TAO/orbsvcs/tests/EC_Multiple/run_schedule b/TAO/orbsvcs/tests/EC_Multiple/run_schedule
index 310f36b567a..7512b8914d1 100755
--- a/TAO/orbsvcs/tests/EC_Multiple/run_schedule
+++ b/TAO/orbsvcs/tests/EC_Multiple/run_schedule
@@ -3,11 +3,6 @@
 # $Id$
 #
 
-if [ -z "$NameServicePort" ]; then
-  NameServicePort=0
-  export NameServicePort
-fi
-
 # The number of high-priority messages to send.
 HP_MSG_COUNT=400
 
@@ -28,17 +23,17 @@ LP_SUPPLIERS=5
 
 /bin/rm -f NameService.ior NameService.pid EC1.pid EC2.pid EC.pid
 
-../../Naming_Service/Naming_Service -ORBport $NameServicePort \
+../../Naming_Service/Naming_Service \
       -o NameService.ior -p NameService.pid >/dev/null 2>&1 &
 sleep 2
 NameService=`cat NameService.ior`
 export NameService
 
-./EC_Multiple -ORBport 0 -l ECM1 -r ECM2 -p ECM1.pid \
+./EC_Multiple -l ECM1 -r ECM2 -p ECM1.pid \
     -h ${HP_SUPPLIERS},${HP_CONSUMERS},1,${HP_MSG_COUNT},1,2,1,3 \
     -w ${LP_SUPPLIERS},${LP_CONSUMERS},1,${LP_MSG_COUNT},4,5,4,5 \
     -d SCHED_ECM1.cpp > SCH1.log 2>&1 &
-./EC_Multiple -ORBport 0 -l ECM2 -r ECM1 -p ECM2.pid \
+./EC_Multiple -l ECM2 -r ECM1 -p ECM2.pid \
     -h ${HP_SUPPLIERS},${HP_CONSUMERS},1,${HP_MSG_COUNT},6,3,6,2 \
     -w ${LP_SUPPLIERS},${LP_CONSUMERS},1,${LP_MSG_COUNT},7,8,7,8 \
     -d SCHED_ECM2.cpp > SCH2.log 2>&1 &
diff --git a/TAO/orbsvcs/tests/EC_Multiple/run_throughput b/TAO/orbsvcs/tests/EC_Multiple/run_throughput
index 256d6796c00..4c922b89658 100755
--- a/TAO/orbsvcs/tests/EC_Multiple/run_throughput
+++ b/TAO/orbsvcs/tests/EC_Multiple/run_throughput
@@ -3,11 +3,6 @@
 # $Id$
 #
 
-if [ -z "$NameServicePort" ]; then
-  NameServicePort=0
-  export NameServicePort
-fi
-
 MSG_COUNT=500
 # The number of messages to send.
 
@@ -25,13 +20,13 @@ for s in $HP_SUPPLIERS; do
   for c in $HP_CONSUMERS; do
     for i in $HP_INTERVALS; do
       echo echo Supplier = $s Consumer = $c Interval = $i
-      ../../Naming_Service/Naming_Service -ORBport $NameServicePort \
+      ../../Naming_Service/Naming_Service \
         -o NameService.ior -p NameService.pid >/dev/null 2>&1 &
       sleep 2
       NameService=`cat NameService.ior`
       export NameService
 
-      ./EC_Multiple -ORBport 0 -l ECM1 -p ECM1.pid -s runtime \
+      ./EC_Multiple -l ECM1 -p ECM1.pid -s runtime \
         -h ${s},${c},0,${i},${MSG_COUNT},1,2,1,2 > \
         THR.LCL.S${s}.C${c}.I${i}.log 2>&1
       kill `cat NameService.pid`
diff --git a/TAO/orbsvcs/tests/EC_Multiple/run_utilization b/TAO/orbsvcs/tests/EC_Multiple/run_utilization
index d92d9e5431e..4a40e6c7e06 100755
--- a/TAO/orbsvcs/tests/EC_Multiple/run_utilization
+++ b/TAO/orbsvcs/tests/EC_Multiple/run_utilization
@@ -2,11 +2,6 @@
 #
 # $Id$
 
-if [ -z "$NameServicePort" ]; then
-  NameServicePort=0
-  export NameServicePort
-fi
-
 HP_WORKLOADS="0 60 65 70 72 74 76 78 80 81 82 83 84 85 86 87 88 89 90"
 HP_MSGS=200
 HP_CONSUMERS=1
@@ -23,29 +18,29 @@ LP_INTERVAL=100000
 
 for w in $HP_WORKLOADS; do
   echo Local EC test $w
-  ../../Naming_Service/Naming_Service -ORBport $NameServicePort \
+  ../../Naming_Service/Naming_Service \
     -o NameService.ior -p NameService.pid >/dev/null 2>&1 &
   sleep 2
   NameService=`cat NameService.ior`
   export NameService
-  ./EC_Multiple -ORBport 0 -l ECM1 -s runtime -p ECM1.pid \
+  ./EC_Multiple -l ECM1 -s runtime -p ECM1.pid \
     -w 1,${LP_CONSUMERS},${LP_WORKLOAD},${LP_INTERVAL},${LP_MSGS},3,4,3,4 \
     -h 1,${HP_CONSUMERS},${w},${HP_INTERVAL},${HP_MSGS},1,2,1,2 > \
       UTL.LCL.${w}.log 2>&1
 
   kill `cat NameService.pid`
 
-   ../../Naming_Service/Naming_Service -ORBport $NameServicePort \
+   ../../Naming_Service/Naming_Service \
         -o NameService.ior -p NameService.pid >/dev/null 2>&1 &
    sleep 2
    NameService=`cat NameService.ior`
    export NameService
 
-  ./EC_Multiple -ORBport 0 -l ECM1 -r ECM2 -s runtime -p ECM1.pid \
+  ./EC_Multiple -l ECM1 -r ECM2 -s runtime -p ECM1.pid \
     -w 1,${LP_CONSUMERS},${LP_WORKLOAD},${LP_INTERVAL},${LP_MSGS},1,2,1,3 \
     -h 1,${HP_CONSUMERS},${w},${HP_INTERVAL},${HP_MSGS},4,5,4,6 > \
       UTL.ECM1.${w}.log 2>&1 &
-  ./EC_Multiple -ORBport 0 -l ECM2 -r ECM1 -s runtime -p ECM2.pid \
+  ./EC_Multiple -l ECM2 -r ECM1 -s runtime -p ECM2.pid \
     -w 1,${LP_CONSUMERS},${LP_WORKLOAD},${LP_INTERVAL},${LP_MSGS},7,3,7,2 \
     -h 1,${HP_CONSUMERS},${w},${HP_INTERVAL},${HP_MSGS},8,6,8,5 > \
       UTL.ECM2.${w}.log 2>&1 &
diff --git a/TAO/orbsvcs/tests/start_services b/TAO/orbsvcs/tests/start_services
index d5573d16ebf..397fc2b015b 100755
--- a/TAO/orbsvcs/tests/start_services
+++ b/TAO/orbsvcs/tests/start_services
@@ -64,15 +64,11 @@ echo // Initializing the log file
 
 echo // Logfile for the script which startes Name and Event Service  > /tmp/logfile_$login
 
-nameserviceport=0
-schedulerserviceport=0
-eventserviceport=0
-
 cd $TAO_ROOT/orbsvcs/Naming_Service
-echo $ ./Naming_Service -ORBport $nameserviceport \
+echo $ ./Naming_Service \
        -o /tmp/nameserviceior_$login \
        -p /tmp/nameservicepid_$login >> /tmp/logfile_$login
-./Naming_Service -ORBport $nameserviceport \
+./Naming_Service \
        -o /tmp/nameserviceior_$login \
        -p /tmp/nameservicepid_$login > /tmp/logfile_Naming_Service_$login 2>&1  &
 
@@ -85,16 +81,16 @@ echo // The IOR of the Naming Service: $IOR
 echo // Started Naming Service on port $nameserviceport
 
 # cd $TAO_ROOT/orbsvcs/Scheduling_Service
-#echo $ ./Scheduling_Service -ORBnameserviceior $IOR -ORBport $schedulerserviceport  >> /tmp/logfile_$login
-#./Scheduling_Service -ORBnameserviceior $IOR -ORBport $schedulerserviceport  > /tmp/logfile_Scheduling_Service_$login  2>&1 &
+#echo $ ./Scheduling_Service -ORBnameserviceior $IOR  >> /tmp/logfile_$login
+#./Scheduling_Service -ORBnameserviceior $IOR > /tmp/logfile_Scheduling_Service_$login  2>&1 &
 
 # sleep 5
 
 # echo // Started Scheduling Service on port $schedulerserviceport
 
 cd $TAO_ROOT/orbsvcs/Event_Service
-echo $ ./Event_Service -ORBnameserviceior $IOR -ORBport $eventserviceport >> /tmp/logfile_$login
-./Event_Service -ORBnameserviceior $IOR -ORBport $eventserviceport > /tmp/logfile_Event_Service_$login 2>&1 &
+echo $ ./Event_Service -ORBnameserviceior $IOR >> /tmp/logfile_$login
+./Event_Service -ORBnameserviceior $IOR > /tmp/logfile_Event_Service_$login 2>&1 &
 
 echo // Started Event Service on port $eventserviceport
 
diff --git a/TAO/performance-tests/Cubit/COOL/IDL_Cubit/README b/TAO/performance-tests/Cubit/COOL/IDL_Cubit/README
index 5987e0d6df2..06489e42f62 100644
--- a/TAO/performance-tests/Cubit/COOL/IDL_Cubit/README
+++ b/TAO/performance-tests/Cubit/COOL/IDL_Cubit/README
@@ -9,8 +9,7 @@ the client or open a separate window for the client and server.
 server:
 -------
 
-% server [-d] [-ORBhost <serverhost>] [-ORBport <portnum>]
-              [-n <number-of-cubit-objects>]
+% server [-d] [-n <number-of-cubit-objects>]
 
 The server cubit factory maintained num_of_cubit objects (default =
 1). They are assigned keys that look like "key0", "key1", ...
diff --git a/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/server/svr.cpp b/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/server/svr.cpp
index fbce11d56ab..25cc92e2797 100644
--- a/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/server/svr.cpp
+++ b/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/server/svr.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-// @(#)svr.cpp	05/14/97
+// @(#)svr.cpp  05/14/97
 // Copyright 1994-1995 by Sun Microsystems Inc.
 // All Rights Reserved
 //
-// TEST:	simple IIOP server for "cubit.idl" interface.
+// TEST:        simple IIOP server for "cubit.idl" interface.
 //
 // Starts up, builds an objref, prints its string in debug mode,
 // listens for messages, responds to them.
@@ -74,18 +74,18 @@ Cubit_Task::svc (void)
 
   try {
     // Initialize the ORB pointer
-    orb_ptr = XpsORB::init (argc, argv); 
-    
+    orb_ptr = XpsORB::init (argc, argv);
+
     // Initialize the Object Adapter
     oa_ptr = XpsBOA::init (argc, argv);
-    
+
     if (CORBA::is_nil(orb_ptr) || CORBA::is_nil(oa_ptr))
       {
-	ACE_ERROR_RETURN ((LM_ERROR, 
-			   " (%P|%t) Unable to initialize the ORB and/or the BOA\n"),
-			  1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the ORB and/or the BOA\n"),
+                          1);
       }
-    
+
   // Create implementation object with user specified key.
   Cubit_i_ptr *my_cubit = new Cubit_i_ptr[num_of_objs_];
 
@@ -104,9 +104,9 @@ Cubit_Task::svc (void)
 
       if (my_cubit[i] == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to create implementation object&d\n",
-			   i),
-			  2);
+                           " (%P|%t) Unable to create implementation object&d\n",
+                           i),
+                          2);
 
       //CORBA::OctetSeq obj_key;
       //obj_key.buffer = (CORBA::Octet *) obj_str;
@@ -128,7 +128,7 @@ Cubit_Task::svc (void)
 
       //  str = orb_ptr->object_to_string (obj);
       str = orb_ptr->object_to_url (my_cubit[i]);
-      
+
       ACE_DEBUG ((LM_DEBUG, "listening as object '%s'\n", str));
       CORBA_string_free (str);
 
@@ -137,7 +137,7 @@ Cubit_Task::svc (void)
 
       if (env.exception () != 0)
         {
-	  //          env.print_exception ("object2string");
+          //          env.print_exception ("object2string");
           return 1;
         }
 
@@ -171,21 +171,21 @@ Cubit_Task::svc (void)
   }
   catch(const CORBA::SystemException& exc)
     {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "CORBA::SystemException caught: %s (minor: %d): svr.cpp\n\n",
-		  exc._repository_id (),
-		  exc.minor ()));
+      ACE_DEBUG ((LM_DEBUG,
+                  "CORBA::SystemException caught: %s (minor: %d): svr.cpp\n\n",
+                  exc._repository_id (),
+                  exc.minor ()));
     }
   catch(const CORBA::UserException& exc)
     {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "CORBA::UserException caught: %s: svr.cpp\n\n",
-		  exc._repository_id ()));
+      ACE_DEBUG ((LM_DEBUG,
+                  "CORBA::UserException caught: %s: svr.cpp\n\n",
+                  exc._repository_id ()));
     }
   catch(...)
     {
-      ACE_DEBUG ((LM_DEBUG, 
-		  "Exception caught: svr.cpp\n\n"));
+      ACE_DEBUG ((LM_DEBUG,
+                  "Exception caught: svr.cpp\n\n"));
     }
 
   return 0;
@@ -211,19 +211,19 @@ parse_args (int argc, char *argv[])
         hostname = opts.optarg;
         break;
       case 'p':
-	base_port = ACE_OS::atoi (opts.optarg);
-	break;
+        base_port = ACE_OS::atoi (opts.optarg);
+        break;
       case 'n':
-	num_of_objs = ACE_OS::atoi (opts.optarg);
-	break;
+        num_of_objs = ACE_OS::atoi (opts.optarg);
+        break;
       case '?':
       default:
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "usage:  %s"
-			   " -p port"
-			   " -h my_hostname"
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s"
+                           " -p port"
+                           " -h my_hostname"
                            " -n num_objects"
-			   "\n", argv [0]), 1);
+                           "\n", argv [0]), 1);
       }
 
   return 0;  // Indicates successful parsing of command line
@@ -238,22 +238,22 @@ main (int argc, char *argv[])
 #if 0
   parse_args (argc, argv);
 
-  if ((hostname == NULL) || (base_port == 0)) 
+  if ((hostname == NULL) || (base_port == 0))
     {
-      ACE_ERROR_RETURN ((LM_ERROR, 
-			 "usage: %s "
-			 " -p port -h my_hostname"
-			 "\n",argv [0]), 1);
-      
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "usage: %s "
+                         " -p port -h my_hostname"
+                         "\n",argv [0]), 1);
+
     }
 #endif
-  
+
   const size_t arg_size =
-    strlen("rate20 -ORBport %d -ORBhost %s")
+    strlen("rate20")
     + 5 /* port number */
     + MAXHOSTNAMELEN /* hostname */
     + 1 /* zero terminator */;
-  
+
   char *args1 = 0;
   ACE_NEW_RETURN (args1, char[arg_size], -1);
 
@@ -264,7 +264,7 @@ main (int argc, char *argv[])
   priority = ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD) + 6;
 #else
   priority = ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, ACE_SCOPE_THREAD);
-#endif  
+#endif
   ACE_DEBUG ((LM_DEBUG, "Creating servant with high priority\n"));
   task1.activate (THR_BOUND, 1, 0, priority);
 
@@ -283,6 +283,6 @@ main (int argc, char *argv[])
 
   delete [] args1;
   delete [] args2;
-  
+
   return 0;
 }
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/README b/TAO/performance-tests/Cubit/TAO/DII_Cubit/README
index f7afda6d95c..c73482bdf76 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/README
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/README
@@ -37,11 +37,8 @@ If using the -i option, you might want to run the server with the option
 more human-readable form. The server can be run in the same window in the 
 background, or in a different window.
 
-The command line options, default calls per loop, order and display format of the 
-stats are all similar to those in the IDL_Cubit tests.
+The command line options, default calls per loop, order and display
+format of the stats are all similar to those in the IDL_Cubit tests.
 
 On the Unix side, the Makefile will also build IDL_Cubit/server if
-necessary (thanks to David Levine). If the server exits when run on a
-Unix machine, it probbly means that someone else is also running it 
-and the defaults port numbers have collided. Just add the arg
-[-ORBport 0] when running the server and it will get a new port number.
+necessary (thanks to David Levine).
diff --git a/TAO/performance-tests/Thruput/CORBAplus/run_server b/TAO/performance-tests/Thruput/CORBAplus/run_server
index e4faa5331e4..e0a0fc5888d 100644
--- a/TAO/performance-tests/Thruput/CORBAplus/run_server
+++ b/TAO/performance-tests/Thruput/CORBAplus/run_server
@@ -4,7 +4,6 @@
 # -u : use IOR 
 # -f m : output results in Mbps
 # -b <sock Q size> ** not implemented **
-# -OAhost <host name>  ************* must provide this for this version
-# -OAthread : use threaded version as opposed to reactive
 #
-server -f m -ORBhost mambo.cs.wustl.edu #-OAthread
+
+server -f m
diff --git a/TAO/performance-tests/Thruput/TAO/new_server_test b/TAO/performance-tests/Thruput/TAO/new_server_test
index fa0e427c035..679bfeb95cb 100755
--- a/TAO/performance-tests/Thruput/TAO/new_server_test
+++ b/TAO/performance-tests/Thruput/TAO/new_server_test
@@ -4,10 +4,6 @@
 # -u : use IOR 
 # -f m : output results in Mbps
 # -b <sock Q size> ** not implemented **
-# -ORBhost <host name>  ************* must provide this for this version
-# -OAthread : use threaded version as opposed to reactive
 #
 
-$HOSTNAME = shift (@ARGV);
- 
-system ("server -d 1 -f m -o ior -ORBhost $HOSTNAME -ORBdotteddecimaladdresses 1 -ORBobjrefstyle url");
+system ("server -d 1 -f m -o ior -ORBdotteddecimaladdresses 1 -ORBobjrefstyle url");
diff --git a/TAO/performance-tests/Thruput/TAO/run_server b/TAO/performance-tests/Thruput/TAO/run_server
index d7276405bd9..6f9a139916c 100755
--- a/TAO/performance-tests/Thruput/TAO/run_server
+++ b/TAO/performance-tests/Thruput/TAO/run_server
@@ -4,8 +4,7 @@
 # -u : use IOR 
 # -f m : output results in Mbps
 # -b <sock Q size> ** not implemented **
-# -ORBhost <host name>  ************* must provide this for this version
-# -OAthread : use threaded version as opposed to reactive
+# 
 #
 
-./server -d 1 -f m -o ior -ORBhost $1 -ORBdotteddecimaladdresses 1 -ORBobjrefstyle url#-OAthread
+./server -d 1 -f m -o ior -ORBdotteddecimaladdresses 1 -ORBobjrefstyle url
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/README b/TAO/tests/NestedUpcall/MT_Client_Test/README
index c8397f8d938..5682f02f6f7 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/README
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/README
@@ -32,10 +32,10 @@ server switches:
 
 Usage:
 
-server_A -o ior1 -ORBport 10031
-server_A -o ior2 -ORBport 10032
+server_A -o ior1
+server_A -o ior2
 
 //for two client threads, 10 iterations and 5 server iterations
-client -f ior1 -g ior2 -n 2 -i 10 -s 5 -ORBport 10033
+client -f ior1 -g ior2 -n 2 -i 10 -s 5
 
-! Don't forget the ORB port for the client!
\ No newline at end of file
+! Don't forget the ORB port for the client!
diff --git a/TAO/tests/NestedUpcall/Reactor/README b/TAO/tests/NestedUpcall/Reactor/README
index a1147be10e4..b4bf01ed18b 100644
--- a/TAO/tests/NestedUpcall/Reactor/README
+++ b/TAO/tests/NestedUpcall/Reactor/README
@@ -36,8 +36,7 @@ client if you don't want to use the naming service.
 server:
 -------
 
-% server [-d] [-s] [-ORBhost <serverhost>] [-ORBport <portnum>]
- 	   [-o <ior_output_file>] 
+% server [-d] [-s] [-o <ior_output_file>] 
 
 Options:
 -------
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/README b/TAO/tests/NestedUpcall/Triangle_Test/README
index 70e8d57e5fe..d946e466421 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/README
+++ b/TAO/tests/NestedUpcall/Triangle_Test/README
@@ -22,10 +22,8 @@ arriving order.
 
 To start:
 
-%server_A -o server1 -ORBport 10045
+%server_A -o server1
 %
-%server_B -o server2 -ORBport 10046
+%server_B -o server2
 %
-%initiator -f server1 -g server2 -ORBport 10047
-
- 
\ No newline at end of file
+%initiator -f server1 -g server2