ChangeLogTag:Wed Dec 6 01:17:17 2000 Marina Spivak <marina@cs.wustl.edu>

23 files changed, 103 insertions, 94 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index ca1b9b8d9c6..b5f0f3fb2a7 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,30 @@
+Wed Dec  6 01:17:17 2000  Marina Spivak  <marina@cs.wustl.edu>
+
+	* tests/RTCORBA/Banded_Connections/server.conf
+	* tests/RTCORBA/Server_Protocol/server_reverse.conf
+	* tests/RTCORBA/Server_Protocol/server_reverse_nt.conf
+
+	* tests/RTCORBA/Banded_Connections/README
+	* tests/RTCORBA/Banded_Connections/run_test.pl
+	* tests/RTCORBA/Client_Propagated/run_test.pl
+	* tests/RTCORBA/Client_Protocol/run_test.pl
+	* tests/RTCORBA/Server_Protocol/run_test.pl
+
+	* tests/RTCORBA/Banded_Connections/client.conf
+	* tests/RTCORBA/Client_Protocol/client_nt.conf
+	* tests/RTCORBA/Client_Protocol/svc.conf
+	* tests/RTCORBA/Client_Protocol/svc_nt.conf
+	* tests/RTCORBA/Client_Protocol/svc_unix.conf
+	* tests/RTCORBA/Server_Protocol/client_nt.conf
+	* tests/RTCORBA/Server_Protocol/server.conf
+	* tests/RTCORBA/Server_Protocol/server_nt.conf
+	* tests/RTCORBA/Server_Protocol/server_uiop.conf
+	* tests/RTCORBA/Server_Protocol/svc.conf:
+
+	  Cleaned up RTCORBA tests after Priyanka's Strategy
+	  library-related changes: removed unnecessary config files,
+	  modified perl scripts to not use them.
+
 Tue Dec  5 19:56:09 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 
 	* tao/ORB_Core.h:
@@ -5,7 +32,7 @@ Tue Dec  5 19:56:09 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 	* tao/Object.cpp:
 	* tao/DynamicInterface/Dynamic_Adapter_Impl.cpp:
 
-	  Added static const char* dynamic_adapter_name_ to 
+	  Added static const char* dynamic_adapter_name_ to
 	  TAO_ORB_Core, along with set and get methods. The get
 	  method is used in the CORBA::Object methods that create
 	  DII requests, and the set method is used in the static
@@ -20,10 +47,10 @@ Tue Dec  5 19:39:48 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 	* tao/diffs/InterfaceC.i.diff:
 
 	  Replaced missing 'TAO_Export' macros on declarations
-	  of sequence CDR operators in the inline file used when 
+	  of sequence CDR operators in the inline file used when
 	  __ACE_INLINE__ is defined, and removed #if !defined guards
-	  and extra CDR operator declarations. Also updated diff file. 
-	  This fixes link errors in IFR_Service for the release build 
+	  and extra CDR operator declarations. Also updated diff file.
+	  This fixes link errors in IFR_Service for the release build
 	  on Win32.
 
 Tue Dec  5 15:47:23 2000  Marina Spivak  <marina@cs.wustl.edu>
@@ -54,7 +81,7 @@ Tue Dec  5 14:16:38 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 	* TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp:
 
 	  Removed use of '_var_type' in generated code for the exception
-	  holder. This typedef is intended for use with template 
+	  holder. This typedef is intended for use with template
 	  programming, which is not the case here. In addition, old g++
 	  does not see the typedef since the compiler does not scope
 	  it properly.
diff --git a/TAO/tests/RTCORBA/Banded_Connections/README b/TAO/tests/RTCORBA/Banded_Connections/README
index dfab6b9c90f..3def9f0b6e6 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/README
+++ b/TAO/tests/RTCORBA/Banded_Connections/README
@@ -23,7 +23,7 @@ some aspect of PriorityBandedConnectionPolicy:
    RTCORBA::PriorityBandedConnectionPolicy.  Attempt to register an
    object with priority that doesn't match the resources/configuration
    of that POA, i.e., its priority bands.  Should get BAD_PARAM exception.
- 
+
 (Client)
 
 4. Set RTCORBA::PriorityBandedConnectionPolicy on the object where
@@ -53,7 +53,7 @@ Scenario:
 
 To run (on Unix):
 -------
-$./server [-n <ior_output_file1> -o <ior_output_file2>] 
+$./server [-n <ior_output_file1> -o <ior_output_file2>]
           [-w <wrong_priority> -b <bands_file>]
            -p <poa_priority>
            -ORBdebuglevel 1 -ORBSvcConf server.conf
@@ -62,8 +62,7 @@ $./server [-n <ior_output_file1> -o <ior_output_file2>]
            [more endpoints if desired]
 
 $./client [-n <ior1> -o <ior2>]
-           -a <client_priority1> -b <client_priority2> -c <client_priority3> 
-           -ORBSvcConf client.conf
+           -a <client_priority1> -b <client_priority2> -c <client_priority3>
 
 
 Options:
@@ -82,8 +81,8 @@ Options:
 
 -b <bands_file>         Default: bands
                         Name of the file containing priority bands
-                        used for the test (on server and client).  
-                        
+                        used for the test (on server and client).
+
                         The format of the file is a single line, with
                         no leading or trailing spaces, with a list of
                         all bands' lows and highs.  Single space
@@ -93,7 +92,7 @@ Options:
 -p <poa_priority>       Default: -1, must be overridden.
                         SERVER_DECLARED priority of the poa.  Must
                         match one of the bands specified in the
-                        <bands_file>. 
+                        <bands_file>.
 
 -w <wrong_priority>     Default: -1
                         Priority not matching any of the priority
@@ -102,13 +101,13 @@ Options:
 -ORBdebuglevel 1        Default: none
                         This ORB option is useful for verifying that
                         correct band/threadpool lane are used during
-                        invocations. 
+                        invocations.
 
 The following are the required server ORB options for this test.
 These options help set up server resources to emulate POA
 threadpool with ORB pool.  Once POA threadpools are implemented, these
-options will go away.           
--ORBSvcConf server.conf 
+options will go away.
+-ORBSvcConf server.conf
 -ORBendpoint xxxx://targethost:0/priority=<priority_for_band1>
 -ORBendpoint xxxx://targethost:0/priority=<priority_for_band2>
 ... There must be enough endpoints to cover all bands specified in
@@ -123,7 +122,7 @@ the <bands_file>.  For an example, see run_test.pl
 -o <ior2>               Default: file://test2.ior
                         IOR for the second object (with
                         SERVER_DECLARED priority model and priority
-                        bands). 
+                        bands).
 
 -a <client_priority1>   Default: -1, must be overridden.
                         Client thread priority that will be used for
@@ -191,7 +190,7 @@ INV_POLICY exception is caught as expected.
 TAO (25332|5) IIOP connection from client<127.0.0.1:57368> on 17
 RTCORBA::CLIENT_PROPAGATED processing (25332|5): original thread priority 75 temporarily changed to 76
 
-Object bands: 
+Object bands:
 1) 65  69
 2) 74  76
 3) 80  80
@@ -199,7 +198,7 @@ Object priority: 76  Servant thread priority: 76
 Band 2 was used for this invocation
 TAO (25332|6) IIOP connection from client<127.0.0.1:57369> on 18
 
-Object bands: 
+Object bands:
 1) 65  69
 2) 74  76
 3) 80  80
@@ -212,7 +211,7 @@ INV_POLICY exception is caught as expected.
      Test 7
 TAO (25332|4) IIOP connection from client<127.0.0.1:57370> on 19
 
-Object bands: 
+Object bands:
 1) 65  69
 2) 74  76
 3) 80  80
@@ -220,6 +219,3 @@ Object priority: 67  Servant thread priority: 66
 Band 1 was used for this invocation
 
 Server ORB event loop finished
-
-
-
diff --git a/TAO/tests/RTCORBA/Banded_Connections/client.conf b/TAO/tests/RTCORBA/Banded_Connections/client.conf
deleted file mode 100644
index 65ee2534e8f..00000000000
--- a/TAO/tests/RTCORBA/Banded_Connections/client.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-#
-static Advanced_Resource_Factory "-ORBPriorityMapping direct -ORBSchedPolicy sched_other"
diff --git a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
index 1f234de08cb..4ee9d671786 100755
--- a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
+++ b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
@@ -33,7 +33,7 @@ $server_args =
     ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=80 ";
 
 $client_args =
-    "-n file://$iorfile1 -o file://$iorfile2 -ORBSvcConf client.conf "
+    "-n file://$iorfile1 -o file://$iorfile2 "
     ."-a 76 -b 80 -c 64";
 
 if ($^O eq "MSWin32")
@@ -46,7 +46,7 @@ if ($^O eq "MSWin32")
                     ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=6 ";
 
     $client_args =
-        "-n file://$iorfile1 -o file://$iorfile2 -ORBSvcConf client.conf "
+        "-n file://$iorfile1 -o file://$iorfile2 "
             ."-a 4 -b 6 -c 3";
 }
 
diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.conf b/TAO/tests/RTCORBA/Banded_Connections/server.conf
index 2d3885656c6..3d8c51515b1 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/server.conf
+++ b/TAO/tests/RTCORBA/Banded_Connections/server.conf
@@ -1,3 +1,3 @@
 # $Id$
 #
-static Advanced_Resource_Factory "-ORBReactorType tp -ORBReactorRegistry per-priority -ORBPriorityMapping direct -ORBSchedPolicy sched_other"
+static Advanced_Resource_Factory "-ORBReactorType tp -ORBReactorRegistry per-priority"
diff --git a/TAO/tests/RTCORBA/Client_Propagated/run_test.pl b/TAO/tests/RTCORBA/Client_Propagated/run_test.pl
index 88d5dcd035a..92f93b96a5b 100755
--- a/TAO/tests/RTCORBA/Client_Propagated/run_test.pl
+++ b/TAO/tests/RTCORBA/Client_Propagated/run_test.pl
@@ -19,7 +19,7 @@ print STDERR "\n            RTCORBA CLIENT_PROPAGATED Priority Unit Test\n\n";
 unlink $iorfile;
 
 $SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
-                       " -o $iorfile -ORBSvcconf svc.conf ");
+                       " -o $iorfile");
 
 if (ACE::waitforfile_timed ($iorfile, 10) == -1) {
   print STDERR "ERROR: cannot find file <$iorfile>\n";
@@ -28,7 +28,7 @@ if (ACE::waitforfile_timed ($iorfile, 10) == -1) {
 }
 
 $CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
-                       " -k file://$iorfile -ORBSvcconf svc.conf ");
+                       " -k file://$iorfile");
 
 $client = $CL->TimedWait (60);
 if ($client == -1) {
diff --git a/TAO/tests/RTCORBA/Client_Protocol/client_nt.conf b/TAO/tests/RTCORBA/Client_Protocol/client_nt.conf
deleted file mode 100644
index 9f446673444..00000000000
--- a/TAO/tests/RTCORBA/Client_Protocol/client_nt.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-#
-static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory SHMIOP_Factory"
diff --git a/TAO/tests/RTCORBA/Client_Protocol/run_test.pl b/TAO/tests/RTCORBA/Client_Protocol/run_test.pl
index b27901ae72a..e066e18d567 100755
--- a/TAO/tests/RTCORBA/Client_Protocol/run_test.pl
+++ b/TAO/tests/RTCORBA/Client_Protocol/run_test.pl
@@ -23,17 +23,17 @@ unlink $iorfile2;
 # Arguments are platform-dependent (UIOP not available on Windows).
 $server_args =
     "-s $iorfile1 -c $iorfile2 -p 1413566208 "
-    ."-ORBSvcconf svc_unix.conf -ORBendpoint iiop:// -ORBendpoint shmiop:// -ORBEndpoint uiop:// ";
+    ."-ORBendpoint iiop:// -ORBendpoint shmiop:// -ORBEndpoint uiop:// ";
 $client_args =
-    "-s file://$iorfile1 -c file://$iorfile2 -p 1413566210 -ORBdebuglevel 1 -ORBSvcconf svc_unix.conf ";
+    "-s file://$iorfile1 -c file://$iorfile2 -p 1413566210 -ORBdebuglevel 1 ";
 
 if ($^O eq "MSWin32")
 {
 $server_args =
     "-s $iorfile1 -c $iorfile2 -p 1413566210 "
-    ."-ORBSvcconf svc_nt.conf -ORBendpoint iiop:// -ORBendpoint shmiop:// ";
+    ."-ORBendpoint iiop:// -ORBendpoint shmiop:// ";
 $client_args =
-    "-s file://$iorfile1 -c file://$iorfile2 -ORBdebuglevel 1 -ORBSvcconf client_nt.conf";
+    "-s file://$iorfile1 -c file://$iorfile2 -ORBdebuglevel 1";
 }
 
 # Start server.
diff --git a/TAO/tests/RTCORBA/Client_Protocol/svc.conf b/TAO/tests/RTCORBA/Client_Protocol/svc.conf
deleted file mode 100644
index 97824c81d54..00000000000
--- a/TAO/tests/RTCORBA/Client_Protocol/svc.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-
-static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory SHMIOP_Factory -ORBProtocolFactory UIOP_Factory"
diff --git a/TAO/tests/RTCORBA/Client_Protocol/svc_nt.conf b/TAO/tests/RTCORBA/Client_Protocol/svc_nt.conf
deleted file mode 100644
index 4e3e216d3a6..00000000000
--- a/TAO/tests/RTCORBA/Client_Protocol/svc_nt.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-
-static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory SHMIOP_Factory "
diff --git a/TAO/tests/RTCORBA/Client_Protocol/svc_unix.conf b/TAO/tests/RTCORBA/Client_Protocol/svc_unix.conf
deleted file mode 100644
index d46e7f7175e..00000000000
--- a/TAO/tests/RTCORBA/Client_Protocol/svc_unix.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# $Id$
-
-static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory SHMIOP_Factory -ORBProtocolFactory UIOP_Factory "
-
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/Makefile b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/Makefile
index 36fa4f51900..460450682e1 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/Makefile
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/Makefile
@@ -12,8 +12,6 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-LDLIBS = -lTAO_Strategies -lTAO
-
 IDL_FILES = test
 IDL_SRC = testC.cpp testS.cpp
 BIN_UNCHECKED = server client
@@ -44,6 +42,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 include $(TAO_ROOT)/taoconfig.mk
 
+TAO_SRVR_LIBS := -lTAO_Strategies $(TAO_SRVR_LIBS)
+TAO_CLNT_LIBS := -lTAO_Strategies $(TAO_CLNT_LIBS)
+
 #----------------------------------------------------------------------------
 #       Local targets
 #----------------------------------------------------------------------------
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
index da25a50e000..f6c8ce9b8f4 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
@@ -5,6 +5,8 @@
 #include "ace/Sched_Params.h"
 #include "ace/Task.h"
 
+#include "tao/Strategies/advanced_resource.h"
+
 #if (TAO_HAS_RT_CORBA == 1)
 
 class Worker_Thread : public ACE_Task_Base
@@ -115,8 +117,8 @@ parse_args (int argc, char *argv[])
   if (priority1 < 0
       || priority2 < 0)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "Valid thread priorities must be specified\n. "
-                           "See README for command-line options\n"),
+                           "Valid thread priorities must be specified.\n"
+                           "See README for command-line options.\n"),
                           -1);
   return 0;
 }
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl
index f9a562102e1..cd23e185301 100755
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl
@@ -10,15 +10,13 @@ require ACEutils;
 use Cwd;
 
 $cwd = getcwd();
-$iorfile1 = "$cwd$DIR_SEPARATOR" . "test1.ior";
-$iorfile2 = "$cwd$DIR_SEPARATOR" . "test2.ior";
+$iorfile = "$cwd$DIR_SEPARATOR" . "test.ior";
 
 ACE::checkForTarget($cwd);
 
-print STDERR "\n********** RTCORBA SERVER_DECLARED Priority Unit Test\n\n";
+print STDERR "\n********** MT Client Protocol & CLIENT_PROPAGATED combo Test\n\n";
 
-unlink $iorfile1;
-unlink $iorfile2;
+unlink $iorfile;
 
 # CORBA priorities 65, 70 and 75 are for the SCHED_OTHER class on
 # Solaris.  May need to use different values for other platforms
@@ -26,27 +24,32 @@ unlink $iorfile2;
 # available range.
 
 $server_args =
-    "-p $iorfile1 -o $iorfile2 -a 65 -b 75 -c 70 -ORBSvcConf server.conf "
+    "-o $iorfile "
     ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=65 "
     ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=75 "
-    ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=70 ";
+    ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=70 "
+    ."-ORBendpoint shmiop://$TARGETHOSTNAME:0/priority=65 "
+    ."-ORBendpoint shmiop://$TARGETHOSTNAME:0/priority=75 "
+    ."-ORBendpoint shmiop://$TARGETHOSTNAME:0/priority=70 ";
+
+$client_args =
+    "-o file://$iorfile -ORBdebuglevel 1 "
+    ."-a 65 -b 70 -e 1413566210 -f 0";
 
 if ($^O eq "MSWin32")
 {
     $server_args =
-        "-p $iorfile1 -o $iorfile2 -a 3 -b 5 -c 2 -ORBSvcConf server.conf "
+        "-o $iorfile1 -o $iorfile2 -a 3 -b 5 -c 2 -ORBSvcConf server.conf "
             ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=3 "
                 ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=5 "
                     ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=1 ";
 }
 
-$client_args = "-p file://$iorfile1 -o file://iorfile2";
-
 $SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
                        $server_args);
 
-if (ACE::waitforfile_timed ($iorfile2, 10) == -1) {
-  print STDERR "ERROR: cannot find file <$iorfile2>\n";
+if (ACE::waitforfile_timed ($iorfile, 10) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
   $SV->Kill (); $SV->TimedWait (1);
   exit 1;
 }
@@ -66,8 +69,7 @@ if ($server == -1) {
   $SV->Kill (); $SV->TimedWait (1);
 }
 
-unlink $iorfile1;
-unlink $iorfile2;
+unlink $iorfile;
 
 if ($server != 0 || $client != 0) {
   exit 1;
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
index 85b5fe1e939..b567207a4ed 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
@@ -5,6 +5,8 @@
 #include "tao/RTCORBAC.h"
 #include "tao/Pool_Per_Endpoint.h"
 
+#include "tao/Strategies/advanced_resource.h"
+
 #if (TAO_HAS_RT_CORBA == 1)
 
 class Test_i : public POA_Test
@@ -178,12 +180,15 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
+      /*
       // Start ORB event loop.
       // @@ Currently we are using Reactor per priority to emulate
       // threadpool with lanes.  Once POA threadpools are implemented,
       // this code should be replaced with standard threadpool apis.
       TAO_Pool_Per_Endpoint pool (orb.in ());
       pool.run (ACE_TRY_ENV);
+      */
+      orb->run (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Server ORB event loop finished\n\n"));
diff --git a/TAO/tests/RTCORBA/Server_Protocol/client_nt.conf b/TAO/tests/RTCORBA/Server_Protocol/client_nt.conf
deleted file mode 100644
index 9f446673444..00000000000
--- a/TAO/tests/RTCORBA/Server_Protocol/client_nt.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-#
-static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory SHMIOP_Factory"
diff --git a/TAO/tests/RTCORBA/Server_Protocol/run_test.pl b/TAO/tests/RTCORBA/Server_Protocol/run_test.pl
index 42789455c57..d9350f7653f 100755
--- a/TAO/tests/RTCORBA/Server_Protocol/run_test.pl
+++ b/TAO/tests/RTCORBA/Server_Protocol/run_test.pl
@@ -35,11 +35,6 @@ sub client
 {
   my $args = " -k file://$iorfile -ORBdebuglevel 1";
 
-  if ($^O eq "MSWin32")
-  {
-     my $args = " -k file://$iorfile -ORBdebuglevel 1 -ORBSvcconf client_nt.conf ";
-  }
-
   $CL = Process::Create ($EXEPREFIX."client$EXE_EXT ", $args);
 
   $client = $CL->TimedWait (60);
@@ -52,24 +47,32 @@ sub client
 # Configurations for all tests to be run.
 @server_opts =
     ("-ORBendpoint iiop://",
+
      "-ORBsvcconf server_reverse.conf "
      ."-ORBEndpoint uiop:// -ORBendpoint shmiop:// -ORBendpoint iiop://",
+
      "-ORBsvcconf server_shmiop.conf -ORBendpoint shmiop://",
-     "-ORBsvcconf server.conf -ORBEndpoint uiop:// "
+
+     "-ORBEndpoint uiop:// "
      ." -ORBendpoint shmiop:// -ORBendpoint iiop://"
      ." -p 1413566208",
-     "-ORBsvcconf server.conf -ORBEndpoint uiop:// "
+
+     "-ORBEndpoint uiop:// "
      ." -ORBendpoint shmiop:// -ORBendpoint iiop://"
      ." -p 1413566210 ");
 
 @comments = ("* ORB Default Server Protocol Policy Test\n          "
              ."(TAO's default behavior without config files): \n",
+
              "* ORB Default Server Protocol Policy Test\n          "
              ."(All TAO protocols are loaded, but in reverse order): \n",
+
              "* ORB Default Server Protocol Policy Test\n          "
             ."(Only SHMIOP loaded): \n",
+
              "* Overriding ORB Default Server Protocol Policy in the POA\n"
              ."          (POA Server Protocol set to UIOP only): \n",
+
              "* Overriding ORB Default Server Protocol Policy in the POA\n"
              ."          (POA Server Protocol set to SHMIOP only): \n");
 
@@ -78,13 +81,18 @@ if ($^O eq "MSWin32")
 {
     @server_opts =
         ("-ORBendpoint iiop://",
+
          "-ORBsvcconf server_reverse_nt.conf "
          ."-ORBEndpoint shmiop:// -ORBendpoint iiop://",
+
          "-ORBsvcconf server_shmiop.conf -ORBendpoint shmiop://",
-         "-ORBSvcconf server_nt.conf -ORBendpoint shmiop:// -ORBendpoint iiop://"
+
+         "-ORBendpoint shmiop:// -ORBendpoint iiop://"
          ." -p 0",
-         "-ORBSvcconf server_nt.conf -ORBendpoint shmiop:// -ORBendpoint iiop://"
+
+         "-ORBendpoint shmiop:// -ORBendpoint iiop://"
          ." -p 1413566210");
+
     $comments[3] =
         "Overriding ORB Default Server Protocol Policy in the POA "
             ."(POA Server Protocol set to IIOP only): \n";
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.conf b/TAO/tests/RTCORBA/Server_Protocol/server.conf
deleted file mode 100644
index a6812e27cd0..00000000000
--- a/TAO/tests/RTCORBA/Server_Protocol/server.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-#
-static Resource_Factory " -ORBProtocolFactory UIOP_Factory -ORBProtocolFactory SHMIOP_Factory -ORBProtocolFactory IIOP_Factory "
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server_nt.conf b/TAO/tests/RTCORBA/Server_Protocol/server_nt.conf
deleted file mode 100644
index f5e8fa0d818..00000000000
--- a/TAO/tests/RTCORBA/Server_Protocol/server_nt.conf
+++ /dev/null
@@ -1 +0,0 @@
-static Resource_Factory "-ORBProtocolFactory SHMIOP_Factory -ORBProtocolFactory IIOP_Factory "
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server_reverse.conf b/TAO/tests/RTCORBA/Server_Protocol/server_reverse.conf
index abd5f6cdd1e..6978bdf367e 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server_reverse.conf
+++ b/TAO/tests/RTCORBA/Server_Protocol/server_reverse.conf
@@ -1,5 +1,3 @@
+# $Id$
 #
-#
-static Resource_Factory "-ORBProtocolFactory SHMIOP_Factory"
-static Resource_Factory "-ORBProtocolFactory UIOP_Factory"
-static Resource_Factory "-ORBProtocolFactory IIOP_Factory"
+static Resource_Factory "-ORBProtocolFactory SHMIOP_Factory -ORBProtocolFactory UIOP_Factory -ORBProtocolFactory IIOP_Factory"
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server_reverse_nt.conf b/TAO/tests/RTCORBA/Server_Protocol/server_reverse_nt.conf
index 4f501a033cc..dd83582a1be 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server_reverse_nt.conf
+++ b/TAO/tests/RTCORBA/Server_Protocol/server_reverse_nt.conf
@@ -1,4 +1,3 @@
+# $Id$
 #
-#
-static Resource_Factory "-ORBProtocolFactory SHMIOP_Factory"
-static Resource_Factory "-ORBProtocolFactory IIOP_Factory"
+static Resource_Factory "-ORBProtocolFactory SHMIOP_Factory -ORBProtocolFactory IIOP_Factory"
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server_uiop.conf b/TAO/tests/RTCORBA/Server_Protocol/server_uiop.conf
deleted file mode 100644
index 486b2bae556..00000000000
--- a/TAO/tests/RTCORBA/Server_Protocol/server_uiop.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-#
-static Resource_Factory "-ORBProtocolFactory UIOP_Factory -ORBProtocolFactory SHMIOP_Factory -ORBProtocolFactory IIOP_Factory"
diff --git a/TAO/tests/RTCORBA/Server_Protocol/svc.conf b/TAO/tests/RTCORBA/Server_Protocol/svc.conf
deleted file mode 100644
index a3ff2fb4e27..00000000000
--- a/TAO/tests/RTCORBA/Server_Protocol/svc.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-#
-static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIOP_Factory -ORBProtocolFactory SHMIOP_Factory"