ChangeLogTag: Tue Nov 14 09:30:36 2000 Priyanka Gontla <pgontla@ece.uci.edu>

7 files changed, 40 insertions, 12 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index fdf6a984269..213c276618a 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,19 @@
+Tue Nov 14 09:30:36 2000  Priyanka Gontla <pgontla@ece.uci.edu>
+
+	* tests/RTCORBA/Server_Protocol/svc.conf :
+	  Added a deafault svc.conf for the client to use to 
+	  load the protocols.	
+
+	* tests/RTCORBA/Server_Declared/server.conf :
+	  Corrected the conf file to remove the repetitive
+	  inclusion of the -ORBReactorType option.
+	
+	* tests/RTCORBA/Client_Propagated/server.cpp :
+	* tests/RTCORBA/Client_Propagated/client.cpp :
+	  Removed unncessary inclusion of header files.	
+
+	  Thanks to Marina for pointing out.
+	
 Tue Nov 14 10:48:00 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* tao/IIOP_Connector.cpp: 
diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.cpp b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
index 548569499d5..44f310eca51 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/client.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
@@ -3,8 +3,6 @@
 #include "testC.h"
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
-#include "ace/Service_Config.h"
-#include "tao/Strategies/TAO_Strategies_Internal.h"
 
 #if (TAO_HAS_RT_CORBA == 1)
 
diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
index 8861289a3df..351a9627ce5 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
@@ -3,9 +3,6 @@
 #include "testS.h"
 #include "ace/Get_Opt.h"
 
-#include "ace/Service_Config.h"
-#include "tao/Strategies/TAO_Strategies_Internal.h"
-
 #if (TAO_HAS_RT_CORBA == 1)
 
 class Test_i : public POA_Test
diff --git a/TAO/tests/RTCORBA/Server_Declared/server.conf b/TAO/tests/RTCORBA/Server_Declared/server.conf
index df2071b8cfc..8d88db91da5 100644
--- a/TAO/tests/RTCORBA/Server_Declared/server.conf
+++ b/TAO/tests/RTCORBA/Server_Declared/server.conf
@@ -1,4 +1,4 @@
 # $Id$
 #
 static Resource_Factory "-ORBReactorType tp"
-dynamic Resource_Factory Service_Object *TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_mt -ORBReactorRegistry per-priority -ORBPriorityMapping direct -ORBSchedPolicy sched_other"
+dynamic Resource_Factory Service_Object *TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorRegistry per-priority -ORBPriorityMapping direct -ORBSchedPolicy sched_other"
diff --git a/TAO/tests/RTCORBA/Server_Protocol/run_test.pl b/TAO/tests/RTCORBA/Server_Protocol/run_test.pl
index 4d6159a42d4..ea6fd2be7af 100755
--- a/TAO/tests/RTCORBA/Server_Protocol/run_test.pl
+++ b/TAO/tests/RTCORBA/Server_Protocol/run_test.pl
@@ -49,16 +49,23 @@ sub client
     ("-ORBendpoint iiop://",
      "-ORBsvcconf server_reverse.conf "
      ."-ORBEndpoint uiop:// -ORBendpoint shmiop:// -ORBendpoint iiop://",
+     "-ORBsvcconf server_shmiop.conf -ORBendpoint shmiop://",
      "-ORBsvcconf server.conf -ORBEndpoint uiop:// "
      ." -ORBendpoint shmiop:// -ORBendpoint iiop://"
-     ." -p 0");
+     ." -p 1413566208",
+     "-ORBEndpoint uiop:// -ORBendpoint shmiop:// -ORBendpoint iiop://"
+     ." -p 1413566210 -ORBsvcconf server.conf");
 
 @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 IIOP only): \n");
+             ."          (POA Server Protocol set to SHMIOP only): \n");
 
 # UIOP only available on Unix.  Substitute with alternative tests on Windows.
 if ($^O eq "MSWin32")
@@ -66,9 +73,15 @@ if ($^O eq "MSWin32")
     @server_opts =
         ("-ORBendpoint iiop://",
          "-ORBsvcconf server_reverse_nt.conf "
-         ."-ORBEndpoint shmiop:// -ORBendpoint iiop:// ",
-         "-ORBSvcconf server_nt.conf -ORBendpoint shmiop:// "
-	 ." -ORBendpoint iiop:// -p 0 ");
+         ."-ORBEndpoint shmiop:// -ORBendpoint iiop://",
+         "-ORBsvcconf server_shmiop.conf -ORBendpoint shmiop://",
+         "-ORBSvcconf server_nt.conf -ORBendpoint shmiop:// -ORBendpoint iiop://"
+         ." -p 0",
+         "-ORBSvcconf server_nt.conf -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_nt.conf b/TAO/tests/RTCORBA/Server_Protocol/server_nt.conf
index e9ae08608d5..57c5b4c28b2 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server_nt.conf
+++ b/TAO/tests/RTCORBA/Server_Protocol/server_nt.conf
@@ -1,2 +1,2 @@
-dynamic SHMIOP_Factory Service_Object * TAO_Strategies:_make_TAO_SHMIOP_Protocol_Factory()
+dynamic SHMIOP_Factory Service_Object *TAO_Strategies:_make_TAO_SHMIOP_Protocol_Factory()
 static Resource_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
new file mode 100644
index 00000000000..adaf68c052d
--- /dev/null
+++ b/TAO/tests/RTCORBA/Server_Protocol/svc.conf
@@ -0,0 +1,4 @@
+#
+#
+dynamic SHMIOP_Factory Service_Object *TAO_Strategies:_make_TAO_SHMIOP_Protocol_Factory()
+static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory SHMIOP_Factory"