ChangeLogTag: Sun Aug 4 13:30:41 2002 Balachandran Natarajan <bala@cs.wustl.edu>

9 files changed, 22 insertions, 8 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 6c9aa3ce38f..ef6cc15d268 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,17 @@
+Sun Aug  4 13:30:41 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* performance-tests/Cubit/TAO/IDL_Cubit/svc.conf:
+	* performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf:
+	* performance-tests/Cubit/TAO/MT_Cubit/svc.conf:
+	* tests/Collocation/svc.conf:
+	* tests/OctetSeq/svc1.conf:
+	* tests/OctetSeq/svc2.conf:
+	* tests/Smart_Proxies/Collocation/svc.conf:
+	* tests/Strategies/advanced_svc.conf:
+	* tests/Strategies/svc.conf: Removed the usage of -ORBResources
+	  option from all the above files since the option has been
+	  deprecated. 
+
 Sun Aug 04 09:56:29 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* docs/releasenotes/orbcore.html: Updated the release notes. Looks
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
index b65f7facdc6..2aa568bf9af 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
@@ -3,7 +3,7 @@
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
 
-static Advanced_Resource_Factory "-ORBResources global -ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null -ORBFlushingStrategy blocking"
+static Advanced_Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null -ORBFlushingStrategy blocking"
 static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
 static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock thread -ORBAllowReactivationOfSystemids 0"
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf
index 24fb834d0db..d3d195dabce 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf
@@ -7,6 +7,6 @@
 # the only problems are on shutdown.
 #
 
-static Advanced_Resource_Factory "-ORBResources global -ORBReactorType select_st -ORBInputCDRAllocator null  -ORBConnectionCacheLock null"
+static Advanced_Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null  -ORBConnectionCacheLock null"
 static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
 static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock null -ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/tests/Collocation/svc.conf b/TAO/tests/Collocation/svc.conf
index be81cfa2bd0..285b1297bd4 100644
--- a/TAO/tests/Collocation/svc.conf
+++ b/TAO/tests/Collocation/svc.conf
@@ -4,7 +4,7 @@
 #
 
 # This is a single threaded "server."
-static Advanced_Resource_Factory "-ORBResources global -ORBReactorType select_st -ORBInputCDRAllocator null  -ORBConnectionCacheLock null"
+static Advanced_Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null  -ORBConnectionCacheLock null"
 
 # Make sure we use RW client handler so if something goes wrong, the program will bloc,
 # i.e., won't work.
diff --git a/TAO/tests/OctetSeq/svc1.conf b/TAO/tests/OctetSeq/svc1.conf
index 524983ee755..93e97c126a4 100644
--- a/TAO/tests/OctetSeq/svc1.conf
+++ b/TAO/tests/OctetSeq/svc1.conf
@@ -2,4 +2,4 @@
 #
 
 dynamic Advanced_Resource_Factory Service_Object *
-TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBResources global -ORBInputCDRAllocator null"
+TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBInputCDRAllocator null"
diff --git a/TAO/tests/OctetSeq/svc2.conf b/TAO/tests/OctetSeq/svc2.conf
index 21b22459805..93e97c126a4 100644
--- a/TAO/tests/OctetSeq/svc2.conf
+++ b/TAO/tests/OctetSeq/svc2.conf
@@ -2,4 +2,4 @@
 #
 
 dynamic Advanced_Resource_Factory Service_Object *
-TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBResources tss -ORBInputCDRAllocator null"
+TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBInputCDRAllocator null"
diff --git a/TAO/tests/Smart_Proxies/Collocation/svc.conf b/TAO/tests/Smart_Proxies/Collocation/svc.conf
index 16f01bef61e..e7282585c3b 100644
--- a/TAO/tests/Smart_Proxies/Collocation/svc.conf
+++ b/TAO/tests/Smart_Proxies/Collocation/svc.conf
@@ -4,7 +4,7 @@
 #
 
 # This is a single threaded "server."
-static Resource_Factory "-ORBResources global -ORBReactorType select_st -ORBInputCDRAllocator null  -ORBConnectionCacheLock null"
+static Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null  -ORBConnectionCacheLock null"
 
 # Make sure we use RW client handler so if something goes wrong, the program will bloc,
 # i.e., won't work.
diff --git a/TAO/tests/Strategies/advanced_svc.conf b/TAO/tests/Strategies/advanced_svc.conf
index f9cbc77a0fd..4d54795129a 100644
--- a/TAO/tests/Strategies/advanced_svc.conf
+++ b/TAO/tests/Strategies/advanced_svc.conf
@@ -8,5 +8,5 @@ dynamic SHMIOP_Factory Service_Object *TAO_Strategies:_make_TAO_SHMIOP_Protocol_
 dynamic Advanced_Resource_Factory Service_Object * TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_st -ORBInputCDRAllocator null  -ORBProtocolFactory IIOP_Factory -ORBProtocolFactory SHMIOP_Factory"
 # dynamic Advanced_Resource_Factory Service_Object * TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_st -ORBInputCDRAllocator null  -ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIOP_Factory -ORBProtocolFactory SHMIOP_Factory"
 
-#static Resource_Factory "-ORBResources global -ORBReactorType select_mt -ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIOP_Factory -ORBProtocolFactory SHMIOP_Factory"
+#static Resource_Factory "-ORBReactorType select_mt -ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIOP_Factory -ORBProtocolFactory SHMIOP_Factory"
 
diff --git a/TAO/tests/Strategies/svc.conf b/TAO/tests/Strategies/svc.conf
index 7bdc6833362..4d648b28256 100644
--- a/TAO/tests/Strategies/svc.conf
+++ b/TAO/tests/Strategies/svc.conf
@@ -4,6 +4,6 @@
 # This configuration file is used to use only the default TAO
 # strategies 
 
-static Resource_Factory "-ORBResources global -ORBProtocolFactory IIOP_Factory"
+static Resource_Factory "-ORBProtocolFactory IIOP_Factory"