Wed Jul 11 16:03:58 2001 Paul Calabrese <calabrese_p@ociweb.com>

16 files changed, 24 insertions, 19 deletions

diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf
index 9206455908e..6e5455e2499 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf
@@ -2,6 +2,6 @@
 #
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
-static Resource_Factory "-ORBReactorType select_st -ORBConnectionCacheLock null"
+static Advanced_Resource_Factory "-ORBReactorType select_st -ORBConnectionCacheLock null"
 static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler ST" 
 static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock null"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
index 88eccdfb857..360fd79c81f 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
@@ -3,6 +3,8 @@
 #include "Cubit_Client.h"
 #include "Cubit_Server.h"
 
+#include "tao/Strategies/advanced_resource.h"
+
 #include "ace/Synch.h"
 #include "ace/Get_Opt.h"
 #include "ace/ARGV.h"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/iiop_lite.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/iiop_lite.conf
index e7622bae050..d1ffcb21d3f 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/iiop_lite.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/iiop_lite.conf
@@ -1,2 +1,2 @@
 dynamic IIOP_Lite_Factory Service_Object * TAO:_make_TAO_IIOP_Lite_Protocol_Factory() ""
-static Resource_Factory "-ORBProtocolFactory IIOP_Lite_Factory"
+static Advanced_Resource_Factory "-ORBProtocolFactory IIOP_Lite_Factory"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl
index 2020f15304a..0091d3c7100 100755
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl
@@ -50,10 +50,10 @@ for ($i = 0; $i <= $#ARGV; $i++) {
         $clflags .= " -n $ARGV[$i + 1] ";
         $i++;
     }
-    elsif ($ARGV[$i] eq " -orblite ") {
+    elsif ($ARGV[$i] eq "-orblite") {
         $giopliteflag = 1;
     }
-    elsif ($ARGV[$i] eq " -verbose ") {
+    elsif ($ARGV[$i] eq "-verbose") {
         $quietflag = "";
     }
     else {
@@ -111,7 +111,7 @@ $CL->Arguments ($clflags . $clnsflags . $quietflag . " -x ");
 if ($giopliteflag) {
     print STDERR "\nRunning IDL_Cubit with the a lite ORB protocol.\n\n";
     $SV->Arguments ($SV->Arguments () . " -ORBSvcConf $iiop_lite_conf ");
-    $CL->Arguments ($CL->Arugments () . " -ORBSvcConf $iiop_lite_conf ");
+    $CL->Arguments ($CL->Arguments () . " -ORBSvcConf $iiop_lite_conf ");
 }
 
 run_test_helper ();
@@ -126,7 +126,7 @@ if ($OSNAME ne "MSWin32") {
     if ($giopliteflag) {
         print STDERR "\nRunning IDL_Cubit with the a UIOP lite ORB protocol.\n\n";
         $SV->Arguments ($SV->Arguments () . " -ORBSvcConf $uiop_lite_conf ");
-        $CL->Arguments ($CL->Arugments () . " -ORBSvcConf $uiop_lite_conf ");
+        $CL->Arguments ($CL->Arguments () . " -ORBSvcConf $uiop_lite_conf ");
     }
 
     run_test_helper ();
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.mt_server.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.mt_server.conf
index 845689fc35e..95bddd90d42 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.mt_server.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.mt_server.conf
@@ -3,5 +3,5 @@
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
 
-static Resource_Factory "-ORBReactorType select_mt"
+static Advanced_Resource_Factory "-ORBReactorType select_mt"
 static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf
index abc9ba23e2e..56478215e3d 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf
@@ -3,5 +3,5 @@
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
 
-static Resource_Factory "-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" 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf
index 723cd557ac3..7482152738d 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_server.conf
@@ -3,5 +3,5 @@
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
 
-static Resource_Factory "-ORBReactorType select_st  -ORBInputCDRAllocator null"
+static Advanced_Resource_Factory "-ORBReactorType select_st  -ORBInputCDRAllocator null"
 static Server_Strategy_Factory "-ORBPOALock null -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 37b698c2cd7..24fb834d0db 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 Resource_Factory "-ORBResources global -ORBReactorType select_st -ORBInputCDRAllocator null  -ORBConnectionCacheLock null"
+static Advanced_Resource_Factory "-ORBResources global -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/performance-tests/Cubit/TAO/IDL_Cubit/uiop_lite.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/uiop_lite.conf
index 0a6f757b316..0fd993d9cbf 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/uiop_lite.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/uiop_lite.conf
@@ -1,2 +1,2 @@
-dynamic UIOP_Lite_Factory Service_Object * TAO:_make_TAO_UIOP_Lite_Protocol_Factory() ""
-static Resource_Factory "-ORBProtocolFactory UIOP_Lite_Factory"
+dynamic UIOP_Lite_Factory Service_Object * TAO_Strategies:_make_TAO_UIOP_Lite_Protocol_Factory() ""
+static Advanced_Resource_Factory "-ORBProtocolFactory UIOP_Lite_Factory"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile
index accc6631db7..41b16d7afbc 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-LDLIBS = -lTAO_PortableServer -lTAO $(MATHLIB)
+LDLIBS = -lTAO_Strategies -lTAO_PortableServer -lTAO $(MATHLIB)
 
 IDL_FILES = cubit
 IDL_SRC = cubitC.cpp cubitS.cpp
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.bor b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.bor
index 20ebb2f225d..ed324ea9a70 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.bor
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.bor
@@ -26,7 +26,8 @@ CFLAGS = \
 LIBFILES = \
 	$(ACE_LIB) \
 	$(TAO_LIB) \
-        $(TAO_PORTABLESERVER_LIB)
+        $(TAO_PORTABLESERVER_LIB) \
+        $(TAO_STRATEGIES_LIB)
 
 IDLFILES = \
         $(IDLDIR)\cubit.idl
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
index 6bbfedecf28..5700981f8af 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
@@ -7,6 +7,7 @@
 #endif /* VXWORKS */
 
 #include "ace/Sched_Params.h"
+#include "tao/Strategies/advanced_resource.h"
 #include "server.h"
 #include "client.h"
 #include "Globals.h"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.dsp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.dsp
index eba244b8704..710f3c26881 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.dsp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 TAO.lib ace.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"

+# ADD LINK32 TAO.lib ace.lib TAO_PortableServer.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"

 # SUBTRACT LINK32 /map /debug

 

 !ELSEIF  "$(CFG)" == "MT_Cubit Client - Win32 Debug"

@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"

+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_Strategiesd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"

 

 !ELSEIF  "$(CFG)" == "MT_Cubit Client - Win32 static Release"

 

diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
index 68f02a06aad..34ad515fc16 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
@@ -24,6 +24,7 @@
 
 #include "server.h"
 #include "ace/Sched_Params.h"
+#include "tao/Strategies/advanced_resource.h"
 
 #if defined (ACE_HAS_QUANTIFY)
 # include "quantify.h"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp
index bfb92017ab0..c083544821b 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 TAO.lib ace.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"

+# ADD LINK32 TAO.lib ace.lib TAO_PortableServer.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"

 # SUBTRACT LINK32 /map /debug

 

 !ELSEIF  "$(CFG)" == "MT_Cubit Server - Win32 Debug"

@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 TAOd.lib aced.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"

+# ADD LINK32 TAOd.lib aced.lib TAO_PortableServerd.lib TAO_Strategiesd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer"

 

 !ELSEIF  "$(CFG)" == "MT_Cubit Server - Win32 static Release"

 

diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
index 861671ff570..b7f7be24c58 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
@@ -3,6 +3,6 @@
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
 
-static Resource_Factory "-ORBResources tss -ORBInputCDRAllocator null -ORBConnectionCacheLock null"
+static Advanced_Resource_Factory "-ORBResources tss -ORBInputCDRAllocator null -ORBConnectionCacheLock null"
 static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
 static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock null -ORBAllowReactivationOfSystemids 0"