ChangeLogTag: Mon Sep 17 19:00:00 2001 Irfan Pyarali <irfan@cs.wustl.edu>

author: irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2001-09-18 00:06:07 +0000
committer: irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2001-09-18 00:06:07 +0000
commit: e12b5d4ffb96ffdce21884a491273fb82a65cab9 (patch)
tree: 10e8af6827368c6ceb5e733627c5faf5e361b748 /TAO/tests
parent: b792311a6a68d2359ab17efcd36a899eff948baf (diff)
download: ATCD-e12b5d4ffb96ffdce21884a491273fb82a65cab9.tar.gz
164 files changed, 13155 insertions, 2198 deletions
diff --git a/TAO/tests/BiDirectional/Makefile b/TAO/tests/BiDirectional/Makefile
index 4f93ebb0e7b..ca8d9e15e44 100644
--- a/TAO/tests/BiDirectional/Makefile
+++ b/TAO/tests/BiDirectional/Makefile
@@ -802,7 +802,9 @@ realclean: clean
   $(TAO_ROOT)/tao/Cache_Entries.inl \
   $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
   $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i
 
 .obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \
   $(TAO_ROOT)/tao/corba.h \
diff --git a/TAO/tests/BiDirectional/test_i.cpp b/TAO/tests/BiDirectional/test_i.cpp
index 6575bfbfa93..09776957239 100644
--- a/TAO/tests/BiDirectional/test_i.cpp
+++ b/TAO/tests/BiDirectional/test_i.cpp
@@ -5,6 +5,7 @@
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
 #include "tao/Transport_Cache_Manager.h"
+#include "tao/Thread_Lane_Resources.h"
 
 #if !defined(__ACE_INLINE__)
 #include "test_i.i"
@@ -63,7 +64,7 @@ Simple_Server_i::call_client (CORBA::Environment &ACE_TRY_ENV)
           this->callback_->callback_method (ACE_TRY_ENV);
           ACE_CHECK_RETURN (0);
 
-          if (this->orb_->orb_core ()->transport_cache ()->current_size () > 1)
+          if (this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size () > 1)
             {
               ACE_ERROR ((LM_ERROR,
                           "(%P|%t) The cache has grown, aborting ..\n"));
diff --git a/TAO/tests/BiDirectional_NestedUpcall/Makefile b/TAO/tests/BiDirectional_NestedUpcall/Makefile
index ec8bc926e60..25b48e0cd00 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/Makefile
+++ b/TAO/tests/BiDirectional_NestedUpcall/Makefile
@@ -804,7 +804,9 @@ realclean: clean
   $(TAO_ROOT)/tao/Cache_Entries.inl \
   $(TAO_ROOT)/tao/Connection_Purging_Strategy.h \
   $(TAO_ROOT)/tao/Connection_Purging_Strategy.inl \
-  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl
+  $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i
 
 .obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \
   $(TAO_ROOT)/tao/corba.h \
diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
index c8b0b8ded86..f7476d946df 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp
@@ -4,6 +4,7 @@
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
 #include "tao/Transport_Cache_Manager.h"
+#include "tao/Thread_Lane_Resources.h"
 
 #if !defined(__ACE_INLINE__)
 #include "test_i.i"
@@ -48,7 +49,7 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback,
           this->callback_->callback_method (ACE_TRY_ENV);
           ACE_CHECK_RETURN (0);
 
-          if (this->orb_->orb_core ()->transport_cache ()->current_size () > 1)
+          if (this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size () > 1)
             {
               ACE_ERROR ((LM_ERROR,
                           "(%P|%t) The cache has grown, aborting ..\n"));
diff --git a/TAO/tests/Collocation/Collocation.bor b/TAO/tests/Collocation/Collocation.bor
index eb1b1a4e4ae..50fcdb5dfdd 100644
--- a/TAO/tests/Collocation/Collocation.bor
+++ b/TAO/tests/Collocation/Collocation.bor
@@ -5,7 +5,7 @@
 NAME = Collocation
 
 OBJFILES = \
-	$(OBJDIR)\Coll_Tester.obj \
+	$(OBJDIR)\Collocation_Tester.obj \
 	$(OBJDIR)\Collocation.obj
 
 CFLAGS = \
@@ -21,8 +21,8 @@ LIBFILES = \
 	$(TAO_LIB) \
 	$(TAO_PORTABLESERVER_LIB) \
 	$(TAO_STRATEGIES_LIB) \
-        $(BINDIR)\Diamond$(LIB_DECORATOR).lib \
-        $(BINDIR)\Coll_Test_Stubs$(LIB_DECORATOR).lib
+	$(BINDIR)\Diamond$(LIB_DECORATOR).lib \
+	$(BINDIR)\Collocation_Test_Stubs$(LIB_DECORATOR).lib
 
 CPPDIR = .
 
diff --git a/TAO/tests/Collocation/Collocation.cpp b/TAO/tests/Collocation/Collocation.cpp
index 4aca6d01fcd..d27105582f2 100644
--- a/TAO/tests/Collocation/Collocation.cpp
+++ b/TAO/tests/Collocation/Collocation.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/streams.h"
 #include "ace/Get_Opt.h"
-#include "Coll_Tester.h"
+#include "Collocation_Tester.h"
 #include "tao/Strategies/advanced_resource.h"
 
 ACE_RCSID(Collocation, main, "$Id$")
diff --git a/TAO/tests/Collocation/Collocation.dsp b/TAO/tests/Collocation/Collocation.dsp
index 01c5b06401c..63a4240c686 100644
--- a/TAO/tests/Collocation/Collocation.dsp
+++ b/TAO/tests/Collocation/Collocation.dsp
@@ -51,7 +51,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 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 ace.lib TAO.lib TAO_PortableServer.lib TAO_Strategies.lib Diamond.lib coll_test_stubs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"../../tao/Strategies"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_Strategies.lib Diamond.lib Collocation_Test_Stubs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"../../tao/Strategies"
 
 !ELSEIF  "$(CFG)" == "Collocation - Win32 Debug"
 
@@ -76,7 +76,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 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 TAO_Strategiesd.lib Diamondd.lib coll_test_stubsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"../../tao/Strategies"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_Strategiesd.lib Diamondd.lib Collocation_Test_Stubsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"../../tao/Strategies"
 
 !ENDIF 
 
@@ -89,7 +89,7 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=.\Coll_Tester.cpp
+SOURCE=.\Collocation_Tester.cpp
 # End Source File
 # Begin Source File
 
@@ -101,7 +101,7 @@ SOURCE=.\Collocation.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=.\Coll_Tester.h
+SOURCE=.\Collocation_Tester.h
 # End Source File
 # End Group
 # End Target
diff --git a/TAO/tests/Collocation/Collocation.dsw b/TAO/tests/Collocation/Collocation.dsw
index d4f2e11a3eb..4df9b0509c0 100644
--- a/TAO/tests/Collocation/Collocation.dsw
+++ b/TAO/tests/Collocation/Collocation.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
-Project: "Coll_Test_Stubs DLL"=.\Coll_Test_Stubs.dsp - Package Owner=<4>
+Project: "Collocation"=.\Collocation.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -11,11 +11,14 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name Collocation Diamond DLL
+    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "Collocation"=.\Collocation.dsp - Package Owner=<4>
+Project: "Collocation Diamond DLL"=.\Diamond.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -24,16 +27,13 @@ Package=<5>
 Package=<4>
 {{{
     Begin Project Dependency
-    Project_Dep_Name Diamond
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name Diamond DLL
+    Project_Dep_Name Collocation Test Stubs DLL
     End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "Diamond DLL"=.\Diamond.dsp - Package Owner=<4>
+Project: "Collocation Test Stubs DLL"=.\Collocation_Test_Stubs.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -41,9 +41,6 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name Coll_Test_Stubs DLL
-    End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/TAO/tests/Collocation/Coll_Test_Stubs.bor b/TAO/tests/Collocation/Collocation_Test_Stubs.bor
index 7ec9937298d..7a3baf5a8d9 100644
--- a/TAO/tests/Collocation/Coll_Test_Stubs.bor
+++ b/TAO/tests/Collocation/Collocation_Test_Stubs.bor
@@ -1,8 +1,8 @@
 #
-# Makefile for building	the Coll_Test_Stubs library
+# Makefile for building	the Collocation_Test_Stubs library
 #
 
-NAME = Coll_Test_Stubs
+NAME = Collocation_Test_Stubs
 
 TAO_IDL	= $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -Gd \
 	-Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export \
diff --git a/TAO/tests/Collocation/Coll_Test_Stubs.dsp b/TAO/tests/Collocation/Collocation_Test_Stubs.dsp
index ab22359b7fd..5e52cba1480 100644
--- a/TAO/tests/Collocation/Coll_Test_Stubs.dsp
+++ b/TAO/tests/Collocation/Collocation_Test_Stubs.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="Coll_Test_Stubs DLL" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="Collocation Test Stubs DLL" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=Coll_Test_Stubs DLL - Win32 Debug
+CFG=Collocation Test Stubs DLL - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "Coll_Test_Stubs.mak".
+!MESSAGE NMAKE /f "Collocation_Test_Stubs.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "Coll_Test_Stubs.mak" CFG="Coll_Test_Stubs DLL - Win32 Debug"
+!MESSAGE NMAKE /f "Collocation_Test_Stubs.mak" CFG="Collocation Test Stubs DLL - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "Coll_Test_Stubs DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "Coll_Test_Stubs DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Collocation Test Stubs DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Collocation Test Stubs DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "Coll_Test_Stubs DLL - Win32 Release"
+!IF  "$(CFG)" == "Collocation Test Stubs DLL - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COLL_TEST_STUBS_EXPORTS" /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
 # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "MY_STUB_BUILD_DLL" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -56,12 +56,12 @@ 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 /dll /machine:I386
 # ADD LINK32 ace.lib tao.lib /nologo /dll /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"
 
-!ELSEIF  "$(CFG)" == "Coll_Test_Stubs DLL - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Collocation Test Stubs DLL - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Coll_Test_Stubs___Win32_Debug"
-# PROP BASE Intermediate_Dir "Coll_Test_Stubs___Win32_Debug"
+# PROP BASE Output_Dir "Collocation_Test_Stubs___Win32_Debug"
+# PROP BASE Intermediate_Dir "Collocation_Test_Stubs___Win32_Debug"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COLL_TEST_STUBS_EXPORTS" /YX /FD /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c
 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "MY_STUB_BUILD_DLL" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -81,14 +81,14 @@ 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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 aced.lib taod.lib /nologo /dll /debug /machine:I386 /out:"Coll_Test_Stubsd.dll" /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao"
+# ADD LINK32 aced.lib taod.lib /nologo /dll /debug /machine:I386 /out:"Collocation_Test_Stubsd.dll" /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "Coll_Test_Stubs DLL - Win32 Release"
-# Name "Coll_Test_Stubs DLL - Win32 Debug"
+# Name "Collocation Test Stubs DLL - Win32 Release"
+# Name "Collocation Test Stubs DLL - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -120,7 +120,7 @@ SOURCE=.\stub_export.h
 
 SOURCE=.\Diamond.idl
 
-!IF  "$(CFG)" == "Coll_Test_Stubs DLL - Win32 Release"
+!IF  "$(CFG)" == "Collocation Test Stubs DLL - Win32 Release"
 
 # PROP Ignore_Default_Tool 1
 USERDEP__DIAMO="..\..\..\bin\release\tao_idl.exe"	
@@ -159,7 +159,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "Coll_Test_Stubs DLL - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Collocation Test Stubs DLL - Win32 Debug"
 
 # PROP Ignore_Default_Tool 1
 USERDEP__DIAMO="..\..\..\bin\tao_idl.exe"	
diff --git a/TAO/tests/Collocation/Coll_Tester.cpp b/TAO/tests/Collocation/Collocation_Tester.cpp
index 26c220166de..7dba0e02c44 100644
--- a/TAO/tests/Collocation/Coll_Tester.cpp
+++ b/TAO/tests/Collocation/Collocation_Tester.cpp
@@ -13,7 +13,7 @@
 //
 //=============================================================================
 
-#include "Coll_Tester.h"
+#include "Collocation_Tester.h"
 
 Collocation_Test::Collocation_Test (void)
 {
diff --git a/TAO/tests/Collocation/Coll_Tester.h b/TAO/tests/Collocation/Collocation_Tester.h
index 584710a098a..584710a098a 100644
--- a/TAO/tests/Collocation/Coll_Tester.h
+++ b/TAO/tests/Collocation/Collocation_Tester.h
diff --git a/TAO/tests/Collocation/Diamond.bor b/TAO/tests/Collocation/Diamond.bor
index c442bcffa4e..234cca0a763 100644
--- a/TAO/tests/Collocation/Diamond.bor
+++ b/TAO/tests/Collocation/Diamond.bor
@@ -23,7 +23,7 @@ LIBFILES = \
 	$(ACE_LIB) \
 	$(TAO_LIB) \
 	$(TAO_PORTABLESERVER_LIB) \
-	$(BINDIR)\Coll_Test_Stubs$(LIB_DECORATOR).lib
+	$(BINDIR)\Collocation_Test_Stubs$(LIB_DECORATOR).lib
 
 IDLFILES = \
         $(IDLDIR)\Diamond.idl
diff --git a/TAO/tests/Collocation/Diamond.dsp b/TAO/tests/Collocation/Diamond.dsp
index 7791f8c3312..5cef8a2bdbf 100644
--- a/TAO/tests/Collocation/Diamond.dsp
+++ b/TAO/tests/Collocation/Diamond.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="Diamond DLL" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="Collocation Diamond DLL" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=Diamond DLL - Win32 Debug
+CFG=Collocation Diamond DLL - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=Diamond DLL - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "Diamond.mak" CFG="Diamond DLL - Win32 Debug"
+!MESSAGE NMAKE /f "Diamond.mak" CFG="Collocation Diamond DLL - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "Diamond DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "Diamond DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Collocation Diamond DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "Collocation Diamond DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "Diamond DLL - Win32 Release"
+!IF  "$(CFG)" == "Collocation Diamond DLL - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -54,9 +54,9 @@ 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 /dll /machine:I386
-# ADD LINK32 ace.lib tao.lib TAO_PortableServer.lib coll_test_stubs.lib /nologo /dll /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"
+# ADD LINK32 ace.lib tao.lib TAO_PortableServer.lib Collocation_Test_Stubs.lib /nologo /dll /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"
 
-!ELSEIF  "$(CFG)" == "Diamond DLL - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Collocation Diamond DLL - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -81,14 +81,14 @@ 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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 aced.lib taod.lib TAO_PortableServerd.lib coll_test_stubsd.lib /nologo /dll /debug /machine:I386 /out:"Diamondd.dll" /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"
+# ADD LINK32 aced.lib taod.lib TAO_PortableServerd.lib Collocation_Test_Stubsd.lib /nologo /dll /debug /machine:I386 /out:"Diamondd.dll" /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "Diamond DLL - Win32 Release"
-# Name "Diamond DLL - Win32 Debug"
+# Name "Collocation Diamond DLL - Win32 Release"
+# Name "Collocation Diamond DLL - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -133,95 +133,6 @@ SOURCE=.\stub_export.h
 
 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 # End Group
-# Begin Group "IDL Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\Diamond.idl
-
-!IF  "$(CFG)" == "Diamond DLL - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-USERDEP__DIAMO="..\..\..\bin\release\tao_idl.exe"	
-# Begin Custom Build - Invoking tao_idl on $(InputName).idl
-InputPath=.\Diamond.idl
-InputName=Diamond
-
-BuildCmds= \
-	..\..\..\bin\release\tao_idl.exe -Ge 1 -Gd -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h $(InputName).idl
-
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "Diamond DLL - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-USERDEP__DIAMO="..\..\..\bin\tao_idl.exe"	
-# Begin Custom Build - Invoking tao_idl on $(InputName).idl
-InputPath=.\Diamond.idl
-InputName=Diamond
-
-BuildCmds= \
-	..\..\..\bin\tao_idl.exe -Ge 1 -Gd -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h $(InputName).idl
-
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# End Group
 # Begin Group "Template Files"
 
 # PROP Default_Filter "_T.cpp"
@@ -229,9 +140,9 @@ BuildCmds= \
 
 SOURCE=.\DiamondS_T.cpp
 
-!IF  "$(CFG)" == "Diamond DLL - Win32 Release"
+!IF  "$(CFG)" == "Collocation Diamond DLL - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "Diamond DLL - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Collocation Diamond DLL - Win32 Debug"
 
 # PROP Ignore_Default_Tool 1
 
diff --git a/TAO/tests/Collocation/Makefile.bor b/TAO/tests/Collocation/Makefile.bor
index 597234b5974..7994d507200 100644
--- a/TAO/tests/Collocation/Makefile.bor
+++ b/TAO/tests/Collocation/Makefile.bor
@@ -2,6 +2,6 @@
 # Makefile for building the Collocation test executables and libraries
 #
 
-MAKEFILES = Coll_Test_Stubs.bor Diamond.bor Collocation.bor
+MAKEFILES = Collocation_Test_Stubs.bor Diamond.bor Collocation.bor
 
 !include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Collocation/Makefile.test b/TAO/tests/Collocation/Makefile.test
index 497aedb38f2..bc2e668c1d8 100644
--- a/TAO/tests/Collocation/Makefile.test
+++ b/TAO/tests/Collocation/Makefile.test
@@ -19,7 +19,7 @@ LDLIBS = -lCollocation_Test_Stub \
          -lTAO_PortableServer \
          -lTAO
 
-SRC = Coll_Tester.cpp
+SRC = Collocation_Tester.cpp
 
 BIN = Collocation
 
@@ -44,8 +44,8 @@ include $(TAO_ROOT)/taoconfig.mk
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/Coll_Tester.o .obj/Coll_Tester.so .shobj/Coll_Tester.o .shobj/Coll_Tester.so: Coll_Tester.cpp Coll_Tester.h Diamond_i.h DiamondS.h \
-  DiamondC.h \
+.obj/Collocation_Tester.o .obj/Collocation_Tester.so .shobj/Collocation_Tester.o .shobj/Collocation_Tester.so: Collocation_Tester.cpp Collocation_Tester.h \
+  Diamond_i.h DiamondS.h DiamondC.h \
   $(TAO_ROOT)/tao/corba.h \
   $(ACE_ROOT)/ace/pre.h \
   $(ACE_ROOT)/ace/post.h \
diff --git a/TAO/tests/Collocation/README b/TAO/tests/Collocation/README
index 7aba7ebf6b3..cc1bcde0a5b 100644
--- a/TAO/tests/Collocation/README
+++ b/TAO/tests/Collocation/README
@@ -4,7 +4,7 @@ and skeleton + implementation from the main program.
 
 After building the example, you'll get:
 
-        Coll_Test_Stubs.{dll,so}: This library contains stub implementations.
+        Collocation_Test_Stubs.{dll,so}: This library contains stub implementations.
 
         Diamond.{dll,so}: This library contains the implementation Diamond object.
 
diff --git a/TAO/tests/Connection_Purging/Makefile b/TAO/tests/Connection_Purging/Makefile
index d3055f20566..f9bc8573ab2 100644
--- a/TAO/tests/Connection_Purging/Makefile
+++ b/TAO/tests/Connection_Purging/Makefile
@@ -243,7 +243,84 @@ realclean: clean
   $(TAO_ROOT)/tao/MessagingC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   testC.i $(ACE_ROOT)/ace/Get_Opt.h \
-  $(ACE_ROOT)/ace/Get_Opt.i
+  $(ACE_ROOT)/ace/Get_Opt.i \
+  $(TAO_ROOT)/tao/Strategies/advanced_resource.h \
+  $(TAO_ROOT)/tao/Strategies/strategies_export.h \
+  $(TAO_ROOT)/tao/default_resource.h \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/default_resource.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Strategies/advanced_resource.i
 
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp test_i.h \
   $(ACE_ROOT)/ace/pre.h testS.h \
@@ -445,7 +522,84 @@ realclean: clean
   $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
   testS_T.h testS_T.i testS_T.cpp testS.i \
   $(ACE_ROOT)/ace/Get_Opt.h \
-  $(ACE_ROOT)/ace/Get_Opt.i
+  $(ACE_ROOT)/ace/Get_Opt.i \
+  $(TAO_ROOT)/tao/Strategies/advanced_resource.h \
+  $(TAO_ROOT)/tao/Strategies/strategies_export.h \
+  $(TAO_ROOT)/tao/default_resource.h \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/default_resource.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Strategies/advanced_resource.i
 
 .obj/test_i.o .obj/test_i.so .shobj/test_i.o .shobj/test_i.so: test_i.cpp test_i.h \
   $(ACE_ROOT)/ace/pre.h testS.h \
diff --git a/TAO/tests/Connection_Purging/client.bor b/TAO/tests/Connection_Purging/client.bor
index 5e74971e998..4c8713e8180 100644
--- a/TAO/tests/Connection_Purging/client.bor
+++ b/TAO/tests/Connection_Purging/client.bor
@@ -12,11 +12,13 @@ OBJFILES = \
 
 CFLAGS = \
 	$(ACE_CFLAGS) \
-	$(TAO_CFLAGS)
+	$(TAO_CFLAGS) \
+	$(TAO_STRATEGIES_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
-	$(TAO_LIB)
+	$(TAO_LIB) \
+	$(TAO_STRATEGIES_LIB)
 
 IDLFILES = \
         $(IDLDIR)\test.idl
diff --git a/TAO/tests/Connection_Purging/client.cpp b/TAO/tests/Connection_Purging/client.cpp
index 2781b133212..81bfb90f63e 100644
--- a/TAO/tests/Connection_Purging/client.cpp
+++ b/TAO/tests/Connection_Purging/client.cpp
@@ -2,6 +2,7 @@
 
 #include "testC.h"
 #include "ace/Get_Opt.h"
+#include "tao/Strategies/advanced_resource.h"
 
 const char *ior = "server.ior";
 
@@ -15,14 +16,14 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'k':
-	ior = get_opts.optarg;
-	break;
+        ior = get_opts.optarg;
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-k <ior> "
+                           "-k <ior> "
                            "\n",
                            argv [0]),
                           -1);
diff --git a/TAO/tests/Connection_Purging/client.dsp b/TAO/tests/Connection_Purging/client.dsp
index 79b8fd46d62..b7fd0c629b9 100644
--- a/TAO/tests/Connection_Purging/client.dsp
+++ b/TAO/tests/Connection_Purging/client.dsp
@@ -51,7 +51,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"
+# ADD LINK32 tao.lib ace.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\Strategies"
 
 !ELSEIF  "$(CFG)" == "Connection Purging Client - Win32 Debug"
 
@@ -76,7 +76,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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao"
+# ADD LINK32 taod.lib aced.lib TAO_Strategiesd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\Strategies"
 
 !ENDIF 
 
diff --git a/TAO/tests/Connection_Purging/server.bor b/TAO/tests/Connection_Purging/server.bor
index 54515fd6c1d..0b1af673075 100644
--- a/TAO/tests/Connection_Purging/server.bor
+++ b/TAO/tests/Connection_Purging/server.bor
@@ -15,11 +15,13 @@ OBJFILES = \
 CFLAGS = \
 	$(ACE_CFLAGS) \
 	$(TAO_CFLAGS) \
+	$(TAO_STRATEGIES_CFLAGS) \
 	$(TAO_PORTABLESERVER_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
 	$(TAO_LIB) \
+	$(TAO_STRATEGIES_LIB) \
 	$(TAO_PORTABLESERVER_LIB)
 
 IDLFILES = \
diff --git a/TAO/tests/Connection_Purging/server.cpp b/TAO/tests/Connection_Purging/server.cpp
index 8cfc06b9027..9b66cb607e1 100644
--- a/TAO/tests/Connection_Purging/server.cpp
+++ b/TAO/tests/Connection_Purging/server.cpp
@@ -2,6 +2,7 @@
 
 #include "test_i.h"
 #include "ace/Get_Opt.h"
+#include "tao/Strategies/advanced_resource.h"
 
 const char *ior_output_file = "server.ior";
 
diff --git a/TAO/tests/Connection_Purging/server.dsp b/TAO/tests/Connection_Purging/server.dsp
index 159a6ae079a..c70ac270982 100644
--- a/TAO/tests/Connection_Purging/server.dsp
+++ b/TAO/tests/Connection_Purging/server.dsp
@@ -51,7 +51,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 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao\Strategies"
 
 !ELSEIF  "$(CFG)" == "Connection Purging Server - Win32 Debug"
 
@@ -76,7 +76,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" /libpath:"..\..\tao\Strategies"
 
 !ENDIF
 
diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.dsp b/TAO/tests/DLL_ORB/Test_Client_Module.dsp
index 61ef68d1471..cb3fa0ff592 100644
--- a/TAO/tests/DLL_ORB/Test_Client_Module.dsp
+++ b/TAO/tests/DLL_ORB/Test_Client_Module.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="Test_Client_Module" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="DLL_ORB Test_Client_Module" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=Test_Client_Module - Win32 Debug
+CFG=DLL_ORB Test_Client_Module - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=Test_Client_Module - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "Test_Client_Module.mak" CFG="Test_Client_Module - Win32 Debug"
+!MESSAGE NMAKE /f "Test_Client_Module.mak" CFG="DLL_ORB Test_Client_Module - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "Test_Client_Module - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "Test_Client_Module - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "DLL_ORB Test_Client_Module - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "DLL_ORB Test_Client_Module - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "Test_Client_Module - Win32 Release"
+!IF  "$(CFG)" == "DLL_ORB Test_Client_Module - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -56,7 +56,7 @@ 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 /dll /machine:I386
 # ADD LINK32 ACE.lib TAO.lib /nologo /dll /pdb:none /machine:I386 /out:"..\..\..\bin\Test_Client_Module.dll" /libpath:"../../../ace" /libpath:"../../tao"
 
-!ELSEIF  "$(CFG)" == "Test_Client_Module - Win32 Debug"
+!ELSEIF  "$(CFG)" == "DLL_ORB Test_Client_Module - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -88,8 +88,8 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "Test_Client_Module - Win32 Release"
-# Name "Test_Client_Module - Win32 Debug"
+# Name "DLL_ORB Test_Client_Module - Win32 Release"
+# Name "DLL_ORB Test_Client_Module - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx"
@@ -133,7 +133,7 @@ SOURCE=.\TestC.i
 
 SOURCE=.\Test.idl
 
-!IF  "$(CFG)" == "Test_Client_Module - Win32 Release"
+!IF  "$(CFG)" == "DLL_ORB Test_Client_Module - Win32 Release"
 
 # PROP Ignore_Default_Tool 1
 # Begin Custom Build
@@ -171,7 +171,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "Test_Client_Module - Win32 Debug"
+!ELSEIF  "$(CFG)" == "DLL_ORB Test_Client_Module - Win32 Debug"
 
 # PROP Ignore_Default_Tool 1
 # Begin Custom Build
diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.dsp b/TAO/tests/DLL_ORB/Test_Server_Module.dsp
index d6534abe657..b9aa9ad1ff4 100644
--- a/TAO/tests/DLL_ORB/Test_Server_Module.dsp
+++ b/TAO/tests/DLL_ORB/Test_Server_Module.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="Test_Server_Module" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="DLL_ORB Test_Server_Module" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=Test_Server_Module - Win32 Debug
+CFG=DLL_ORB Test_Server_Module - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=Test_Server_Module - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "Test_Server_Module.mak" CFG="Test_Server_Module - Win32 Debug"
+!MESSAGE NMAKE /f "Test_Server_Module.mak" CFG="DLL_ORB Test_Server_Module - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "Test_Server_Module - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "Test_Server_Module - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "DLL_ORB Test_Server_Module - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "DLL_ORB Test_Server_Module - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "Test_Server_Module - Win32 Release"
+!IF  "$(CFG)" == "DLL_ORB Test_Server_Module - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -56,7 +56,7 @@ 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 /dll /machine:I386
 # ADD LINK32 ACE.lib TAO.lib TAO_PortableServer.lib /nologo /dll /pdb:none /machine:I386 /out:"..\..\..\bin\Test_Server_Module.dll" /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"
 
-!ELSEIF  "$(CFG)" == "Test_Server_Module - Win32 Debug"
+!ELSEIF  "$(CFG)" == "DLL_ORB Test_Server_Module - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -88,8 +88,8 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "Test_Server_Module - Win32 Release"
-# Name "Test_Server_Module - Win32 Debug"
+# Name "DLL_ORB Test_Server_Module - Win32 Release"
+# Name "DLL_ORB Test_Server_Module - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx"
@@ -153,7 +153,7 @@ SOURCE=.\TestS.i
 
 SOURCE=.\Test.idl
 
-!IF  "$(CFG)" == "Test_Server_Module - Win32 Release"
+!IF  "$(CFG)" == "DLL_ORB Test_Server_Module - Win32 Release"
 
 # PROP Ignore_Default_Tool 1
 # Begin Custom Build
@@ -191,7 +191,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "Test_Server_Module - Win32 Debug"
+!ELSEIF  "$(CFG)" == "DLL_ORB Test_Server_Module - Win32 Debug"
 
 # PROP Ignore_Default_Tool 1
 # Begin Custom Build
diff --git a/TAO/tests/DLL_ORB/client.dsp b/TAO/tests/DLL_ORB/client.dsp
index f0ca1d961b6..051f2d93efe 100644
--- a/TAO/tests/DLL_ORB/client.dsp
+++ b/TAO/tests/DLL_ORB/client.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="DLL_ORB client" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=client - Win32 Debug
+CFG=DLL_ORB client - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=client - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "client.mak" CFG="client - Win32 Debug"
+!MESSAGE NMAKE /f "client.mak" CFG="DLL_ORB client - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "DLL_ORB client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "DLL_ORB client - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=client - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "client - Win32 Release"
+!IF  "$(CFG)" == "DLL_ORB client - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -52,7 +52,7 @@ 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 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 ACE.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace"
 
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
+!ELSEIF  "$(CFG)" == "DLL_ORB client - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -81,8 +81,8 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "client - Win32 Release"
-# Name "client - Win32 Debug"
+# Name "DLL_ORB client - Win32 Release"
+# Name "DLL_ORB client - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx"
@@ -90,9 +90,9 @@ LINK32=link.exe
 
 SOURCE=.\client.cpp
 
-!IF  "$(CFG)" == "client - Win32 Release"
+!IF  "$(CFG)" == "DLL_ORB client - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
+!ELSEIF  "$(CFG)" == "DLL_ORB client - Win32 Debug"
 
 # ADD CPP /I "..\..\.."
 
diff --git a/TAO/tests/DLL_ORB/server.dsp b/TAO/tests/DLL_ORB/server.dsp
index b1e7bc8fe26..bc52c72e7a9 100644
--- a/TAO/tests/DLL_ORB/server.dsp
+++ b/TAO/tests/DLL_ORB/server.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="DLL_ORB server" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=server - Win32 Debug
+CFG=DLL_ORB server - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=server - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "server.mak" CFG="server - Win32 Debug"
+!MESSAGE NMAKE /f "server.mak" CFG="DLL_ORB server - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "DLL_ORB server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "DLL_ORB server - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=server - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "server - Win32 Release"
+!IF  "$(CFG)" == "DLL_ORB server - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -52,7 +52,7 @@ 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 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 ACE.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace"
 
-!ELSEIF  "$(CFG)" == "server - Win32 Debug"
+!ELSEIF  "$(CFG)" == "DLL_ORB server - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -81,8 +81,8 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "server - Win32 Release"
-# Name "server - Win32 Debug"
+# Name "DLL_ORB server - Win32 Release"
+# Name "DLL_ORB server - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx"
@@ -90,9 +90,9 @@ LINK32=link.exe
 
 SOURCE=.\server.cpp
 
-!IF  "$(CFG)" == "server - Win32 Release"
+!IF  "$(CFG)" == "DLL_ORB server - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "server - Win32 Debug"
+!ELSEIF  "$(CFG)" == "DLL_ORB server - Win32 Debug"
 
 # ADD CPP /I "..\..\.."
 
diff --git a/TAO/tests/Exposed_Policies/Makefile b/TAO/tests/Exposed_Policies/Makefile
index 3c5b236fee2..ca29c777f12 100644
--- a/TAO/tests/Exposed_Policies/Makefile
+++ b/TAO/tests/Exposed_Policies/Makefile
@@ -272,35 +272,19 @@ realclean: clean
   $(TAO_ROOT)/tao/RTCORBA/RT_Policy_i.h \
   $(TAO_ROOT)/tao/RTCORBA/RT_Policy_i.i \
   $(TAO_ROOT)/tao/RTCORBA/RT_ORB.h \
-  $(TAO_ROOT)/tao/RTCORBA/Thread_Pool.h \
-  $(ACE_ROOT)/ace/Task.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Task.i \
-  $(ACE_ROOT)/ace/Task_T.h \
-  $(ACE_ROOT)/ace/Message_Queue.h \
-  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.i \
-  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Strategies.h \
-  $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Reactor.h \
   $(ACE_ROOT)/ace/Handle_Set.h \
@@ -315,37 +299,6 @@ realclean: clean
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Synch_Options.h \
-  $(ACE_ROOT)/ace/Synch_Options.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Strategies_T.i \
-  $(ACE_ROOT)/ace/Strategies_T.cpp \
-  $(ACE_ROOT)/ace/Service_Repository.h \
-  $(ACE_ROOT)/ace/Service_Types.h \
-  $(ACE_ROOT)/ace/Service_Types.i \
-  $(ACE_ROOT)/ace/Service_Repository.i \
-  $(ACE_ROOT)/ace/WFMO_Reactor.h \
-  $(ACE_ROOT)/ace/Process_Mutex.h \
-  $(ACE_ROOT)/ace/Process_Mutex.inl \
-  $(ACE_ROOT)/ace/WFMO_Reactor.i \
-  $(ACE_ROOT)/ace/Strategies.i \
-  $(ACE_ROOT)/ace/Message_Queue.i \
-  $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp \
-  $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i \
-  $(ACE_ROOT)/ace/Module.cpp \
-  $(ACE_ROOT)/ace/Stream_Modules.h \
-  $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  $(TAO_ROOT)/tao/RTCORBA/Thread_Pool.i \
   $(TAO_ROOT)/tao/RTCORBA/RT_ORB.i
 
 .obj/Policy_Verifier.o .obj/Policy_Verifier.so .shobj/Policy_Verifier.o .shobj/Policy_Verifier.so: Policy_Verifier.cpp Policy_Verifier.h CounterC.h \
diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.cpp b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
index ad5b87d306b..04ddf32bb08 100644
--- a/TAO/tests/Exposed_Policies/Policy_Tester.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
@@ -83,6 +83,30 @@ Policy_Tester::init (int argc,
             RT_Properties::read_from (arg, ACE_TRY_ENV);
           ACE_CHECK_RETURN (-1);
         }
+      else if ((arg = arg_shifter.get_the_parameter ("-BaseObjectIOR")))
+        {
+          if (this->rt_poa_properties_ == 0)
+            {
+              ACE_NEW_THROW_EX (this->rt_poa_properties_,
+                                RT_Properties,
+                                CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                                                  CORBA::COMPLETED_NO));
+              ACE_CHECK;
+            }
+          this->rt_poa_properties_->ior_source (arg);
+        }
+      else if ((arg = arg_shifter.get_the_parameter ("-OverriddenIOR")))
+        {
+          if (this->rt_object_properties_ == 0)
+            {
+              ACE_NEW_THROW_EX (this->rt_object_properties_,
+                                RT_Properties,
+                                CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                                                  CORBA::COMPLETED_NO));
+              ACE_CHECK;
+            }
+          this->rt_object_properties_->ior_source (arg);
+        }
       else
         arg_shifter.consume_arg ();
     }
diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
index c22b4a2f3e7..4563dfaa62a 100644
--- a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
@@ -44,7 +44,6 @@ Policy_Verifier::init (int argc,
           this->rt_object_properties_ =
             RT_Properties::read_from (arg, ACE_TRY_ENV);
           ACE_CHECK;
-
         }
       else if ((arg = arg_shifter.get_the_parameter ("-BaseObjectIOR")))
         {
diff --git a/TAO/tests/Exposed_Policies/run_test.pl b/TAO/tests/Exposed_Policies/run_test.pl
index 877b552791a..1bfc4949f2c 100755
--- a/TAO/tests/Exposed_Policies/run_test.pl
+++ b/TAO/tests/Exposed_Policies/run_test.pl
@@ -8,33 +8,26 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "../../../bin";
 require PerlACE::Run_Test;
 
-$server_conf = PerlACE::LocalFile ("server.conf");
-
-
 $poa_file = PerlACE::LocalFile ("POA.cfg");
 $obj_file = PerlACE::LocalFile ("Object.cfg");
 $base_ior_file = PerlACE::LocalFile ("default.ior");
 $overridden_ior_file = PerlACE::LocalFile ("overridden.ior");
 
-$SV = new PerlACE::Process ("server", "-ORBSvcConf $server_conf"
-                            . " -ORBendpoint iiop://localhost:0/priority=1"
-                            . " -ORBendpoint iiop://localhost:0/priority=4"
-                            . " -POAConfigFile $poa_file"
-                            . " -ObjectConfigFile $obj_file"
-                            . " -BaseObjectIOR $base_ior_file"
-                            . " -OverriddenIOR $overridden_ior_file");
+$SV = new PerlACE::Process ("server", 
+                            " -POAConfigFile $poa_file" .
+                            " -ObjectConfigFile $obj_file" . 
+                            " -BaseObjectIOR $base_ior_file" .
+                            " -OverriddenIOR $overridden_ior_file");
 
 if ($^O eq "dec_osf") {
     $poa_file = PerlACE::LocalFile ("POA.cfg.tru64");
     $obj_file = PerlACE::LocalFile ("Object.cfg.tru64");
 
-    $SV = new PerlACE::Process ("server", "-ORBSvcConf $server_conf"
-                               . " -ORBendpoint iiop://localhost:0/priority=21"
-                               . " -ORBendpoint iiop://localhost:0/priority=24"
-                               . " -POAConfigFile $poa_file"
-                               . " -ObjectConfigFile $obj_file"
-                               . " -BaseObjectIOR $base_ior_file"
-                               . " -OverriddenIOR $overridden_ior_file");
+    $SV = new PerlACE::Process ("server", 
+                                " -POAConfigFile $poa_file" .
+                                " -ObjectConfigFile $obj_file" .
+                                " -BaseObjectIOR $base_ior_file" .
+                                " -OverriddenIOR $overridden_ior_file");
 }
 
 $CL = new PerlACE::Process ("client", "-POAConfigFile $poa_file"
diff --git a/TAO/tests/Exposed_Policies/server.conf b/TAO/tests/Exposed_Policies/server.conf
deleted file mode 100644
index 7739b56fb8e..00000000000
--- a/TAO/tests/Exposed_Policies/server.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# $Id$
-#
-
-static Advanced_Resource_Factory "-ORBReactorRegistry per-priority"
diff --git a/TAO/tests/Exposed_Policies/svc.conf b/TAO/tests/Exposed_Policies/svc.conf
deleted file mode 100644
index 7933e5a54a2..00000000000
--- a/TAO/tests/Exposed_Policies/svc.conf
+++ /dev/null
@@ -1 +0,0 @@
-static Advanced_Resource_Factory "-ORBReactorType tp -ORBReactorRegistry per-priority"
diff --git a/TAO/tests/Faults/middle.dsp b/TAO/tests/Faults/middle.dsp
index 970003451ac..ba3652b6db3 100644
--- a/TAO/tests/Faults/middle.dsp
+++ b/TAO/tests/Faults/middle.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="Middle Server" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="Faults Middle Server" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=Middle Server - Win32 Debug
+CFG=Faults Middle Server - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=Middle Server - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "server.mak" CFG="Middle Server - Win32 Debug"
+!MESSAGE NMAKE /f "server.mak" CFG="Faults Middle Server - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "Middle Server - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Middle Server - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Faults Middle Server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Faults Middle Server - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=Middle Server - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "Middle Server - Win32 Release"
+!IF  "$(CFG)" == "Faults Middle Server - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -53,7 +53,7 @@ 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 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 ace.lib tao.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"
 
-!ELSEIF  "$(CFG)" == "Middle Server - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Faults Middle Server - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -82,8 +82,8 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "Middle Server - Win32 Release"
-# Name "Middle Server - Win32 Debug"
+# Name "Faults Middle Server - Win32 Release"
+# Name "Faults Middle Server - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -131,7 +131,7 @@ SOURCE=.\testS.h
 
 SOURCE=.\test.idl
 
-!IF  "$(CFG)" == "Middle Server - Win32 Release"
+!IF  "$(CFG)" == "Faults Middle Server - Win32 Release"
 
 # PROP Ignore_Default_Tool 1
 USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"	
@@ -170,7 +170,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "Middle Server - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Faults Middle Server - Win32 Debug"
 
 # PROP Ignore_Default_Tool 1
 USERDEP__TEST_="..\..\..\bin\tao_idl.exe"	
diff --git a/TAO/tests/Multiple/Client.dsp b/TAO/tests/Multiple/Client.dsp
index c956c5d7627..36e90ce9b33 100644
--- a/TAO/tests/Multiple/Client.dsp
+++ b/TAO/tests/Multiple/Client.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="Client" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="Multiple Client" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=Client - Win32 Debug
+CFG=Multiple Client - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=Client - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "Client.mak" CFG="Client - Win32 Debug"
+!MESSAGE NMAKE /f "Client.mak" CFG="Multiple Client - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "Client - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Client - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Multiple Client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Multiple Client - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=Client - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "Client - Win32 Release"
+!IF  "$(CFG)" == "Multiple Client - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -53,7 +53,7 @@ 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 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 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"
 
-!ELSEIF  "$(CFG)" == "Client - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Multiple Client - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -82,8 +82,8 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "Client - Win32 Release"
-# Name "Client - Win32 Debug"
+# Name "Multiple Client - Win32 Release"
+# Name "Multiple Client - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat"
@@ -123,7 +123,7 @@ SOURCE=.\MultipleC.h
 
 SOURCE=.\Multiple.idl
 
-!IF  "$(CFG)" == "Client - Win32 Release"
+!IF  "$(CFG)" == "Multiple Client - Win32 Release"
 
 # PROP Ignore_Default_Tool 1
 USERDEP__MULTI="..\..\..\bin\Release\tao_idl.exe"	
@@ -162,7 +162,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "Client - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Multiple Client - Win32 Debug"
 
 # PROP Ignore_Default_Tool 1
 USERDEP__MULTI="..\..\..\bin\tao_idl.exe"	
diff --git a/TAO/tests/Multiple/Server.dsp b/TAO/tests/Multiple/Server.dsp
index c8d6c66f285..e78eeaf1dcb 100644
--- a/TAO/tests/Multiple/Server.dsp
+++ b/TAO/tests/Multiple/Server.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="Server" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="Multiple Server" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=Server - Win32 Debug
+CFG=Multiple Server - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@ CFG=Server - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "Server.mak" CFG="Server - Win32 Debug"
+!MESSAGE NMAKE /f "Server.mak" CFG="Multiple Server - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "Server - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Server - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Multiple Server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Multiple Server - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=Server - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "Server - Win32 Release"
+!IF  "$(CFG)" == "Multiple Server - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -53,7 +53,7 @@ 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 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 ace.lib tao.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"
 
-!ELSEIF  "$(CFG)" == "Server - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Multiple Server - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -82,8 +82,8 @@ LINK32=link.exe
 
 # Begin Target
 
-# Name "Server - Win32 Release"
-# Name "Server - Win32 Debug"
+# Name "Multiple Server - Win32 Release"
+# Name "Multiple Server - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat"
@@ -139,7 +139,7 @@ SOURCE=.\MultipleS.h
 
 SOURCE=.\Multiple.idl
 
-!IF  "$(CFG)" == "Server - Win32 Release"
+!IF  "$(CFG)" == "Multiple Server - Win32 Release"
 
 # PROP Ignore_Default_Tool 1
 USERDEP__MULTI="..\..\..\bin\Release\tao_idl.exe"	
@@ -178,7 +178,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "Server - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Multiple Server - Win32 Debug"
 
 # PROP Ignore_Default_Tool 1
 USERDEP__MULTI="..\..\..\bin\tao_idl.exe"	
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.dsw b/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.dsw
index 40026ec9b68..dc234fff2ee 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.dsw
+++ b/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
-Project: "Muxing Client"=.\client.dsp - Package Owner=<4>
+Project: "Oneways_Invoking_Twoways Client"=.\client.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -15,7 +15,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Muxing Server"=.\server.dsp - Package Owner=<4>
+Project: "Oneways_Invoking_Twoways Server"=.\server.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
diff --git a/TAO/tests/RTCORBA/Banded_Connections/Makefile b/TAO/tests/RTCORBA/Banded_Connections/Makefile
index 121fe7b1b65..a583007d01f 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/Makefile
+++ b/TAO/tests/RTCORBA/Banded_Connections/Makefile
@@ -42,9 +42,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 include $(TAO_ROOT)/taoconfig.mk
 
-RT_TAO_SRVR_LIBS := -lTAO_Strategies $(RT_TAO_SRVR_LIBS)
-RT_TAO_CLNT_LIBS := -lTAO_Strategies $(RT_TAO_CLNT_LIBS)
-
 #----------------------------------------------------------------------------
 #       Local targets
 #----------------------------------------------------------------------------
@@ -271,120 +268,13 @@ realclean: clean
   $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
-  $(TAO_ROOT)/tao/RTCORBA/Pool_Per_Endpoint.h \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Task.i \
-  $(ACE_ROOT)/ace/Task_T.h \
-  $(ACE_ROOT)/ace/Message_Queue.h \
-  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.i \
-  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Strategies.h \
-  $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Synch_Options.h \
-  $(ACE_ROOT)/ace/Synch_Options.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Strategies_T.i \
-  $(ACE_ROOT)/ace/Strategies_T.cpp \
-  $(ACE_ROOT)/ace/Service_Repository.h \
-  $(ACE_ROOT)/ace/Service_Types.h \
-  $(ACE_ROOT)/ace/Service_Types.i \
-  $(ACE_ROOT)/ace/Service_Repository.i \
-  $(ACE_ROOT)/ace/WFMO_Reactor.h \
-  $(ACE_ROOT)/ace/Process_Mutex.h \
-  $(ACE_ROOT)/ace/Process_Mutex.inl \
-  $(ACE_ROOT)/ace/WFMO_Reactor.i \
-  $(ACE_ROOT)/ace/Strategies.i \
-  $(ACE_ROOT)/ace/Message_Queue.i \
-  $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp \
-  $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i \
-  $(ACE_ROOT)/ace/Module.cpp \
-  $(ACE_ROOT)/ace/Stream_Modules.h \
-  $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  $(TAO_ROOT)/tao/RTCORBA/Pool_Per_Endpoint.i \
   $(TAO_ROOT)/tao/RTPortableServer/RTPortableServer.h \
   $(TAO_ROOT)/tao/RTPortableServer/rtportableserver_export.h \
   $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.h \
   $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.i \
-  $(TAO_ROOT)/tao/Strategies/advanced_resource.h \
-  $(TAO_ROOT)/tao/Strategies/strategies_export.h \
-  $(TAO_ROOT)/tao/default_resource.h \
-  $(TAO_ROOT)/tao/Resource_Factory.h \
-  $(TAO_ROOT)/tao/Pluggable.h \
-  $(TAO_ROOT)/tao/Pluggable.i \
-  $(TAO_ROOT)/tao/Protocol_Factory.h \
-  $(TAO_ROOT)/tao/default_resource.i \
-  $(TAO_ROOT)/tao/ORB_Core.h \
-  $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/Policy_Set.h \
-  $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/Policy_Manager.i \
-  $(TAO_ROOT)/tao/params.h \
-  $(TAO_ROOT)/tao/params.i \
-  $(TAO_ROOT)/tao/Adapter.h \
-  $(TAO_ROOT)/tao/Adapter.i \
-  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(TAO_ROOT)/tao/Parser_Registry.h \
-  $(TAO_ROOT)/tao/Parser_Registry.i \
-  $(TAO_ROOT)/tao/Service_Callbacks.h \
-  $(TAO_ROOT)/tao/Service_Callbacks.i \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
-  $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(TAO_ROOT)/tao/Interceptor_List.h \
-  $(TAO_ROOT)/tao/Interceptor_List.inl \
-  $(TAO_ROOT)/tao/Protocols_Hooks.h \
-  $(TAO_ROOT)/tao/ORB_Core.i \
-  $(TAO_ROOT)/tao/Strategies/advanced_resource.i
+  ../check_supported_priorities.cpp \
+  $(ACE_ROOT)/ace/Sched_Params.h \
+  $(ACE_ROOT)/ace/Sched_Params.i
 
 .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp testC.h \
   $(TAO_ROOT)/tao/corba.h \
@@ -574,12 +464,13 @@ realclean: clean
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   testC.i $(ACE_ROOT)/ace/Get_Opt.h \
   $(ACE_ROOT)/ace/Get_Opt.i \
-  $(ACE_ROOT)/ace/Sched_Params.h \
-  $(ACE_ROOT)/ace/Sched_Params.i \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
   $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
-  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
+  ../check_supported_priorities.cpp \
+  $(ACE_ROOT)/ace/Sched_Params.h \
+  $(ACE_ROOT)/ace/Sched_Params.i
 
 .obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \
   $(TAO_ROOT)/tao/corba.h \
diff --git a/TAO/tests/RTCORBA/Banded_Connections/README b/TAO/tests/RTCORBA/Banded_Connections/README
index 3def9f0b6e6..ffca82ce136 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/README
+++ b/TAO/tests/RTCORBA/Banded_Connections/README
@@ -4,218 +4,42 @@ This is a test for RTCORBA::PriorityBandedConnectionPolicy.
 
 Description
 -----------
-This test consists of seven mini-tests, each exercising
-some aspect of PriorityBandedConnectionPolicy:
 
-(Server)
+This test consists of several mini-tests, each exercising some aspect
+of PriorityBandedConnectionPolicy:
 
-1. Attempt to create a POA with
-   RTCORBA::PriorityBandedConnectionPolicy but without the
-   RTCORBA::PriorityModelPolicy.  Should get POA::InvalidPolicy
-   exception.
+(Server)
 
-2. Attempt to create a POA with
-   RTCORBA::PriorityBandedConnectionPolicy where bands do not match
-   the resources of the POA, i.e., threadpool lanes/endpoints.
-   Should get POA::InvalidPolicy exception.
+- Attempt to create a POA for which the bands do not match thread
+  lanes.  Should get POA::InvalidPolicy exception.
 
-3. Create a POA with RTCORBA::SERVER_DECLARED priority model and
-   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.
+- Attempt to register an servant with priority that doesn't match the
+  resources/configuration of that POA, i.e., its bands/lanes.  Should
+  get BAD_PARAM exception.
 
 (Client)
 
-4. Set RTCORBA::PriorityBandedConnectionPolicy on the object where
-   bands do not match server resources, i.e., threadpool
-   lanes/endpoints.  Attempt an invocation on the object.  Should get
-   INV_POLICY exception.
-
-5. Set RTCORBA::PriorityBandedConnectionPolicy on the object with
-   CLIENT_PROPAGATED priority model where bands match server
-   resources.  Attempt several invocations on the object, changing the
-   priority of the invoking client thread before each.  This should
-   succeed, Verify that correct band is being used for each invocation, and
-   that appropriate server threadpool lane is providing the service.
-
-6. Now attempt one more invocation on the same object (with
-   CLIENT_PROPAGATED and bands), but with the client thread priority
-   not matching any of the bands.  Should get INV_POLICY exception.
-
-7. Attempt invocation on an object with SERVER_DECLARED priority model
-   and RTCORBA::PriorityBandedConnectionPolicy set using the client
-   thread with priority not matching any of the object's priority
-   bands.  This should succeed. Verify the correct band and server
-   threadpool lane are being used for the invocation.
-
-Scenario:
-
-
-To run (on Unix):
--------
-$./server [-n <ior_output_file1> -o <ior_output_file2>]
-          [-w <wrong_priority> -b <bands_file>]
-           -p <poa_priority>
-           -ORBdebuglevel 1 -ORBSvcConf server.conf
-           -ORBendpoint iiop://targethost:0/priority=<priority_for_band1>
-           -ORBendpoint iiop://targethost:0/priority=<priority_for_band2>
-           [more endpoints if desired]
-
-$./client [-n <ior1> -o <ior2>]
-           -a <client_priority1> -b <client_priority2> -c <client_priority3>
-
-
-Options:
---------
-         Server:
-
--n <ior_output_file1>   Default: test1.ior
-                        Filename for output of the first object's IOR
-                        (the object with CLIENT_PROPAGATED priority
-                        model.)
-
--o <ior_output_file2>   Default: test2.ior
-                        Filename for output of the second object's IOR
-                        (the object with SERVER_DECLARED priority
-                        model and PriorityBandedConnectionPolicy set.)
-
--b <bands_file>         Default: bands
-                        Name of the file containing priority bands
-                        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
-                        is used to separate values.  For example:
-                        65 69 74 76 80 80
-
--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>.
-
--w <wrong_priority>     Default: -1
-                        Priority not matching any of the priority
-                        bands.  Used for test #3.
-
--ORBdebuglevel 1        Default: none
-                        This ORB option is useful for verifying that
-                        correct band/threadpool lane are used during
-                        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
--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
-the <bands_file>.  For an example, see run_test.pl
-
-         Client:
-
--n <ior1>               Default: file://test1.ior
-                        IOR for the first object (with
-                        CLIENT_PROPAGATED priority model).
-
--o <ior2>               Default: file://test2.ior
-                        IOR for the second object (with
-                        SERVER_DECLARED priority model and priority
-                        bands).
-
--a <client_priority1>   Default: -1, must be overridden.
-                        Client thread priority that will be used for
-                        one of the invocations.  Must match one of the
-                        bands specified in the <bands_file>.  Used for
-                        test #5.
-
--b <client_priority2>   Default: -1, must be overridden.
-                        Client thread priority that will be used for
-                        one of the invocations.  Must match one of the
-                        bands specified in the <bands_file>.  Used for
-                        test #5.
-
--c <client_priority3>   Default: -1, must be overridden.
-                        Client thread priority that will be used for
-                        one of the invocations.  Must not match any
-                        of the bands specified in the <bands_file>.
-                        Used for test #6.
-
-Expected output:
-----------------
-Below is the output from run_test.pl on Unix. (On windows, different
-priority values are used).  See run_test.pl for more info.  Note, due
-to the use of -ORBdebuglevel option, test output may differ from what
-is shown above as ORB debug messages are modified and added.
-
-In general, tests 1, 2, 3, 4, and 6 must result in expected exceptions
-being caught.  In test 5 and 7, object and server thread priorities
-must match one of the priority bands, and all of the priority values
-must correspond to those specified with the command-line options.
-
-********** RTCORBA Priority Banded Connections Unit Test
-TAO (25332|1) Loaded default protocol <IIOP_Factory>
-TAO (25332|1) Loaded default protocol <UIOP_Factory>
-TAO (25332|1) Loaded default protocol <SHMIOP_Factory>
-
-     Test 1
-InvalidPolicy exception is caught as expected.
-
-     Test 2
-InvalidPolicy exception is caught as expected.
-
-     Test 3
-BAD_PARAM exception is caught as expected.
-
-Activated object one as <IOR:000000000000000d49444c3a546573743a312e30000000000000000100000000000000da00010200000
-0000a6c6f63616c686f737400e0150000002314010f004e53543a1ade88000056de000000010000000100000000000000010000000100000
-0000400000000000000080000000054414f000000000100000014000000000001000100000000000101090000000054414f0200000042000
-00000000000030000000a6c6f63616c686f737400e015004200000000000a6c6f63616c686f737400e017005000000000000a6c6f63616c6
-86f737400e016004b0000000000020000001a0000000000000001544100020000000a00000000000000000000>
-
-
-Activated object two as <IOR:000000000000000d49444c3a546573743a312e30000000000000000100000000000000f600010200000
-0000a6c6f63616c686f737400e0150000002314010f004e53543a1ade8800005aff000000020000000100000000000000010000000100000
-0000400000000000000080000000054414f000000000100000014000000000001000100000000000101090000000054414f0200000042000
-00000000000030000000a6c6f63616c686f737400e015004200000000000a6c6f63616c686f737400e017005000000000000a6c6f63616c6
-86f737400e016004b0000000000020000003600000000000000025441000700000014000000000000000300410045004a004c00500050544
-100020000000a00000000000000010043>
-
-
-     Test 4
-INV_POLICY exception is caught as expected.
-
-     Test 5
-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:
-1) 65  69
-2) 74  76
-3) 80  80
-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
+- Set RTCORBA::PriorityBandedConnectionPolicy on the object where
+  bands do not match server resources, i.e., threadpool lanes.
+  Attempt an invocation on the object.  Should get INV_POLICY
+  exception.
 
-Object bands:
-1) 65  69
-2) 74  76
-3) 80  80
-Object priority: 80  Servant thread priority: 80
-Band 3 was used for this invocation
+- Now attempt one more invocation on the same object (with
+  CLIENT_PROPAGATED and bands), but with the client thread priority
+  not matching any of the bands.  Should get INV_POLICY exception.
 
-     Test 6
-INV_POLICY exception is caught as expected.
+- Set RTCORBA::PriorityBandedConnectionPolicy on the object with
+  CLIENT_PROPAGATED priority model where bands match server resources.
+  Attempt several invocations on the object, changing the priority of
+  the invoking client thread before each.  This should succeed.
+  Verify that correct band is being used for each invocation, and that
+  appropriate server threadpool lane is providing the service.
 
-     Test 7
-TAO (25332|4) IIOP connection from client<127.0.0.1:57370> on 19
+- Attempt invocation on an object with SERVER_DECLARED priority model
+  and RTCORBA::PriorityBandedConnectionPolicy set using the client
+  thread with priority not matching any of the object's priority
+  bands.  This should succeed. Verify the correct band and server
+  threadpool lane are being used for the invocation.
 
-Object bands:
-1) 65  69
-2) 74  76
-3) 80  80
-Object priority: 67  Servant thread priority: 66
-Band 1 was used for this invocation
 
-Server ORB event loop finished
+Check run_test.pl to see how to set up a run for this test.
diff --git a/TAO/tests/RTCORBA/Banded_Connections/bands.nt b/TAO/tests/RTCORBA/Banded_Connections/bands.nt
index b2d0253c984..0cf0ee603ad 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/bands.nt
+++ b/TAO/tests/RTCORBA/Banded_Connections/bands.nt
@@ -1 +1 @@
-0 1 2 3 4 5
+0 0 1 1
diff --git a/TAO/tests/RTCORBA/Banded_Connections/client.bor b/TAO/tests/RTCORBA/Banded_Connections/client.bor
index 82aa4b81778..30bfb08ef2d 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/client.bor
+++ b/TAO/tests/RTCORBA/Banded_Connections/client.bor
@@ -13,15 +13,11 @@ OBJFILES = \
 CFLAGS = \
 	$(ACE_CFLAGS) \
 	$(TAO_CFLAGS) \
-	$(TAO_STRATEGIES_CFLAGS) \
-        $(TAO_PORTABLESERVER_CFLAGS) \
         $(TAO_RTCORBA_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
 	$(TAO_LIB) \
-	$(TAO_STRATEGIES_LIB) \
-        $(TAO_PORTABLESERVER_LIB) \
         $(TAO_RTCORBA_LIB)
 
 CPPDIR = .
diff --git a/TAO/tests/RTCORBA/Banded_Connections/client.cpp b/TAO/tests/RTCORBA/Banded_Connections/client.cpp
index f524a2f985a..5d4e5abca60 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/client.cpp
+++ b/TAO/tests/RTCORBA/Banded_Connections/client.cpp
@@ -2,20 +2,18 @@
 
 #include "testC.h"
 #include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
 #include "tao/RTCORBA/RTCORBA.h"
+#include "../check_supported_priorities.cpp"
 
+// Default IOR files.
 const char *ior1 = "file://test1.ior";
 const char *ior2 = "file://test2.ior";
-CORBA::Short client_priority1 = -1;
-CORBA::Short client_priority2 = -1;
-CORBA::Short client_priority3 = -1;
 
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "n:o:a:b:c:");
-  int c, result;
+  ACE_Get_Opt get_opts (argc, argv, "n:o:");
+  int c;
 
   while ((c = get_opts ()) != -1)
     switch (c)
@@ -26,35 +24,6 @@ parse_args (int argc, char *argv[])
       case 'o':
         ior2 = get_opts.optarg;
         break;
-      case 'a':
-        result = ::sscanf (get_opts.optarg,
-                           "%hd",
-                           &client_priority1);
-        if (result == 0 || result == EOF)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to process <-a> option"),
-                            -1);
-        break;
-
-      case 'b':
-        result = ::sscanf (get_opts.optarg,
-                           "%hd",
-                           &client_priority2);
-        if (result == 0 || result == EOF)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to process <-b> option"),
-                            -1);
-        break;
-
-      case 'c':
-        result = ::sscanf (get_opts.optarg,
-                           "%hd",
-                           &client_priority3);
-        if (result == 0 || result == EOF)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to process <-c> option"),
-                            -1);
-        break;
 
       case '?':
       default:
@@ -62,53 +31,30 @@ parse_args (int argc, char *argv[])
                            "usage:  %s "
                            "-n <ior> "
                            "-o <ior> "
-                           "-a <client_priority1>"
-                           "-b <client_priority2>"
-                           "-c <client_priority3>"
                            "\n",
                            argv [0]),
                           -1);
       }
 
-  if (client_priority1 < 0
-      || client_priority2 < 0
-      || client_priority3 < 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Valid client priorities must be"
-                       " specified.\nSee README file for more info\n"),
-                      -1);
-
-    return 0;
-}
-
-int
-check_for_nil (CORBA::Object_ptr obj, const char *msg)
-{
-  if (CORBA::is_nil (obj))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "ERROR: Object reference <%s> is nil\n",
-                       msg),
-                      -1);
-  else
-    return 0;
+  return 0;
 }
 
 CORBA::Short
 get_server_priority (Test_ptr server,
                      CORBA::Environment &ACE_TRY_ENV)
 {
+  // Get the Priority Model Policy from the stub.
   CORBA::Policy_var policy =
     server->_get_policy (RTCORBA::PRIORITY_MODEL_POLICY_TYPE,
                          ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
 
+  // Narrow down to correct type.
   RTCORBA::PriorityModelPolicy_var priority_policy =
     RTCORBA::PriorityModelPolicy::_narrow (policy.in (), ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
 
-  if (check_for_nil (priority_policy.in (), "PriorityModelPolicy") == -1)
-    return -1;
-
+  // Make sure that we have the SERVER_DECLARED priority model.
   RTCORBA::PriorityModel priority_model =
     priority_policy->priority_model (ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
@@ -118,6 +64,7 @@ get_server_priority (Test_ptr server,
                        "RTCORBA::SERVER_DECLARED!\n"),
                       -1);
 
+  // Return the server priority.
   return priority_policy->server_priority (ACE_TRY_ENV);
 }
 
@@ -128,20 +75,26 @@ invocation_exception_test (Test_ptr obj,
 {
   ACE_TRY
     {
-      obj->test_method (priority,
+      // Invoke method on test object.
+      obj->test_method (1,
+                        priority,
                         ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      ACE_DEBUG ((LM_DEBUG, "Test Succeeded: no exception caught\n"));
+      // This next line of code should not run because an exception
+      // should have been raised.
+      ACE_DEBUG ((LM_DEBUG, "ERROR: no exception caught\n"));
     }
   ACE_CATCH (CORBA::INV_POLICY, ex)
     {
+      // Expected exception.
       ACE_DEBUG ((LM_DEBUG,
                   "INV_POLICY exception is caught as expected.\n"));
     }
   ACE_CATCHANY
     {
-      ACE_DEBUG ((LM_DEBUG, "Test failed: unexpected exception caught\n"));
+      // Unexpected exception.
+      ACE_DEBUG ((LM_DEBUG, "Error: unexpected exception caught\n"));
       ACE_RE_THROW;
     }
   ACE_ENDTRY;
@@ -151,87 +104,75 @@ invocation_exception_test (Test_ptr obj,
 int
 main (int argc, char *argv[])
 {
+  // Make sure we can support multiple priorities that are required
+  // for this test.
+  check_supported_priorities ();
+
   ACE_TRY_NEW_ENV
     {
-      // First check that we have sufficient priority range to run the
-      // test, i.e., more than 1 priority level.
-      int max_priority =
-        ACE_Sched_Params::priority_max (ACE_SCHED_OTHER);
-      int min_priority =
-        ACE_Sched_Params::priority_min (ACE_SCHED_OTHER);
-
-      if (max_priority == min_priority)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "Not enough priority levels on this platform"
-                      "to run the test, aborting\n"));
-          return 0;
-        }
-
-      // Initialize the ORB, resolve references and parse arguments.
-
-      // ORB.
+      // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc,
+                         argv,
+                         "",
+                         ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       // Parse arguments.
-      if (parse_args (argc, argv) != 0)
-        return 1;
+      int result =
+        parse_args (argc,
+                    argv);
+      if (result != 0)
+        return result;
 
-      // RTORB.
+      // Get the RTORB.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTORB",
+                                         ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in (),
-                                                           ACE_TRY_ENV);
+
+      RTCORBA::RTORB_var rt_orb =
+        RTCORBA::RTORB::_narrow (object.in (),
+                                 ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      if (check_for_nil (rt_orb.in (), "RTORB") == -1)
-        return 1;
 
-      // RTCurrent.
+      // Get the RTCurrent.
       object =
-        orb->resolve_initial_references ("RTCurrent", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTCurrent",
+                                         ACE_TRY_ENV);
       ACE_TRY_CHECK;
+
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in (), ACE_TRY_ENV);
+        RTCORBA::Current::_narrow (object.in (),
+                                   ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       // Test object 1 (with CLIENT_PROPAGATED priority model).
       object =
-        orb->string_to_object (ior1, ACE_TRY_ENV);
+        orb->string_to_object (ior1,
+                               ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       Test_var client_propagated_obj =
         Test::_narrow (object.in (), ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      if (check_for_nil (client_propagated_obj.in (),
-                         "client_propagated_obj")
-          == -1)
-        return 1;
 
       // Test object 2 (with SERVER_DECLARED priority model).
-      object = orb->string_to_object (ior2, ACE_TRY_ENV);
+      object = orb->string_to_object (ior2,
+                                      ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       Test_var server_declared_obj =
         Test::_narrow (object.in (), ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      if (check_for_nil (server_declared_obj.in (),
-                         "server_declared_obj")
-          == -1)
-        return 1;
-
-      // Set client thread's priority.
-      current->the_priority (client_priority1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
 
-      // Test 4: Attempt to set priority bands that do not match
-      // server resource configuration on the <client_propagated_obj>.
+      // Test: Attempt to set priority bands that do not match server
+      // resource configuration on the <client_propagated_obj>.
       // Should get INV_POLICY exception.
       ACE_DEBUG ((LM_DEBUG,
-                  "\n     Test 4\n"));
+                  "\n<---Test--->: Client bands do not match server lanes\n\n"));
 
+      // False bands.
       RTCORBA::PriorityBands false_bands;
       false_bands.length (2);
       false_bands[0].low = 10000;
@@ -241,11 +182,12 @@ main (int argc, char *argv[])
       CORBA::PolicyList policies;
       policies.length (1);
       policies[0] =
-        rt_orb->create_priority_banded_connection_policy
-        (false_bands,
-         ACE_TRY_ENV);
+        rt_orb->create_priority_banded_connection_policy (false_bands,
+                                                          ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
+      // Set false bands at the object level.  Note that a new object
+      // is returned.
       object =
         client_propagated_obj->_set_policy_overrides (policies,
                                                       CORBA::SET_OVERRIDE,
@@ -255,80 +197,101 @@ main (int argc, char *argv[])
       client_propagated_obj =
         Test::_narrow (object.in (), ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      if (check_for_nil (client_propagated_obj.in (),
-                         "client_propagated_obj")
-          == -1)
-        return 1;
 
+      // Invoking on this object with false bands should produce an
+      // exception.
       invocation_exception_test (client_propagated_obj.in (),
-                                 client_priority1,
+                                 0,
                                  ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      // Now set the priority bands that match server resource
-      // configuration on the <client_propagated_obj>.
-      CORBA::Policy_var policy =
+      // Get the correct bands from the <server_declared_obj>.
+      policies[0] =
         server_declared_obj->_get_policy (RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE,
                                           ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      policies[0] = policy;
+      RTCORBA::PriorityBandedConnectionPolicy_var bands_policy =
+        RTCORBA::PriorityBandedConnectionPolicy::_narrow (policies[0]);
+
+      RTCORBA::PriorityBands_var bands =
+        bands_policy->priority_bands ();
 
+      // Set the proper bands at the object level.  Note that a new
+      // object is returned.
       object =
         client_propagated_obj->_set_policy_overrides (policies,
                                                       CORBA::SET_OVERRIDE,
                                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
+      // Overwrite existing <client_propagated_obj>.
       client_propagated_obj =
         Test::_narrow (object.in (), ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      if (check_for_nil (client_propagated_obj.in (),
-                         "client_propagated_obj")
-          == -1)
-        return 1;
 
-      // Test 5: Make invocations on the <client_propagated_obj>,
-      // changing the priority of the invoking thread.
+      // Test: Attempt invocation on <client_propagated_obj> with
+      // client thread priority not matching any of the bands.  Should
+      // get INV_POLICY exception.
       ACE_DEBUG ((LM_DEBUG,
-                  "\n     Test 5\n"));
+                  "\n<---Test--->: Client threads does not match band\n\n"));
 
-      client_propagated_obj->test_method (client_priority1,
-                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      // Choose a priority one higher than the high priority of the
+      // highest band.
+      CORBA::Short client_priority =
+        bands[bands->length () - 1].high + 1;
 
-      current->the_priority (client_priority2, ACE_TRY_ENV);
+      // Reset the current thread's priority.
+      current->the_priority (client_priority,
+                             ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      client_propagated_obj->test_method (client_priority2,
-                                          ACE_TRY_ENV);
+      // Invoking on this object with an invalid client thread
+      // priority should produce an exception.
+      invocation_exception_test (client_propagated_obj.in (),
+                                 client_priority,
+                                 ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      // Test 6: Attempt invocation on <client_propagated_obj> with
-      // client thread priority not matching any of the bands.  Should
-      // get INV_POLICY exception.
+      // Test: Make invocations on the <client_propagated_obj>.
       ACE_DEBUG ((LM_DEBUG,
-                  "\n     Test 6\n"));
+                  "\n<---Test--->: Invoking on client propagated object\n\n"));
 
-      current->the_priority (client_priority3, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      // Make an invocation for each band.
+      for (CORBA::ULong i = 0;
+           i < bands->length ();
+           ++i)
+        {
+          // Select a priority in the middle of the band.
+          CORBA::Short client_priority =
+            (bands[i].low + bands[i].high) / 2;
 
-      invocation_exception_test (client_propagated_obj.in (),
-                                 client_priority3,
+          // Reset the current thread's priority.
+          current->the_priority (client_priority,
                                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+          ACE_TRY_CHECK;
 
-      // Test 7: Attempt invocation with the same thread priority, but
+          // Invoke test method on server.
+          client_propagated_obj->test_method (1, // CLIENT_PROPAGATED
+                                              client_priority,
+                                              ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+        }
+
+      // Test: Attempt invocation with the same thread priority, but
       // now on the <server_declared_obj>.  This should succeed.
       ACE_DEBUG ((LM_DEBUG,
-                  "\n     Test 7\n"));
+                  "\n<---Test--->: Invoking on server declared object\n\n"));
 
+      // Get the <server_priority> from the stub.
       CORBA::Short server_priority =
         get_server_priority (server_declared_obj.in (),
                              ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      server_declared_obj->test_method (server_priority,
+      // Invoke test method on server.
+      server_declared_obj->test_method (0, // SERVER_DECLARED
+                                        server_priority,
                                         ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
@@ -346,4 +309,3 @@ main (int argc, char *argv[])
 
   return 0;
 }
-
diff --git a/TAO/tests/RTCORBA/Banded_Connections/client.dsp b/TAO/tests/RTCORBA/Banded_Connections/client.dsp
index 02069097f06..f1a2115f074 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/client.dsp
+++ b/TAO/tests/RTCORBA/Banded_Connections/client.dsp
@@ -19,8 +19,6 @@ CFG=BANDED_CONNECTIONS CLIENT - WIN32 DEBUG
 !MESSAGE 
 !MESSAGE "Banded_Connections Client - Win32 Release" (based on "Win32 (x86) Console Application")
 !MESSAGE "Banded_Connections Client - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Banded_Connections Client - Win32 Static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Banded_Connections Client - Win32 Static Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -53,7 +51,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 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 ace.lib TAO.lib TAO_Strategies.lib TAO_RTCORBA.lib TAO_RTPortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 ace.lib TAO.lib TAO_RTCORBA.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA"
 
 !ELSEIF  "$(CFG)" == "Banded_Connections Client - Win32 Debug"
 
@@ -78,61 +76,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 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 TAO_Strategiesd.lib TAO_RTCORBAd.lib TAO_RTPortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
-
-!ELSEIF  "$(CFG)" == "Banded_Connections Client - Win32 Static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Banded_Connections_Client___Win32_Static_Release"
-# PROP BASE Intermediate_Dir "Banded_Connections_Client___Win32_Static_Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Static_Release"
-# PROP Intermediate_Dir "Static_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "ACE_AS_STATIC_LIBS" /D "TAO_AS_STATIC_LIBS" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib TAO.lib TAO_Strategies.lib TAO_RTCORBA.lib TAO_RTPortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
-# ADD LINK32 aces.lib TAOs.lib TAO_Strategiess.lib TAO_RTCORBAs.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
-
-!ELSEIF  "$(CFG)" == "Banded_Connections Client - Win32 Static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Banded_Connections_Client___Win32_Static_Debug"
-# PROP BASE Intermediate_Dir "Banded_Connections_Client___Win32_Static_Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Static_Debug"
-# PROP Intermediate_Dir "Static_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "ACE_AS_STATIC_LIBS" /D "TAO_AS_STATIC_LIBS" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib TAO.lib TAO_Strategies.lib TAO_RTCORBA.lib TAO_RTPortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
-# ADD LINK32 acesd.lib TAOsd.lib TAO_Strategiessd.lib TAO_RTCORBAsd.lib advapi32.lib user32.lib /nologo /subsystem:console /incremental:yes /debug /machine:I386 /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 aced.lib TAOd.lib TAO_RTCORBAd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA"
 
 !ENDIF 
 
@@ -140,8 +84,6 @@ LINK32=link.exe
 
 # Name "Banded_Connections Client - Win32 Release"
 # Name "Banded_Connections Client - Win32 Debug"
-# Name "Banded_Connections Client - Win32 Static Release"
-# Name "Banded_Connections Client - Win32 Static Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -254,82 +196,6 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "Banded_Connections Client - Win32 Static Release"
-
-USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl_static.exe"	
-# Begin Custom Build
-InputPath=.\test.idl
-InputName=test
-
-BuildCmds= \
-	..\..\..\..\bin\release\tao_idl_static -Ge 1 -Gd $(InputName).idl
-
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "Banded_Connections Client - Win32 Static Debug"
-
-USERDEP__TEST_="..\..\..\..\bin\tao_idl_static.exe"	
-# Begin Custom Build
-InputPath=.\test.idl
-InputName=test
-
-BuildCmds= \
-	..\..\..\..\bin\tao_idl_static -Ge 1 -Gd $(InputName).idl
-
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
 !ENDIF 
 
 # End Source File
diff --git a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
index fafc593a837..7f1f55eb953 100755
--- a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
+++ b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
@@ -12,71 +12,34 @@ $status = 0;
 
 $iorfile1 = PerlACE::LocalFile ("test1.ior");
 $iorfile2 = PerlACE::LocalFile ("test2.ior");
-$server_conf = PerlACE::LocalFile ("server.conf");
 
 unlink $iorfile1;
 unlink $iorfile2;
 
 print STDERR "\n********** RTCORBA Priority Banded Connections Unit Test\n";
 
-
-# CORBA priorities 37, 45 and 50, etc. are for the SCHED_OTHER class on
-# Solaris.  May need to use different values for other platforms
-# depending on their native priorities scheme, i.e., based on the
-# available range.
+# Different priority values for the bands on each OS.
 
 $server_args =
-    "-n $iorfile1 -o $iorfile2 -b bands.unix -ORBSvcConf $server_conf "
-   ."-p 37 -w 51 "
-   ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=39 "
-   ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=46 "
-   ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=50 ";
-
-$client_args =
-    "-n file://$iorfile1 -o file://$iorfile2 "
-   ."-a 37 -b 45 -c 56";
+    "-b bands.unix";
 
 if ($^O eq "MSWin32") {
     $server_args =
-        "-n $iorfile1 -o $iorfile2 -b bands.nt -ORBSvcConf $server_conf "
-        ."-p 1 -w 7 "
-        ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=1 "
-        ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=3 "
-        ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=5 ";
-
-    $client_args =
-        "-n file://$iorfile1 -o file://$iorfile2 "
-       ."-a 1 -b 4 -c 6 ";
+        "-b bands.nt";
 }
 
 if ($^O eq "dec_osf") {
     $server_args =
-        "-n $iorfile1 -o $iorfile2 -b bands.tru64 -ORBSvcConf $server_conf "
-       ."-p 20 -w 34 "
-       ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=23 "
-       ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=28 "
-       ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=33 ";
-
-    $client_args =
-        "-n file://$iorfile1 -o file://$iorfile2 "
-       ."-a 23 -b 28 -c 34 ";
+        "-b bands.tru64";
 }
 
 if ($^O eq "hpux") {
     $server_args =
-        "-n $iorfile1 -o $iorfile2 -b bands.hpux -ORBSvcConf $server_conf "
-       ."-p 17 -w 32 "
-       ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=20 "
-       ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=27 "
-       ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=31 ";
-
-    $client_args =
-        "-n file://$iorfile1 -o file://$iorfile2 "
-       ."-a 20 -b 27 -c 32 ";
+        "-b bands.hpux";
 }
 
 $SV = new PerlACE::Process ("server", $server_args);
-$CL = new PerlACE::Process ("client", $client_args);
+$CL = new PerlACE::Process ("client");
 
 $SV->Spawn ();
 
diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.bor b/TAO/tests/RTCORBA/Banded_Connections/server.bor
index fa3b936abde..2c16c47b52a 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/server.bor
+++ b/TAO/tests/RTCORBA/Banded_Connections/server.bor
@@ -14,7 +14,6 @@ OBJFILES = \
 CFLAGS = \
 	$(ACE_CFLAGS) \
 	$(TAO_CFLAGS) \
-	$(TAO_STRATEGIES_CFLAGS) \
         $(TAO_PORTABLESERVER_CFLAGS) \
         $(TAO_RTCORBA_CFLAGS) \
         $(TAO_RTPORTABLESERVER_CFLAGS)
@@ -22,7 +21,6 @@ CFLAGS = \
 LIBFILES = \
 	$(ACE_LIB) \
 	$(TAO_LIB) \
-	$(TAO_STRATEGIES_LIB) \
         $(TAO_PORTABLESERVER_LIB) \
         $(TAO_RTCORBA_LIB) \
         $(TAO_RTPORTABLESERVER_LIB)
diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.cpp b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
index b4681a5156f..d5ab8565867 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/server.cpp
+++ b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
@@ -4,22 +4,18 @@
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 #include "tao/RTCORBA/RTCORBA.h"
-#include "tao/RTCORBA/Pool_Per_Endpoint.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
-
-#include "tao/Strategies/advanced_resource.h"
+#include "../check_supported_priorities.cpp"
 
 class Test_i : public POA_Test
 {
-  // = TITLE
-  //   An implementation for the Test interface in test.idl
-  //
 public:
   Test_i (CORBA::ORB_ptr orb,
-          RTCORBA::PriorityBands &bands);
-  // ctor
+          RTCORBA::PriorityBands &bands,
+          CORBA::Environment &ACE_TRY_ENV);
 
-  void test_method (CORBA::Short priority,
+  void test_method (CORBA::Boolean client_propagated,
+                    CORBA::Short priority,
                     CORBA::Environment&)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -28,77 +24,104 @@ public:
 
 private:
   CORBA::ORB_var orb_;
-  // The ORB
   RTCORBA::PriorityBands &bands_;
-  // Priority bands.
+  RTCORBA::Current_var rt_current_;
 };
 
 Test_i::Test_i (CORBA::ORB_ptr orb,
-                RTCORBA::PriorityBands & bands)
+                RTCORBA::PriorityBands &bands,
+                CORBA::Environment &ACE_TRY_ENV)
   :  orb_ (CORBA::ORB::_duplicate (orb)),
-     bands_ (bands)
+     bands_ (bands),
+     rt_current_ ()
 {
-}
-
-void
-Test_i::test_method (CORBA::Short priority,
-                     CORBA::Environment& ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Use RTCurrent to find out the CORBA priority of the current
-  // thread.
-
+  // We resolve and store the RT Current for later use.
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("RTCurrent", ACE_TRY_ENV);
+    this->orb_->resolve_initial_references ("RTCurrent",
+                                            ACE_TRY_ENV);
   ACE_CHECK;
 
-  RTCORBA::Current_var current =
-    RTCORBA::Current::_narrow (obj.in (), ACE_TRY_ENV);
+  this->rt_current_ =
+    RTCORBA::Current::_narrow (obj.in (),
+                               ACE_TRY_ENV);
   ACE_CHECK;
+}
 
-  if (CORBA::is_nil (obj.in ()))
-    ACE_THROW (CORBA::INTERNAL ());
-
-  CORBA::Short servant_thread_priority =
-    current->the_priority (ACE_TRY_ENV);
+void
+Test_i::test_method (CORBA::Boolean client_propagated,
+                     CORBA::Short client_priority,
+                     CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Get the upcall thread's priority.
+  CORBA::Short server_priority =
+    this->rt_current_->the_priority (ACE_TRY_ENV);
   ACE_CHECK;
 
-  // Print out the info.
-  int index = -1;
-  ACE_DEBUG ((LM_DEBUG,
-              "\nObject bands: \n"));
-  for (CORBA::ULong i = 0; i < this->bands_.length (); ++i)
+  // Check which policy we are dealing with.
+  if (!client_propagated)
     {
+      // With the SERVER_DECLARED priority model, <client_priority> is
+      // simply the priority associated with the priority propagation
+      // policy in the IOR.  This should match the priority we get run
+      // at.
+      ACE_ASSERT (server_priority == client_priority);
+
       ACE_DEBUG ((LM_DEBUG,
-                  "%d) %d  %d\n",
-                  (i + 1), this->bands_[i].low, this->bands_[i].high));
-
-      if (priority <= this->bands_[i].high
-          && priority >= this->bands_[i].low
-          && servant_thread_priority <= this->bands_[i].high
-          && servant_thread_priority >= this->bands_[i].low)
-        index = i + 1;
+                  "Using SERVER_DECLARED policy: request processed at priority %d\n",
+                  server_priority));
     }
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Object priority: %d  "
-              "Servant thread priority: %d\n",
-              priority, servant_thread_priority));
-
-  if (index == -1)
-    ACE_DEBUG ((LM_DEBUG,
-                "ERROR: object and thread priorities do not"
-                "match the same band.\n"));
   else
-    ACE_DEBUG ((LM_DEBUG,
-                "Band %d was used for this invocation\n", index));
+    {
+      // We are using the CLIENT_DECLARED policy, both the client
+      // priority and the server priority should fall within the
+      // bands.  Note that it may be the case that the server priority
+      // is not exactly the same as the client priority since we are
+      // using thread pools with lanes.
+      //
+      // Print out the bands.
+      int index = -1;
+      ACE_DEBUG ((LM_DEBUG,
+                  "\nPriority Bands: \n"));
+      for (CORBA::ULong i = 0; i < this->bands_.length (); ++i)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "%d) %d  %d\n",
+                      (i + 1),
+                      this->bands_[i].low,
+                      this->bands_[i].high));
+
+          // Check which band we are using.
+          if (client_priority <= this->bands_[i].high &&
+              client_priority >= this->bands_[i].low &&
+              server_priority <= this->bands_[i].high &&
+              server_priority >= this->bands_[i].low)
+            index = i + 1;
+        }
+
+      ACE_DEBUG ((LM_DEBUG,
+                  "Client priority: %d  "
+                  "Server processing request at priority: %d\n",
+                  client_priority,
+                  server_priority));
+
+      if (index == -1)
+        ACE_DEBUG ((LM_DEBUG,
+                    "ERROR: object and thread priorities do not"
+                    "match the same band.\n"));
+      else
+        ACE_DEBUG ((LM_DEBUG,
+                    "Band %d was used for this invocation\n", index));
+    }
 }
 
 void
 Test_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0,
+                        ACE_TRY_ENV);
+  ACE_CHECK;
 }
 
 //*************************************************************************
@@ -106,15 +129,13 @@ Test_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
 const char *bands_file = "bands";
 const char *ior_output_file1 = "test1.ior";
 const char *ior_output_file2 = "test2.ior";
-CORBA::Short poa_priority = -1;
-CORBA::Short wrong_priority = -1;
 
 // Parse command-line arguments.
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "p:w:b:o:n:");
-  int c, result;
+  ACE_Get_Opt get_opts (argc, argv, "b:o:n:");
+  int c;
 
   while ((c = get_opts ()) != -1)
     switch (c)
@@ -131,26 +152,6 @@ parse_args (int argc, char *argv[])
         bands_file = get_opts.optarg;
         break;
 
-      case 'p':
-        result = ::sscanf (get_opts.optarg,
-                           "%hd",
-                           &poa_priority);
-        if (result == 0 || result == EOF)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to process <-a> option"),
-                            -1);
-        break;
-
-      case 'w':
-        result = ::sscanf (get_opts.optarg,
-                           "%hd",
-                           &wrong_priority);
-        if (result == 0 || result == EOF)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to process <-c> option"),
-                            -1);
-        break;
-
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -158,38 +159,36 @@ parse_args (int argc, char *argv[])
                            "-n <iorfile1> "
                            "-o <iorfile2> "
                            "-b <bands_file> "
-                           "-p <poa_priority> "
-                           "-w <wrong_priority> "
                            "\n",
                            argv [0]),
                           -1);
       }
 
-  if (poa_priority < 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Valid poa priority must be"
-                       " specified.\nSee README file for more info\n"),
-                      -1);
-
   return 0;
 }
 
 int
 get_priority_bands (RTCORBA::PriorityBands &bands)
 {
-  FILE* file = ACE_OS::fopen (bands_file, "r");
+  //
+  // Read bands from a file.
+  //
+  FILE* file =
+    ACE_OS::fopen (bands_file, "r");
 
   if (file == 0)
     return -1;
 
   ACE_Read_Buffer reader (file, 1);
 
-  char* string = reader.read (EOF, ' ', '\0');
+  char *string =
+    reader.read (EOF, ' ', '\0');
 
   if (string == 0)
     return -1;
 
-  CORBA::ULong bands_length = (reader.replaced () + 1) / 2;
+  CORBA::ULong bands_length =
+    (reader.replaced () + 1) / 2;
   bands.length (bands_length);
 
   int result = 1;
@@ -230,51 +229,43 @@ get_priority_bands (RTCORBA::PriorityBands &bands)
 }
 
 int
-check_for_nil (CORBA::Object_ptr obj, const char *msg)
-{
-  if (CORBA::is_nil (obj))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "ERROR: Object reference <%s> is nil\n",
-                       msg),
-                      -1);
-  else
-    return 0;
-}
-
-int
 create_object (PortableServer::POA_ptr poa,
                CORBA::ORB_ptr orb,
                Test_i *server_impl,
                const char *filename,
                CORBA::Environment &ACE_TRY_ENV)
 {
-  // Register with poa.
+  // Register servant with the POA.
   PortableServer::ObjectId_var id;
-
-  id = poa->activate_object (server_impl, ACE_TRY_ENV);
+  id = poa->activate_object (server_impl,
+                             ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
 
+  // Create object reference.
   CORBA::Object_var server =
-    poa->id_to_reference (id.in (), ACE_TRY_ENV);
+    poa->id_to_reference (id.in (),
+                          ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
 
   // Print out the IOR.
   CORBA::String_var ior =
-    orb->object_to_string (server.in (), ACE_TRY_ENV);
+    orb->object_to_string (server.in (),
+                           ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
 
-  ACE_DEBUG ((LM_DEBUG, "<%s>\n\n", ior.in ()));
-
   // Print ior to the file.
   if (filename != 0)
     {
-      FILE *output_file= ACE_OS::fopen (filename, "w");
+      FILE *output_file =
+        ACE_OS::fopen (filename, "w");
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
                            filename),
                           -1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
+      ACE_OS::fprintf (output_file,
+                       "%s",
+                       ior.in ());
       ACE_OS::fclose (output_file);
     }
 
@@ -289,27 +280,26 @@ object_activation_exception_test (RTPortableServer::POA_ptr poa,
 {
   ACE_TRY
     {
-      // Register with poa.
+      // Register servant with POA.
       PortableServer::ObjectId_var id =
         poa->activate_object_with_priority (server_impl,
                                             priority,
                                             ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      CORBA::Object_var server =
-        poa->id_to_reference (id.in (),
-                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      // This next line of code should not run because an exception
+      // should have been raised.
       ACE_DEBUG ((LM_DEBUG, "ERROR: no exception caught\n"));
     }
   ACE_CATCH (CORBA::BAD_PARAM, ex)
     {
+      // Expected exception.
       ACE_DEBUG ((LM_DEBUG,
                   "BAD_PARAM exception is caught as expected.\n"));
     }
   ACE_CATCHANY
     {
+      // Unexpected exception.
       ACE_DEBUG ((LM_DEBUG, "ERROR: unexpected exception caught\n"));
       ACE_RE_THROW;
     }
@@ -325,21 +315,27 @@ poa_creation_exception_test (PortableServer::POA_ptr root_poa,
 {
   ACE_TRY
     {
+      // Create a POA with invalid policies.
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("Child_POA",
                               manager,
                               policies,
                               ACE_TRY_ENV);
       ACE_TRY_CHECK;
+
+      // This next line of code should not run because an exception
+      // should have been raised.
       ACE_DEBUG ((LM_DEBUG, "ERROR: no exception caught\n"));
     }
   ACE_CATCH (PortableServer::POA::InvalidPolicy, ex)
     {
+      // Expected exception.
       ACE_DEBUG ((LM_DEBUG,
                   "InvalidPolicy exception is caught as expected.\n"));
     }
   ACE_CATCHANY
     {
+      // Unexpected exception.
       ACE_DEBUG ((LM_DEBUG, "ERROR: unexpected exception\n"));
       ACE_RE_THROW;
     }
@@ -350,38 +346,49 @@ poa_creation_exception_test (PortableServer::POA_ptr root_poa,
 int
 main (int argc, char *argv[])
 {
+  // Make sure we can support multiple priorities that are required
+  // for this test.
+  check_supported_priorities ();
+
   ACE_TRY_NEW_ENV
     {
-      // ORB.
+      // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc,
+                         argv,
+                         "",
+                         ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       // Parse arguments.
-      if (parse_args (argc, argv) != 0)
-        return 1;
+      int result =
+        parse_args (argc,
+                    argv);
+      if (result != 0)
+        return result;
 
-      // RTORB.
+      // Get the RTORB.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTORB", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTORB",
+                                         ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      RTCORBA::RTORB_var rt_orb = RTCORBA::RTORB::_narrow (object.in (),
-                                                           ACE_TRY_ENV);
+
+      RTCORBA::RTORB_var rt_orb =
+        RTCORBA::RTORB::_narrow (object.in (),
+                                 ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      if (check_for_nil (rt_orb.in (), "RTORB") == -1)
-        return 1;
 
-      // RootPOA.
+      // Get the RootPOA.
       object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA",
+                                         ACE_TRY_ENV);
       ACE_TRY_CHECK;
+
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (object.in (), ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      if (check_for_nil (root_poa.in (), "RootPOA") == -1)
-        return 1;
 
-      // POAManager.
+      // Get the POA Manager.
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager (ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -389,68 +396,100 @@ main (int argc, char *argv[])
       // Obtain priority bands to be used in this test from the file
       // specified by the user.
       RTCORBA::PriorityBands bands;
-      if (get_priority_bands (bands) == -1)
+      result = get_priority_bands (bands);
+      if (result != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Error reading priority bands from file\n"),
-                          1);
-
-      // Servant.
-      Test_i server_impl (orb.in (), bands);
-      Test_i server_impl2 (orb.in (), bands);
-
-
-      // Test 1: Attempt to create a POA with priority bands but
-      // without the priority model.  Should get POA::InvalidPolicy
-      // exception.
-      ACE_DEBUG ((LM_DEBUG,
-                  "\n     Test 1\n"));
+                          result);
+
+      // Create a thread-pool.
+      CORBA::ULong stacksize = 0;
+      CORBA::Boolean allow_request_buffering = 0;
+      CORBA::ULong max_buffered_requests = 0;
+      CORBA::ULong max_request_buffer_size = 0;
+      CORBA::Boolean allow_borrowing = 0;
+      CORBA::ULong static_threads = 1;
+      CORBA::ULong dynamic_threads = 0;
+
+      // The lanes in the pool should match the bands.
+      RTCORBA::ThreadpoolLanes lanes;
+      lanes.length (bands.length ());
+
+      // For each band, setup up a thread lane.
+      for (CORBA::ULong i = 0;
+           i < bands.length ();
+           ++i)
+        {
+          lanes[i].static_threads = static_threads;
+          lanes[i].dynamic_threads = dynamic_threads;
 
-      CORBA::PolicyList poa_policy_list;
-      poa_policy_list.length (1);
-      poa_policy_list[0] =
-        rt_orb->create_priority_banded_connection_policy
-        (bands,
-         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+          // Lane priority is in the middle of the band priorities.
+          lanes[i].lane_priority =
+            (bands[i].low + bands[i].high) / 2;
+        }
 
-      poa_creation_exception_test (root_poa.in (),
-                                   poa_manager.in (),
-                                   poa_policy_list,
-                                   ACE_TRY_ENV);
+      // Create the thread-pool.
+      RTCORBA::ThreadpoolId threadpool_id =
+        rt_orb->create_threadpool_with_lanes (stacksize,
+                                              lanes,
+                                              allow_borrowing,
+                                              allow_request_buffering,
+                                              max_buffered_requests,
+                                              max_request_buffer_size,
+                                              ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      // Test 2: Attempt to create a POA with priority bands that do
-      // not match the resources (i.e., endpoints/lanes).  Should get
-      // POA::InvalidPolicy exception.
+      // Test: Attempt to create a POA with priority bands that do not
+      // match the lanes.  Should get POA::InvalidPolicy exception.
       ACE_DEBUG ((LM_DEBUG,
-                  "\n     Test 2\n"));
+                  "\n<---Test--->: Bands do not match lanes\n\n"));
 
-      RTCORBA::PriorityBands false_bands;
-      false_bands.length (2);
+      // False bands.
+      RTCORBA::PriorityBands false_bands (bands);
       false_bands[0].low = 10000;
       false_bands[0].high = 10005;
-      false_bands[1].low = 26;
-      false_bands[1].high = 30;
 
+      CORBA::PolicyList poa_policy_list;
+      poa_policy_list.length (2);
+
+      // Create a bands policy.
       poa_policy_list[0] =
-        rt_orb->create_priority_banded_connection_policy
-        (false_bands,
-         ACE_TRY_ENV);
+        rt_orb->create_priority_banded_connection_policy (false_bands,
+                                                          ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      // Create a thread-pool policy.
+      poa_policy_list[1] =
+        rt_orb->create_threadpool_policy (threadpool_id,
+                                          ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
+      // Try to create a POA with invalid policies.  Should throw an
+      // exception.
       poa_creation_exception_test (root_poa.in (),
                                    poa_manager.in (),
                                    poa_policy_list,
                                    ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      // Create POA with CLIENT_PROPAGATED priority model, no bands.
+      // Two policies for the next POA.
+      poa_policy_list.length (2);
+
+      // Create a priority model policy.
       poa_policy_list[0] =
         rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
                                               0,
                                               ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
+      // Create a thread-pool policy.
+      poa_policy_list[1] =
+        rt_orb->create_threadpool_policy (threadpool_id,
+                                          ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      // Create POA with CLIENT_PROPAGATED priority model, with lanes
+      // but no bands.
       PortableServer::POA_var client_propagated_poa =
         root_poa->create_POA ("client_propagated_poa",
                               poa_manager.in (),
@@ -458,20 +497,34 @@ main (int argc, char *argv[])
                               ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      // Create POA with SERVER_DECLARED priority model, with bands.
-      poa_policy_list.length (2);
+      // Three policies for the next POA.
+      poa_policy_list.length (3);
+
+      // Default POA priority comes from the 'middle' lane's priority.
+      CORBA::Short poa_priority =
+        lanes[lanes.length () / 2].lane_priority;
+
+      // Create a priority model policy.
       poa_policy_list[0] =
         rt_orb->create_priority_model_policy (RTCORBA::SERVER_DECLARED,
                                               poa_priority,
                                               ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
+      // Create a bands policy.
       poa_policy_list[1] =
-        rt_orb->create_priority_banded_connection_policy
-        (bands,
-         ACE_TRY_ENV);
+        rt_orb->create_priority_banded_connection_policy (bands,
+                                                          ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      // Create a thread-pool policy.
+      poa_policy_list[2] =
+        rt_orb->create_threadpool_policy (threadpool_id,
+                                          ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
+      // Create POA with SERVER_DECLARED priority model, with bands
+      // and lanes.
       PortableServer::POA_var server_declared_poa =
         root_poa->create_POA ("server_declared_poa",
                               poa_manager.in (),
@@ -479,61 +532,62 @@ main (int argc, char *argv[])
                               ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      // Test 3: Attempt to register an object with priority that
-      // doesn't match POA resources (i.e., endpoints/lanes).  Should
-      // get BAD_PARAM exception.
+      // Test: Attempt to register an object with priority that
+      // doesn't match lanes.  Should get BAD_PARAM exception.
       ACE_DEBUG ((LM_DEBUG,
-                  "\n     Test 3\n"));
+                  "\n<---Test--->: Servant priority does not match lanes\n\n"));
 
       RTPortableServer::POA_var rt_server_declared_poa =
         RTPortableServer::POA::_narrow (server_declared_poa.in (), ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      if (check_for_nil (rt_server_declared_poa.in (), "RTPOA") == -1)
-        return 1;
 
+      // Activation with incorrect priority should fail.
+      CORBA::Short wrong_priority = 10000;
       object_activation_exception_test (rt_server_declared_poa.in (),
-                                        &server_impl,
+                                        0,
                                         wrong_priority,
                                         ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-
-      // Create object 1 and register with <client_propagated_poa>.
-      int result;
-      ACE_DEBUG ((LM_DEBUG, "\nActivated object one as "));
+      // Create first servant and register with <client_propagated_poa>.
+      Test_i server_impl (orb.in (),
+                          bands,
+                          ACE_TRY_ENV);
+      ACE_TRY_CHECK;
       result = create_object (client_propagated_poa.in (),
                               orb.in (),
                               &server_impl,
                               ior_output_file1,
                               ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      if (result == -1)
-        return 1;
+      if (result != 0)
+        return result;
 
-      // Create object 2 and register with <server_declared_poa>.
-      ACE_DEBUG ((LM_DEBUG, "\nActivated object two as "));
+      // Create second servant and register with <server_declared_poa>.
+      Test_i server_impl2 (orb.in (),
+                           bands,
+                           ACE_TRY_ENV);
+      ACE_TRY_CHECK;
       result = create_object (server_declared_poa.in (),
                               orb.in (),
                               &server_impl2,
                               ior_output_file2,
                               ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      if (result == -1)
-        return 1;
+      if (result != 0)
+        return result;
 
       // Activate POA manager.
       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);
+      // Run ORB.
+      orb->run (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      ACE_DEBUG ((LM_DEBUG, "\nServer ORB event loop finished\n\n"));
+      // Destroy ORB.
+      orb->destroy (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -545,4 +599,3 @@ main (int argc, char *argv[])
 
   return 0;
 }
-
diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.dsp b/TAO/tests/RTCORBA/Banded_Connections/server.dsp
index cb696255f0a..feb6531fae7 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/server.dsp
+++ b/TAO/tests/RTCORBA/Banded_Connections/server.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=Banded_Connections Server - Win32 Static Debug
+CFG=BANDED_CONNECTIONS SERVER - WIN32 DEBUG
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,14 +13,12 @@ CFG=Banded_Connections Server - Win32 Static Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "server.mak" CFG="Banded_Connections Server - Win32 Static Debug"
+!MESSAGE NMAKE /f "server.mak" CFG="BANDED_CONNECTIONS SERVER - WIN32 DEBUG"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "Banded_Connections Server - Win32 Release" (based on "Win32 (x86) Console Application")
 !MESSAGE "Banded_Connections Server - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Banded_Connections Server - Win32 Static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Banded_Connections Server - Win32 Static Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -53,7 +51,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 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 ace.lib TAO.lib TAO_RTCORBA.lib TAO_PortableServer.lib TAO_RTPortableServer.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_RTCORBA.lib TAO_RTPortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
 
 !ELSEIF  "$(CFG)" == "Banded_Connections Server - Win32 Debug"
 
@@ -78,62 +76,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 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 TAO_Strategiesd.lib TAO_PortableServerd.lib TAO_RTPortableServerd.lib TAO_RTCORBAd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
-
-!ELSEIF  "$(CFG)" == "Banded_Connections Server - Win32 Static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Banded_Connections_Server___Win32_Static_Release"
-# PROP BASE Intermediate_Dir "Banded_Connections_Server___Win32_Static_Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Static_Release"
-# PROP Intermediate_Dir "Static_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "ACE_AS_STATIC_LIBS" /D "TAO_AS_STATIC_LIBS" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 ace.lib TAO.lib TAO_RTCORBA.lib TAO_PortableServer.lib TAO_RTPortableServer.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
-# ADD LINK32 aces.lib TAOs.lib TAO_Strategiess.lib TAO_RTCORBAs.lib TAO_RTPortableServers.lib TAO_PortableServers.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
-
-!ELSEIF  "$(CFG)" == "Banded_Connections Server - Win32 Static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Banded_Connections_Server___Win32_Static_Debug"
-# PROP BASE Intermediate_Dir "Banded_Connections_Server___Win32_Static_Debug"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Static_Debug"
-# PROP Intermediate_Dir "Static_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
-# SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "ACE_AS_STATIC_LIBS" /D "TAO_AS_STATIC_LIBS" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 TAO_Strategiesd.lib TAO_PortableServerd.lib TAO_RTPortableServerd.lib TAO_RTCORBAd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
-# ADD LINK32 acesd.lib TAOsd.lib TAO_Strategiessd.lib TAO_RTCORBAsd.lib TAO_RTPortableServersd.lib TAO_PortableServersd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
-# SUBTRACT LINK32 /pdbtype:<none>
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_RTCORBAd.lib TAO_RTPortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
 
 !ENDIF 
 
@@ -141,8 +84,6 @@ LINK32=link.exe
 
 # Name "Banded_Connections Server - Win32 Release"
 # Name "Banded_Connections Server - Win32 Debug"
-# Name "Banded_Connections Server - Win32 Static Release"
-# Name "Banded_Connections Server - Win32 Static Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -267,84 +208,6 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "Banded_Connections Server - Win32 Static Release"
-
-USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl_static.exe"	
-# Begin Custom Build
-InputPath=.\test.idl
-InputName=test
-
-BuildCmds= \
-	..\..\..\..\bin\release\tao_idl_static -Ge 1 -Gd $(InputName).idl
-
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "Banded_Connections Server - Win32 Static Debug"
-
-# PROP BASE Ignore_Default_Tool 1
-# PROP Ignore_Default_Tool 1
-USERDEP__TEST_="..\..\..\..\bin\tao_idl_static.exe"	
-# Begin Custom Build - Invoking TAO_IDL on $(InputName)
-InputPath=.\test.idl
-InputName=test
-
-BuildCmds= \
-	..\..\..\..\bin\tao_idl_static -Ge 1 -Gd $(InputName).idl
-
-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
 !ENDIF 
 
 # End Source File
diff --git a/TAO/tests/RTCORBA/Banded_Connections/test.idl b/TAO/tests/RTCORBA/Banded_Connections/test.idl
index f7d88246a75..ae526bbfd2f 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/test.idl
+++ b/TAO/tests/RTCORBA/Banded_Connections/test.idl
@@ -4,13 +4,8 @@
 
 interface Test
 {
-  void test_method (in short priority);
-  // Takes target object priority in effect for this invocation.
-  // Prints out object priority, priority bands in effect, and the
-  // priority of the server thread servicing the request.  Checks that
-  // object and server thread priorities match one of the
-  // priority bands.
+  void test_method (in boolean client_propagated,
+                    in short client_priority);
 
   oneway void shutdown ();
-  // Shut down the ORB.
 };
diff --git a/TAO/tests/RTCORBA/Client_Propagated/Makefile b/TAO/tests/RTCORBA/Client_Propagated/Makefile
index 4ed7b910766..7a8d854cbc4 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/Makefile
+++ b/TAO/tests/RTCORBA/Client_Propagated/Makefile
@@ -43,9 +43,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 include $(TAO_ROOT)/taoconfig.mk
 
-RT_TAO_SRVR_LIBS := -lTAO_Strategies $(RT_TAO_SRVR_LIBS)
-RT_TAO_CLNT_LIBS := -lTAO_Strategies $(RT_TAO_CLNT_LIBS)
-
 #----------------------------------------------------------------------------
 #       Local targets
 #----------------------------------------------------------------------------
@@ -273,7 +270,10 @@ realclean: clean
   $(TAO_ROOT)/tao/RTPortableServer/RTPortableServer.h \
   $(TAO_ROOT)/tao/RTPortableServer/rtportableserver_export.h \
   $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.h \
-  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.i
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.i \
+  ../check_supported_priorities.cpp \
+  $(ACE_ROOT)/ace/Sched_Params.h \
+  $(ACE_ROOT)/ace/Sched_Params.i
 
 .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp testC.h \
   $(TAO_ROOT)/tao/corba.h \
@@ -472,6 +472,7 @@ realclean: clean
   $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping_Manager.i \
   $(ACE_ROOT)/ace/Get_Opt.h \
   $(ACE_ROOT)/ace/Get_Opt.i \
+  ../check_supported_priorities.cpp \
   $(ACE_ROOT)/ace/Sched_Params.h \
   $(ACE_ROOT)/ace/Sched_Params.i
 
diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.bor b/TAO/tests/RTCORBA/Client_Propagated/client.bor
index d2a3cc8aa8c..359d0b2fdc1 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/client.bor
+++ b/TAO/tests/RTCORBA/Client_Propagated/client.bor
@@ -15,15 +15,11 @@ OBJFILES = \
 CFLAGS = \
 	$(ACE_CFLAGS) \
 	$(TAO_CFLAGS) \
-	$(TAO_STRATEGIES_CFLAGS) \
-        $(TAO_PORTABLESERVER_CFLAGS) \
         $(TAO_RTCORBA_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
 	$(TAO_LIB) \
-	$(TAO_STRATEGIES_LIB) \
-        $(TAO_PORTABLESERVER_LIB) \
         $(TAO_RTCORBA_LIB)
 
 IDLFILES = \
diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.cpp b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
index 58a48b7a744..5f30bea8cb3 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/client.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
@@ -2,13 +2,10 @@
 
 #include "testC.h"
 #include "Client_ORBInitializer.h"
-
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/RTCORBA/Priority_Mapping_Manager.h"
-
 #include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-
+#include "../check_supported_priorities.cpp"
 
 const char *ior = "file://test.ior";
 
@@ -40,36 +37,12 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
+  // Make sure we can support multiple priorities that are required
+  // for this test.
+  check_supported_priorities ();
+
   ACE_TRY_NEW_ENV
     {
-      // First check that we have sufficient priority range to run the
-      // test.
-      int max_priority =
-        ACE_Sched_Params::priority_max (ACE_SCHED_OTHER);
-      int min_priority =
-        ACE_Sched_Params::priority_min (ACE_SCHED_OTHER);
-
-      if (max_priority > min_priority)
-        {
-          if ((max_priority + min_priority) / 2 + 2 > max_priority)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "Not enough priority levels on this platform"
-                          "to run the test, aborting\n"));
-              return 0;
-            }
-        }
-      else
-        {
-          if ((max_priority + min_priority) / 2 + 2 > min_priority)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "Not enough priority levels on this platform"
-                          "to run the test, aborting\n"));
-              return 0;
-            }
-        }
-
       // Register the interceptors to check for the RTCORBA
       // service contexts in the reply messages.
       PortableInterceptor::ORBInitializer_ptr temp_initializer;
@@ -154,6 +127,11 @@ main (int argc, char *argv[])
       RTCORBA::PriorityMapping *pm =
         mapping_manager->mapping ();
 
+      int max_priority =
+        ACE_Sched_Params::priority_max (ACE_SCHED_OTHER);
+      int min_priority =
+        ACE_Sched_Params::priority_min (ACE_SCHED_OTHER);
+
       CORBA::Short native_priority =
         (max_priority + min_priority) / 2;
 
@@ -165,11 +143,11 @@ main (int argc, char *argv[])
                            native_priority),
                           1);
 
-      current->the_priority (desired_priority, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
       for (int i = 0; i < 3; ++i)
         {
+          current->the_priority (desired_priority, ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
           CORBA::Short priority =
             current->the_priority (ACE_TRY_ENV);
           ACE_TRY_CHECK;
@@ -185,9 +163,6 @@ main (int argc, char *argv[])
           ACE_TRY_CHECK;
 
           desired_priority++;
-
-          current->the_priority (desired_priority, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
         }
 
       // Shut down Server ORB.
@@ -211,6 +186,3 @@ main (int argc, char *argv[])
 
   return 0;
 }
-
-
-
diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.dsp b/TAO/tests/RTCORBA/Client_Propagated/client.dsp
index fe01da82086..f5a624dfb18 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/client.dsp
+++ b/TAO/tests/RTCORBA/Client_Propagated/client.dsp
@@ -51,7 +51,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 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 ace.lib TAO.lib TAO_Strategies.lib TAO_RTCORBA.lib TAO_RTPortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"  /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer" 
+# ADD LINK32 ace.lib TAO.lib TAO_RTCORBA.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA"
 
 !ELSEIF  "$(CFG)" == "Client_Propagated Client - Win32 Debug"
 
@@ -76,7 +76,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 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 TAO_RTCORBAd.lib TAO_RTPortableServerd.lib TAO_Strategiesd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"  /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer" 
+# ADD LINK32 aced.lib TAOd.lib TAO_RTCORBAd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA"
 
 !ENDIF 
 
diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.bor b/TAO/tests/RTCORBA/Client_Propagated/server.bor
index a7dc9cf792b..a498053c084 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/server.bor
+++ b/TAO/tests/RTCORBA/Client_Propagated/server.bor
@@ -14,7 +14,6 @@ OBJFILES = \
 CFLAGS = \
 	$(ACE_CFLAGS) \
 	$(TAO_CFLAGS) \
-	$(TAO_STRATEGIES_CFLAGS) \
         $(TAO_PORTABLESERVER_CFLAGS) \
         $(TAO_RTCORBA_CFLAGS) \
         $(TAO_RTPORTABLESERVER_CFLAGS)
@@ -22,7 +21,6 @@ CFLAGS = \
 LIBFILES = \
 	$(ACE_LIB) \
 	$(TAO_LIB) \
-	$(TAO_STRATEGIES_LIB) \
         $(TAO_PORTABLESERVER_LIB) \
         $(TAO_RTCORBA_LIB) \
         $(TAO_RTPORTABLESERVER_LIB)
diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
index 93054d1e483..b9fa96e6108 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
@@ -2,9 +2,9 @@
 
 #include "testS.h"
 #include "ace/Get_Opt.h"
-
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
+#include "../check_supported_priorities.cpp"
 
 class Test_i : public POA_Test
 {
@@ -109,9 +109,11 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  // Make sure we can support multiple priorities that are required
+  // for this test.
+  check_supported_priorities ();
 
-  ACE_TRY
+  ACE_TRY_NEW_ENV
     {
       // Standard initialization:
       // parse arguments and get all the references (ORB,
diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.dsp b/TAO/tests/RTCORBA/Client_Propagated/server.dsp
index b3c9ad59b2b..fca106031de 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/server.dsp
+++ b/TAO/tests/RTCORBA/Client_Propagated/server.dsp
@@ -51,7 +51,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 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 ace.lib TAO.lib TAO_PortableServer.lib TAO_Strategies.lib TAO_RTCORBA.lib TAO_RTPortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer" 
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_RTCORBA.lib TAO_RTPortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
 
 !ELSEIF  "$(CFG)" == "Client_Propagated Server - Win32 Debug"
 
@@ -76,7 +76,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 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 TAO_RTCORBAd.lib TAO_RTPortableServerd.lib TAO_Strategiesd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_RTCORBAd.lib TAO_RTPortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
 
 !ENDIF 
 
diff --git a/TAO/tests/RTCORBA/Client_Protocol/client.bor b/TAO/tests/RTCORBA/Client_Protocol/client.bor
index 9d0c78909a0..9cdc7960016 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/client.bor
+++ b/TAO/tests/RTCORBA/Client_Protocol/client.bor
@@ -14,14 +14,12 @@ CFLAGS = \
 	$(ACE_CFLAGS) \
 	$(TAO_CFLAGS) \
 	$(TAO_STRATEGIES_CFLAGS) \
-        $(TAO_PORTABLESERVER_CFLAGS) \
         $(TAO_RTCORBA_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
 	$(TAO_LIB) \
 	$(TAO_STRATEGIES_LIB) \
-        $(TAO_PORTABLESERVER_LIB) \
         $(TAO_RTCORBA_LIB)
 
 IDLFILES = \
diff --git a/TAO/tests/RTCORBA/Client_Protocol/client.dsp b/TAO/tests/RTCORBA/Client_Protocol/client.dsp
index 8f55fa723ee..953622a7e32 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/client.dsp
+++ b/TAO/tests/RTCORBA/Client_Protocol/client.dsp
@@ -51,7 +51,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 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_RTCORBA.lib TAO_RTPortableServer.lib ace.lib TAO.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 ace.lib TAO.lib TAO_RTCORBA.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\Strategies"
 
 !ELSEIF  "$(CFG)" == "Client_Protocol Client - Win32 Debug"
 
@@ -76,7 +76,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 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 TAO_RTCORBAd.lib TAO_RTPortableServerd.lib TAO_Strategiesd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 aced.lib TAOd.lib TAO_RTCORBAd.lib TAO_Strategiesd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\Strategies"
 
 !ENDIF 
 
diff --git a/TAO/tests/RTCORBA/Client_Protocol/server.dsp b/TAO/tests/RTCORBA/Client_Protocol/server.dsp
index 9f60ba17187..ee6a931b0d7 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/server.dsp
+++ b/TAO/tests/RTCORBA/Client_Protocol/server.dsp
@@ -51,7 +51,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 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 LINK32a TAO_RTCORBA.lib TAO_RTPortableServer.lib ace.lib TAO.lib TAO_PortableServer.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_RTCORBA.lib TAO_RTPortableServer.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer" /libpath:"..\..\..\tao\Strategies"
 
 !ELSEIF  "$(CFG)" == "Client_Protocol Server - Win32 Debug"
 
@@ -76,7 +76,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 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 TAO_RTCORBAd.lib TAO_RTPortableServerd.lib TAO_Strategiesd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_RTCORBAd.lib TAO_RTPortableServerd.lib TAO_Strategiesd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer" /libpath:"..\..\..\tao\Strategies"
 
 !ENDIF 
 
diff --git a/TAO/tests/RTCORBA/Collocation/Collocation.cpp b/TAO/tests/RTCORBA/Collocation/Collocation.cpp
new file mode 100644
index 00000000000..6df538e3e98
--- /dev/null
+++ b/TAO/tests/RTCORBA/Collocation/Collocation.cpp
@@ -0,0 +1,645 @@
+// $Id$
+
+#include "ace/Get_Opt.h"
+#include "ace/Array_Base.h"
+#include "tao/ORB_Core.h"
+#include "tao/RTCORBA/Thread_Pool.h"
+#include "testS.h"
+#include "tao/RTPortableServer/RTPortableServer.h"
+
+ACE_RCSID(Collocations, Collocations, "$Id$")
+
+RTCORBA::Priority default_thread_priority;
+
+class test_i;
+
+struct Test_Object_And_Servant
+{
+  test_var object_;
+  test_i *servant_;
+};
+
+typedef ACE_Array_Base<Test_Object_And_Servant> Tests;
+
+class test_i :
+  public POA_test,
+  public PortableServer::RefCountServantBase
+{
+public:
+  test_i (CORBA::ORB_ptr orb,
+          PortableServer::POA_ptr poa,
+          Tests &tests);
+
+  void start (CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  void method (CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV);
+
+  int client_propagated (void);
+
+  void client_propagated (int);
+
+  void thread_info (const char *method_name);
+
+  void invocation_pool_and_lane (CORBA::ULong pool,
+                                 CORBA::ULong lane);
+
+  void invocation_pool (CORBA::ULong pool);
+
+  void invocation_lane (CORBA::ULong lane);
+
+private:
+
+  CORBA::ORB_var orb_;
+  PortableServer::POA_var poa_;
+  Tests &tests_;
+
+  CORBA::ULong pool_;
+  CORBA::ULong lane_;
+
+  int client_propagated_;
+};
+
+test_i::test_i (CORBA::ORB_ptr orb,
+                PortableServer::POA_ptr poa,
+                Tests &tests)
+  : orb_ (CORBA::ORB::_duplicate (orb)),
+    poa_ (PortableServer::POA::_duplicate (poa)),
+    tests_ (tests),
+    client_propagated_ (0)
+{
+}
+
+int
+test_i::client_propagated (void)
+{
+  return this->client_propagated_;
+}
+
+void
+test_i::client_propagated (int client_propagated)
+{
+  this->client_propagated_ = client_propagated;
+}
+
+void
+test_i::invocation_pool_and_lane (CORBA::ULong pool,
+                                  CORBA::ULong lane)
+{
+  this->pool_ = pool;
+  this->lane_ = lane;
+}
+
+void
+test_i::invocation_pool (CORBA::ULong pool)
+{
+  this->pool_ = pool;
+}
+
+void
+test_i::invocation_lane (CORBA::ULong lane)
+{
+  this->lane_ = lane;
+}
+
+void
+test_i::start (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  ACE_DEBUG ((LM_DEBUG,
+              "\n"));
+
+  this->thread_info ("test_i::start");
+
+  ACE_DEBUG ((LM_DEBUG,
+              "\n"));
+
+  Tests::ITERATOR iterator (this->tests_);
+  while (!iterator.done ())
+    {
+      Test_Object_And_Servant *test = 0;
+      iterator.next (test);
+
+      if (test->servant_->client_propagated ())
+        {
+          CORBA::Object_var object =
+            this->orb_->resolve_initial_references ("RTCurrent",
+                                                    ACE_TRY_ENV);
+          ACE_CHECK;
+
+          RTCORBA::Current_var current =
+            RTCORBA::Current::_narrow (object.in (),
+                                       ACE_TRY_ENV);
+          ACE_CHECK;
+
+          CORBA::Short current_thread_priority =
+            current->the_priority (ACE_TRY_ENV);
+          ACE_CHECK;
+
+          if (current_thread_priority == default_thread_priority)
+            test->servant_->invocation_lane (0);
+          else
+            test->servant_->invocation_lane (1);
+        }
+
+      test->object_->method (ACE_TRY_ENV);
+      ACE_CHECK;
+
+      CORBA::String_var ior =
+        this->orb_->object_to_string (test->object_.in (),
+                                      ACE_TRY_ENV);
+      ACE_CHECK;
+
+      CORBA::Object_var object =
+        this->orb_->string_to_object (ior.in (),
+                                      ACE_TRY_ENV);
+      ACE_CHECK;
+
+      test_var test_from_string =
+        test::_narrow (object.in (),
+                       ACE_TRY_ENV);
+      ACE_CHECK;
+
+      test_from_string->method (ACE_TRY_ENV);
+      ACE_CHECK;
+
+      iterator.advance ();
+    }
+}
+
+void
+test_i::thread_info (const char *method_name)
+{
+  // Get the ORB_Core's TSS resources.
+  TAO_ORB_Core_TSS_Resources *tss =
+    this->orb_->orb_core ()->get_tss_resources ();
+
+  /// Get the lane attribute in TSS.
+  TAO_Thread_Lane *lane =
+    (TAO_Thread_Lane *) tss->lane_;
+
+  if (lane)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "%s invoked by thread %t (pool id = %d; lane id = %d)\n",
+                  method_name,
+                  lane->pool ().id (),
+                  lane->id ()));
+
+      ACE_ASSERT (this->pool_ == lane->pool ().id ());
+      ACE_ASSERT (this->lane_ == lane->id ());
+    }
+  else
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "%s invoked by thread %t (default thread pool)\n",
+                  method_name));
+
+      ACE_ASSERT (this->pool_ == 0);
+      ACE_ASSERT (this->lane_ == 0);
+    }
+}
+
+void
+test_i::method (CORBA::Environment &)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->thread_info ("test_i::method");
+}
+
+PortableServer::POA_ptr
+test_i::_default_POA (CORBA_Environment &)
+{
+  return PortableServer::POA::_duplicate (this->poa_.in ());
+}
+
+class Server
+{
+public:
+  Server (int argc,
+          char *argv[],
+          CORBA::Environment &ACE_TRY_ENV);
+
+  void create_servant_in_root_poa (CORBA::Environment &ACE_TRY_ENV);
+  void create_poa_and_servant_with_tp_policy (CORBA::Environment &ACE_TRY_ENV);
+  void create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
+                                                         RTCORBA::PriorityModel priority_model,
+                                                         CORBA::Environment &ACE_TRY_ENV);
+  void test (CORBA::Environment &ACE_TRY_ENV);
+  void start_testing (CORBA::Environment &ACE_TRY_ENV);
+  void shutdown (CORBA::Environment &ACE_TRY_ENV);
+
+  CORBA::ORB_var orb_;
+  RTCORBA::RTORB_var rt_orb_;
+  PortableServer::POA_var root_poa_;
+  PortableServer::POAManager_var poa_manager_;
+  RTCORBA::Current_var current_;
+
+  Tests tests_;
+
+  CORBA::ULong stacksize_;
+  CORBA::ULong static_threads_;
+  CORBA::ULong dynamic_threads_;
+  CORBA::Boolean allow_request_buffering_;
+  CORBA::Boolean allow_borrowing_;
+  CORBA::ULong max_buffered_requests_;
+  CORBA::ULong max_request_buffer_size_;
+};
+
+Server::Server (int argc,
+                char *argv[],
+                CORBA::Environment &ACE_TRY_ENV)
+  : stacksize_ (0),
+    static_threads_ (1),
+    dynamic_threads_ (0),
+    allow_request_buffering_ (0),
+    allow_borrowing_ (0),
+    max_buffered_requests_ (0),
+    max_request_buffer_size_ (0)
+{
+  this->orb_ =
+    CORBA::ORB_init (argc,
+                     argv,
+                     "",
+                     ACE_TRY_ENV);
+  ACE_CHECK;
+
+  CORBA::Object_var object =
+    this->orb_->resolve_initial_references ("RTORB",
+                                            ACE_TRY_ENV);
+  ACE_CHECK;
+
+  this->rt_orb_ =
+    RTCORBA::RTORB::_narrow (object.in (),
+                             ACE_TRY_ENV);
+  ACE_CHECK;
+
+  object =
+    this->orb_->resolve_initial_references ("RTCurrent",
+                                            ACE_TRY_ENV);
+  ACE_CHECK;
+
+  this->current_ =
+    RTCORBA::Current::_narrow (object.in (),
+                               ACE_TRY_ENV);
+  ACE_CHECK;
+
+  default_thread_priority =
+    this->current_->the_priority (ACE_TRY_ENV);
+  ACE_CHECK;
+
+  object =
+    this->orb_->resolve_initial_references ("RootPOA",
+                                            ACE_TRY_ENV);
+  ACE_CHECK;
+
+  this->root_poa_ =
+    PortableServer::POA::_narrow (object.in (),
+                                  ACE_TRY_ENV);
+  ACE_CHECK;
+
+  this->poa_manager_ =
+    this->root_poa_->the_POAManager (ACE_TRY_ENV);
+  ACE_CHECK;
+
+  this->poa_manager_->activate (ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+
+void
+Server::create_servant_in_root_poa (CORBA::Environment &ACE_TRY_ENV)
+{
+  test_i *servant = 0;
+  ACE_NEW_THROW_EX (servant,
+                    test_i (this->orb_.in (),
+                            this->root_poa_.in (),
+                            this->tests_),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK;
+
+  servant->invocation_pool_and_lane (0, 0);
+
+  PortableServer::ServantBase_var safe_servant (servant);
+
+  this->tests_.size (this->tests_.size () + 1);
+  this->tests_[this->tests_.size () - 1].object_ =
+    servant->_this (ACE_TRY_ENV);
+  this->tests_[this->tests_.size () - 1].servant_ =
+    servant;
+  ACE_CHECK;
+}
+
+void
+Server::create_poa_and_servant_with_tp_policy (CORBA::Environment &ACE_TRY_ENV)
+{
+  RTCORBA::ThreadpoolId threadpool_id =
+    this->rt_orb_->create_threadpool (this->stacksize_,
+                                      this->static_threads_,
+                                      this->dynamic_threads_,
+                                      default_thread_priority,
+                                      this->allow_request_buffering_,
+                                      this->max_buffered_requests_,
+                                      this->max_request_buffer_size_,
+                                      ACE_TRY_ENV);
+  ACE_CHECK;
+
+  CORBA::Policy_var threadpool_policy =
+    this->rt_orb_->create_threadpool_policy (threadpool_id,
+                                             ACE_TRY_ENV);
+  ACE_CHECK;
+
+  CORBA::Policy_var implicit_activation_policy =
+    this->root_poa_->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION,
+                                                        ACE_TRY_ENV);
+  ACE_CHECK;
+
+  CORBA::PolicyList policies;
+
+  policies.length (policies.length () + 1);
+  policies[policies.length () - 1] =
+    implicit_activation_policy;
+
+  policies.length (policies.length () + 1);
+  policies[policies.length () - 1] =
+    threadpool_policy;
+
+  PortableServer::POA_var poa =
+    this->root_poa_->create_POA ("tp_child",
+                                 this->poa_manager_.in (),
+                                 policies,
+                                 ACE_TRY_ENV);
+  ACE_CHECK;
+
+  test_i *servant = 0;
+  ACE_NEW_THROW_EX (servant,
+                    test_i (this->orb_.in (),
+                            poa.in (),
+                            this->tests_),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK;
+
+  servant->invocation_pool_and_lane (1, 0);
+
+  PortableServer::ServantBase_var safe_servant (servant);
+
+  this->tests_.size (this->tests_.size () + 1);
+  this->tests_[this->tests_.size () - 1].object_ =
+    servant->_this (ACE_TRY_ENV);
+  this->tests_[this->tests_.size () - 1].servant_ =
+    servant;
+  ACE_CHECK;
+}
+
+void
+Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name,
+                                                          RTCORBA::PriorityModel priority_model,
+                                                          CORBA::Environment &ACE_TRY_ENV)
+{
+  RTCORBA::ThreadpoolLanes lanes (2);
+  lanes.length (2);
+
+  lanes[0].lane_priority = default_thread_priority;
+  lanes[0].static_threads = this->static_threads_;
+  lanes[0].dynamic_threads = this->dynamic_threads_;
+
+  lanes[1].lane_priority = default_thread_priority + 1;
+  lanes[1].static_threads = this->static_threads_;
+  lanes[1].dynamic_threads = this->dynamic_threads_;
+
+  RTCORBA::ThreadpoolId threadpool_id =
+    this->rt_orb_->create_threadpool_with_lanes (this->stacksize_,
+                                                 lanes,
+                                                 this->allow_borrowing_,
+                                                 this->allow_request_buffering_,
+                                                 this->max_buffered_requests_,
+                                                 this->max_request_buffer_size_,
+                                                 ACE_TRY_ENV);
+  ACE_CHECK;
+
+  CORBA::Policy_var threadpool_policy =
+    this->rt_orb_->create_threadpool_policy (threadpool_id,
+                                             ACE_TRY_ENV);
+  ACE_CHECK;
+
+  CORBA::Policy_var priority_model_policy =
+    this->rt_orb_->create_priority_model_policy (priority_model,
+                                                 default_thread_priority,
+                                                 ACE_TRY_ENV);
+  ACE_CHECK;
+
+  CORBA::PolicyList policies;
+
+  policies.length (policies.length () + 1);
+  policies[policies.length () - 1] =
+    threadpool_policy;
+
+  policies.length (policies.length () + 1);
+  policies[policies.length () - 1] =
+    priority_model_policy;
+
+  PortableServer::POA_var poa =
+    this->root_poa_->create_POA (poa_name,
+                                 this->poa_manager_.in (),
+                                 policies,
+                                 ACE_TRY_ENV);
+  ACE_CHECK;
+
+  RTPortableServer::POA_var rt_poa =
+    RTPortableServer::POA::_narrow (poa.in (),
+                                    ACE_TRY_ENV);
+  ACE_CHECK;
+
+  test_i *servant1 = 0;
+  test_i *servant2 = 0;
+  ACE_NEW_THROW_EX (servant1,
+                    test_i (this->orb_.in (),
+                            poa.in (),
+                            this->tests_),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK;
+
+  ACE_NEW_THROW_EX (servant2,
+                    test_i (this->orb_.in (),
+                            poa.in (),
+                            this->tests_),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK;
+
+  PortableServer::ServantBase_var safe_servant1 (servant1);
+  PortableServer::ServantBase_var safe_servant2 (servant2);
+
+  PortableServer::ObjectId_var id1;
+  PortableServer::ObjectId_var id2;
+
+  if (priority_model == RTCORBA::SERVER_DECLARED)
+    {
+      servant1->invocation_pool_and_lane (3, 0);
+      servant2->invocation_pool_and_lane (3, 1);
+
+      id1 =
+        rt_poa->activate_object_with_priority (servant1,
+                                               default_thread_priority,
+                                               ACE_TRY_ENV);
+      ACE_CHECK;
+
+      id2 =
+        rt_poa->activate_object_with_priority (servant2,
+                                               default_thread_priority + 1,
+                                               ACE_TRY_ENV);
+      ACE_CHECK;
+    }
+  else
+    {
+      servant1->invocation_pool (2);
+      servant2->invocation_pool (2);
+      servant1->client_propagated (1);
+      servant2->client_propagated (1);
+
+      id1 =
+        rt_poa->activate_object (servant1,
+                                 ACE_TRY_ENV);
+      ACE_CHECK;
+
+      id2 =
+        rt_poa->activate_object (servant2,
+                                 ACE_TRY_ENV);
+      ACE_CHECK;
+    }
+
+  CORBA::Object_var object1 =
+    poa->id_to_reference (id1.in (),
+                          ACE_TRY_ENV);
+  ACE_CHECK;
+
+  CORBA::Object_var object2 =
+    poa->id_to_reference (id2.in (),
+                          ACE_TRY_ENV);
+  ACE_CHECK;
+
+  this->tests_.size (this->tests_.size () + 1);
+  this->tests_[this->tests_.size () - 1].object_ =
+    test::_narrow (object1.in (),
+                   ACE_TRY_ENV);
+  this->tests_[this->tests_.size () - 1].servant_ =
+    servant1;
+  ACE_CHECK;
+
+  this->tests_.size (this->tests_.size () + 1);
+  this->tests_[this->tests_.size () - 1].object_ =
+    test::_narrow (object2.in (),
+                   ACE_TRY_ENV);
+  this->tests_[this->tests_.size () - 1].servant_ =
+    servant2;
+  ACE_CHECK;
+}
+
+void
+Server::start_testing (CORBA::Environment &ACE_TRY_ENV)
+{
+  Tests::ITERATOR iterator (this->tests_);
+  while (!iterator.done ())
+    {
+      Test_Object_And_Servant *test = 0;
+      iterator.next (test);
+
+      if (test->servant_->client_propagated ())
+        {
+          CORBA::Short current_thread_priority =
+            this->current_->the_priority (ACE_TRY_ENV);
+          ACE_CHECK;
+
+          if (current_thread_priority == default_thread_priority)
+            test->servant_->invocation_lane (0);
+          else
+            test->servant_->invocation_lane (1);
+        }
+
+      test->object_->start (ACE_TRY_ENV);
+      ACE_CHECK;
+
+      iterator.advance ();
+    }
+}
+
+void
+Server::test (CORBA::Environment &ACE_TRY_ENV)
+{
+  this->start_testing (ACE_TRY_ENV);
+  ACE_CHECK;
+
+  ACE_DEBUG ((LM_DEBUG,
+              "\n\n*** Changing priority to be higher ***\n\n"));
+
+  this->current_->the_priority (default_thread_priority + 1,
+                                ACE_TRY_ENV);
+  ACE_CHECK;
+
+  this->start_testing (ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+void
+Server::shutdown (CORBA::Environment &ACE_TRY_ENV)
+{
+  this->orb_->shutdown (1, ACE_TRY_ENV);
+  ACE_CHECK;
+
+  this->orb_->destroy (ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+int
+main (int argc, char *argv[])
+{
+  ACE_TRY_NEW_ENV
+    {
+      Server server (argc,
+                     argv,
+                     ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      server.create_servant_in_root_poa (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      server.create_poa_and_servant_with_tp_policy (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      server.create_poa_and_servant_with_tp_with_lanes_policy ("tp_with_lanes_client_propagated_poa",
+                                                               RTCORBA::CLIENT_PROPAGATED,
+                                                               ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      server.create_poa_and_servant_with_tp_with_lanes_policy ("tp_with_lanes_server_declared_poa",
+                                                               RTCORBA::SERVER_DECLARED,
+                                                               ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      server.test (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      server.shutdown (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "Exception caught:");
+      return 1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
+
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Array_Base<Test_Object_And_Servant>;
+template class ACE_Array_Iterator<Test_Object_And_Servant>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Array_Base<Test_Object_And_Servant>
+#pragma instantiate ACE_Array_Iterator<Test_Object_And_Servant>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tests/RTCORBA/Collocation/Collocation.dsp b/TAO/tests/RTCORBA/Collocation/Collocation.dsp
new file mode 100644
index 00000000000..9ef91c635b5
--- /dev/null
+++ b/TAO/tests/RTCORBA/Collocation/Collocation.dsp
@@ -0,0 +1,216 @@
+# Microsoft Developer Studio Project File - Name="Collocation" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=Collocation - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "Collocation.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "Collocation.mak" CFG="Collocation - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "Collocation - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Collocation - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Collocation - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 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 ace.lib TAO.lib TAO_PortableServer.lib TAO_RTCORBA.lib TAO_RTPortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+
+!ELSEIF  "$(CFG)" == "Collocation - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 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 TAO_RTCORBAd.lib TAO_RTPortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Collocation - Win32 Release"
+# Name "Collocation - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\Collocation.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\testC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\testS.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\testC.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\testS.h
+# End Source File
+# End Group
+# Begin Group "Inline Files"
+
+# PROP Default_Filter "i"
+# Begin Source File
+
+SOURCE=.\testC.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\testS.i
+# End Source File
+# End Group
+# Begin Group "IDL Files"
+
+# PROP Default_Filter "idl"
+# Begin Source File
+
+SOURCE=.\test.idl
+
+!IF  "$(CFG)" == "Collocation - Win32 Release"
+
+USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe"	
+# Begin Custom Build
+InputPath=.\test.idl
+InputName=test
+
+BuildCmds= \
+	..\..\..\..\bin\Release\tao_idl.exe -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Collocation - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"	
+# Begin Custom Build - Invoking TAO_IDL on $(InputName)
+InputPath=.\test.idl
+InputName=test
+
+BuildCmds= \
+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/TAO/tests/RTCORBA/Collocation/Collocation.dsw b/TAO/tests/RTCORBA/Collocation/Collocation.dsw
new file mode 100644
index 00000000000..52658fe3e58
--- /dev/null
+++ b/TAO/tests/RTCORBA/Collocation/Collocation.dsw
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "Collocation"=.\Collocation.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/TAO/tests/RTCORBA/Collocation/Makefile b/TAO/tests/RTCORBA/Collocation/Makefile
new file mode 100644
index 00000000000..ec240f65fde
--- /dev/null
+++ b/TAO/tests/RTCORBA/Collocation/Makefile
@@ -0,0 +1,1001 @@
+#----------------------------------------------------------------------------
+#
+#       $Id$
+#
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+#       Local macros
+#----------------------------------------------------------------------------
+
+ifndef TAO_ROOT
+  TAO_ROOT = $(ACE_ROOT)/TAO
+endif # ! TAO_ROOT
+
+IDL_FILES = test
+IDL_SRC = testC.cpp testS.cpp
+BIN_UNCHECKED = Collocation
+
+SRC = $(addsuffix .cpp, $(BIN)) $(IDL_SRC)
+
+COLLOCATION_OBJS = Collocation.o $(IDL_SRC:.cpp=.o)
+
+TAO_IDLFLAGS += -Ge 1
+#----------------------------------------------------------------------------
+#       Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+
+ifeq ($(rt_corba),1)
+BIN=$(BIN_UNCHECKED)
+endif # rt_corba
+
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include $(TAO_ROOT)/taoconfig.mk
+
+#----------------------------------------------------------------------------
+#       Local targets
+#----------------------------------------------------------------------------
+
+.PRECIOUS: $(foreach ext, $(IDL_EXT), test$(ext))
+
+Collocation: $(addprefix $(VDIR),$(COLLOCATION_OBJS))
+	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(RT_TAO_SRVR_LIBS) $(POSTLINK)
+
+realclean: clean
+	-$(RM) $(foreach ext, $(IDL_EXT), test$(ext))
+
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+
+.obj/Collocation.o .obj/Collocation.so .shobj/Collocation.o .shobj/Collocation.so: Collocation.cpp \
+  $(ACE_ROOT)/ace/Get_Opt.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Get_Opt.i \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/RTCORBA/Thread_Pool.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
+  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
+  $(TAO_ROOT)/tao/New_Leader_Generator.h \
+  $(ACE_ROOT)/ace/Task.h \
+  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task_T.h \
+  $(ACE_ROOT)/ace/Message_Queue.h \
+  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.i \
+  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Strategies.h \
+  $(ACE_ROOT)/ace/Strategies_T.h \
+  $(ACE_ROOT)/ace/Synch_Options.h \
+  $(ACE_ROOT)/ace/Synch_Options.i \
+  $(ACE_ROOT)/ace/Strategies_T.i \
+  $(ACE_ROOT)/ace/Strategies_T.cpp \
+  $(ACE_ROOT)/ace/Service_Repository.h \
+  $(ACE_ROOT)/ace/Service_Types.h \
+  $(ACE_ROOT)/ace/Service_Types.i \
+  $(ACE_ROOT)/ace/Service_Repository.i \
+  $(ACE_ROOT)/ace/WFMO_Reactor.h \
+  $(ACE_ROOT)/ace/Process_Mutex.h \
+  $(ACE_ROOT)/ace/Process_Mutex.inl \
+  $(ACE_ROOT)/ace/WFMO_Reactor.i \
+  $(ACE_ROOT)/ace/Strategies.i \
+  $(ACE_ROOT)/ace/Message_Queue.i \
+  $(ACE_ROOT)/ace/Task_T.i \
+  $(ACE_ROOT)/ace/Task_T.cpp \
+  $(ACE_ROOT)/ace/Module.h \
+  $(ACE_ROOT)/ace/Module.i \
+  $(ACE_ROOT)/ace/Module.cpp \
+  $(ACE_ROOT)/ace/Stream_Modules.h \
+  $(ACE_ROOT)/ace/Stream_Modules.cpp \
+  $(TAO_ROOT)/tao/RTCORBA/Thread_Pool.i \
+  testS.h testC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/ObjectIDList.h \
+  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  testC.i \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+  testS_T.h testS_T.i testS_T.cpp testS.i \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServer.h \
+  $(TAO_ROOT)/tao/RTPortableServer/rtportableserver_export.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.h \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.i
+
+.obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/ObjectIDList.h \
+  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  testC.i $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.i \
+  $(TAO_ROOT)/tao/Invocation.h \
+  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
+  $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/TAOC.i \
+  $(TAO_ROOT)/tao/operation_details.h \
+  $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/Service_Context.inl \
+  $(TAO_ROOT)/tao/target_specification.h \
+  $(TAO_ROOT)/tao/target_specification.i \
+  $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+  $(TAO_ROOT)/tao/Invocation.i \
+  $(TAO_ROOT)/tao/PortableInterceptor.h \
+  $(TAO_ROOT)/tao/RequestInfo_Util.h \
+  $(TAO_ROOT)/tao/ClientRequestInfo.h \
+  $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+  $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
+  $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
+
+.obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/ObjectIDList.h \
+  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  testC.i \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+  testS_T.h testS_T.i testS_T.cpp testS.i \
+  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
+  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
+  $(ACE_ROOT)/ace/Map.h \
+  $(ACE_ROOT)/ace/Map_T.h \
+  $(ACE_ROOT)/ace/Pair.h \
+  $(ACE_ROOT)/ace/Pair_T.h \
+  $(ACE_ROOT)/ace/Pair_T.i \
+  $(ACE_ROOT)/ace/Pair_T.cpp \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Active_Map_Manager.h \
+  $(ACE_ROOT)/ace/Active_Map_Manager.i \
+  $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Map_T.i \
+  $(ACE_ROOT)/ace/Map_T.cpp \
+  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \
+  $(TAO_ROOT)/tao/PortableServer/poa_macros.h \
+  $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \
+  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+  $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PortableServer/Default_Policy_Validator.h \
+  $(TAO_ROOT)/tao/PortableServer/Policy_Validator.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policies.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policies.i \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \
+  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
+  $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \
+  $(TAO_ROOT)/tao/TAO_Server_Request.h \
+  $(TAO_ROOT)/tao/Tagged_Profile.h \
+  $(TAO_ROOT)/tao/GIOPC.h \
+  $(TAO_ROOT)/tao/GIOPC.i \
+  $(TAO_ROOT)/tao/Tagged_Profile.i \
+  $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/Service_Context.inl \
+  $(TAO_ROOT)/tao/TAO_Server_Request.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/Stub.i \
+  $(TAO_ROOT)/tao/IFR_Client_Adapter.h \
+  $(TAO_ROOT)/tao/PortableInterceptor.h \
+  $(TAO_ROOT)/tao/RequestInfo_Util.h \
+  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+  $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.h \
+  $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.inl \
+  $(ACE_ROOT)/ace/Dynamic_Service.h \
+  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
+  $(ACE_ROOT)/ace/Dynamic_Service.i \
+  $(ACE_ROOT)/ace/Dynamic_Service.cpp
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/RTCORBA/Collocation/Makefile.bor b/TAO/tests/RTCORBA/Collocation/Makefile.bor
new file mode 100644
index 00000000000..e40de2f409d
--- /dev/null
+++ b/TAO/tests/RTCORBA/Collocation/Makefile.bor
@@ -0,0 +1,38 @@
+NAME = Collocation
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+OBJFILES = \
+	$(OBJDIR)\testC.obj \
+	$(OBJDIR)\testS.obj \
+	$(OBJDIR)\Collocation.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+	$(TAO_CFLAGS) \
+        $(TAO_PORTABLESERVER_CFLAGS) \
+        $(TAO_RTCORBA_CFLAGS) \
+        $(TAO_RTPORTABLESERVER_CFLAGS)
+
+LIBFILES = \
+	$(ACE_LIB) \
+	$(TAO_LIB) \
+        $(TAO_PORTABLESERVER_LIB) \
+        $(TAO_RTCORBA_LIB) \
+        $(TAO_RTPORTABLESERVER_LIB)
+
+IDLFILES = \
+        $(IDLDIR)\test.idl
+
+CPPDIR = .
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
+	$(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Collocation/README b/TAO/tests/RTCORBA/Collocation/README
new file mode 100644
index 00000000000..ee02bff879d
--- /dev/null
+++ b/TAO/tests/RTCORBA/Collocation/README
@@ -0,0 +1,41 @@
+$Id$
+
+Description:
+
+This is a test for collocation when using thread pools and lanes.
+There are multiple servants in this test:
+
+(a) One servant is in the Root POA which is service by the default
+    thread pool.
+
+(b) Another servant is in a POA which is serviced by a thread pool
+    without lanes.  Since a thread pool without lanes is really a
+    thread pool with one lane, all requests will be handled by this
+    one lane.  Therefore, setting the priority model policy was not
+    necessary for this POA.
+
+(c) There are two servants is in a POA which is serviced by a thread
+    pool with lanes, with the CLIENT_PROPAGATED policy.  Depending on
+    the priority of the caller, either one of the lanes processes the
+    request.
+
+(d) There are two more servants is in a POA which is serviced by a
+    thread pool with lanes, with the SERVER_DECLARED policy.  One
+    servant is registered to match one lane and the other servant
+    matches the other lane.
+
+All six servants are put into a global array.  The main thread starts
+off the testing by calling start() on each servant in the array.  The
+implementation of start() calls method() on each servant in the array.
+Since the upcalls will be handled by the lane corresponding to each
+servant, all six lanes ends up calling into one another.  
+
+The main thread then changes its priority and calls start() on each
+servant in the array.  This makes sure to exercise the second lane in
+the thread pool with lanes and the CLIENT_PROPAGATED priority.
+
+The test also converts the objects into strings and back to make sure
+that collocation works as expected for imported objects.
+
+This test has enough asserts to make sure that the correct thread is
+making the upcall.
diff --git a/TAO/tests/RTCORBA/Collocation/run_test.pl b/TAO/tests/RTCORBA/Collocation/run_test.pl
new file mode 100755
index 00000000000..970fbc9d2f3
--- /dev/null
+++ b/TAO/tests/RTCORBA/Collocation/run_test.pl
@@ -0,0 +1,22 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib '../../../../bin';
+use PerlACE::Run_Test;
+
+print STDERR "\n********** RTCORBA Collocation Unit Test **********\n\n";
+
+$T = new PerlACE::Process ("Collocation");
+
+$test = $T->SpawnWaitKill (60);
+
+if ($test != 0) {
+    print STDERR "ERROR: test returned $test\n";
+    exit 1;
+}
+
+exit 0;
diff --git a/TAO/tests/RTCORBA/Collocation/test.idl b/TAO/tests/RTCORBA/Collocation/test.idl
new file mode 100644
index 00000000000..fb23b0eeb08
--- /dev/null
+++ b/TAO/tests/RTCORBA/Collocation/test.idl
@@ -0,0 +1,8 @@
+// $Id$
+
+interface test
+{
+  void start ();
+
+  void method ();
+};
diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
new file mode 100644
index 00000000000..a66be2852ec
--- /dev/null
+++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
@@ -0,0 +1,168 @@
+// $Id$
+
+#include "ace/Get_Opt.h"
+#include "tao/corba.h"
+#include "tao/RTCORBA/RTCORBA.h"
+
+ACE_RCSID(Destroy_Thread_Pools, Destroy_Thread_Pools, "$Id$")
+
+static CORBA::ULong stacksize = 0;
+static CORBA::ULong static_threads = 1;
+static CORBA::ULong dynamic_threads = 0;
+static RTCORBA::Priority default_thread_priority;
+static CORBA::Boolean allow_request_buffering = 0;
+static CORBA::Boolean allow_borrowing = 0;
+static CORBA::ULong max_buffered_requests = 0;
+static CORBA::ULong max_request_buffer_size = 0;
+static int iterations = 5;
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "i:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'i':
+        iterations = ACE_OS::atoi (get_opts.optarg);
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-i <iterations> "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+
+  return 0;
+}
+
+RTCORBA::ThreadpoolId
+create_threadpool (RTCORBA::RTORB_ptr rt_orb,
+                   CORBA_Environment &ACE_TRY_ENV)
+{
+  RTCORBA::ThreadpoolId id =
+    rt_orb->create_threadpool (stacksize,
+                               static_threads,
+                               dynamic_threads,
+                               default_thread_priority,
+                               allow_request_buffering,
+                               max_buffered_requests,
+                               max_request_buffer_size,
+                               ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+
+  return id;
+}
+
+RTCORBA::ThreadpoolId
+create_threadpool_with_lanes (RTCORBA::RTORB_ptr rt_orb,
+                              CORBA_Environment &ACE_TRY_ENV)
+{
+  RTCORBA::ThreadpoolLanes lanes (2);
+  lanes.length (2);
+
+  lanes[0].lane_priority = default_thread_priority;
+  lanes[0].static_threads = static_threads;
+  lanes[0].dynamic_threads = dynamic_threads;
+
+  lanes[1].lane_priority = default_thread_priority;
+  lanes[1].static_threads = static_threads;
+  lanes[1].dynamic_threads = dynamic_threads;
+
+  RTCORBA::ThreadpoolId id =
+    rt_orb->create_threadpool_with_lanes (stacksize,
+                                          lanes,
+                                          allow_borrowing,
+                                          allow_request_buffering,
+                                          max_buffered_requests,
+                                          max_request_buffer_size,
+                                          ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+
+  return id;
+}
+
+int
+main (int argc, char *argv[])
+{
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc,
+                         argv,
+                         "",
+                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      CORBA::Object_var object =
+        orb->resolve_initial_references ("RTORB",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      RTCORBA::RTORB_var rt_orb =
+        RTCORBA::RTORB::_narrow (object.in (),
+                                 ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      object =
+        orb->resolve_initial_references ("RTCurrent",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      RTCORBA::Current_var current =
+        RTCORBA::Current::_narrow (object.in (),
+                                   ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      default_thread_priority =
+        current->the_priority (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      int result =
+        parse_args (argc, argv);
+      if (result != 0)
+        return result;
+
+      int i = 0;
+      for (i = 0;
+           i < iterations;
+           ++i)
+        {
+          RTCORBA::ThreadpoolId id =
+            create_threadpool (rt_orb.in (),
+                               ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          rt_orb->destroy_threadpool (id,
+                                      ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          id =
+            create_threadpool_with_lanes (rt_orb.in (),
+                                          ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          rt_orb->destroy_threadpool (id,
+                                      ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+        }
+
+      orb->destroy (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "Exception caught:");
+      return 1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.dsp b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.dsp
new file mode 100644
index 00000000000..f18b3888e38
--- /dev/null
+++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.dsp
@@ -0,0 +1,103 @@
+# Microsoft Developer Studio Project File - Name="Destroy_Thread_Pool" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=Destroy_Thread_Pool - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "Destroy_Thread_Pool.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "Destroy_Thread_Pool.mak" CFG="Destroy_Thread_Pool - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "Destroy_Thread_Pool - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Destroy_Thread_Pool - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Destroy_Thread_Pool - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 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 ace.lib TAO.lib TAO_RTCORBA.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA"
+
+!ELSEIF  "$(CFG)" == "Destroy_Thread_Pool - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 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_RTCORBAd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA"
+
+!ENDIF
+
+# Begin Target
+
+# Name "Destroy_Thread_Pool - Win32 Release"
+# Name "Destroy_Thread_Pool - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\Destroy_Thread_Pool.cpp
+# End Source File
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+
+# End Group
+# Begin Group "Inline Files"
+
+# PROP Default_Filter "i"
+# End Group
+# End Target
+# End Project
diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.dsw b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.dsw
new file mode 100644
index 00000000000..acc0daffe59
--- /dev/null
+++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.dsw
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "Destroy_Thread_Pool"=.\Destroy_Thread_Pool.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Makefile b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Makefile
new file mode 100644
index 00000000000..a8a9b765e1d
--- /dev/null
+++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Makefile
@@ -0,0 +1,247 @@
+#----------------------------------------------------------------------------
+#
+# $Id$
+#
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+#       Local macros
+#----------------------------------------------------------------------------
+
+ifndef TAO_ROOT
+  TAO_ROOT = $(ACE_ROOT)/TAO
+endif # ! TAO_ROOT
+
+BIN_UNCHECKED = Destroy_Thread_Pool
+
+SRC = $(addsuffix .cpp, $(BIN)) 
+
+DESTROY_THREAD_POOL_OBJS = $(SRC:.cpp=.o)
+
+BUILD = $(BIN)
+VBIN = $(BIN:%=%$(VAR))
+
+#----------------------------------------------------------------------------
+#       Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+
+ifeq ($(rt_corba),1)
+BIN=$(BIN_UNCHECKED)
+endif # rt_corba
+
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include $(TAO_ROOT)/taoconfig.mk
+
+#----------------------------------------------------------------------------
+#       Local targets
+#----------------------------------------------------------------------------
+
+.PRECIOUS: $(foreach ext, $(IDL_EXT), test$(ext))
+
+Destroy_Thread_Pool: $(addprefix $(VDIR),$(DESTROY_THREAD_POOL_OBJS))
+	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(RT_TAO_CLNT_LIBS) $(POSTLINK)
+
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+
+.obj/Destroy_Thread_Pool.o .obj/Destroy_Thread_Pool.so .shobj/Destroy_Thread_Pool.o .shobj/Destroy_Thread_Pool.so: Destroy_Thread_Pool.cpp \
+  $(ACE_ROOT)/ace/Get_Opt.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Get_Opt.i \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/ObjectIDList.h \
+  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
+  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Makefile.bor b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Makefile.bor
new file mode 100644
index 00000000000..a4d20c2a288
--- /dev/null
+++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Makefile.bor
@@ -0,0 +1,26 @@
+#
+# Makefile for building Destroy_Thread_Pool
+#
+
+NAME = Destroy_Thread_Pool
+
+
+OBJFILES = \
+	$(OBJDIR)\Destroy_Thread_Pool.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+	$(TAO_CFLAGS) \
+        $(TAO_RTCORBA_CFLAGS)
+
+LIBFILES = \
+	$(ACE_LIB) \
+	$(TAO_LIB) \
+        $(TAO_RTCORBA_LIB)
+
+CPPDIR = .
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/README b/TAO/tests/RTCORBA/Destroy_Thread_Pool/README
new file mode 100644
index 00000000000..c756cead921
--- /dev/null
+++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/README
@@ -0,0 +1,7 @@
+$Id$
+
+Description:
+This is a simple test for creating and destroying thread pools (with
+and without lanes).
+
+See run_test.pl to see how to run this test.
+\ No newline at end of file
diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl b/TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl
new file mode 100755
index 00000000000..d04d0035c73
--- /dev/null
+++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/run_test.pl
@@ -0,0 +1,22 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib '../../../../bin';
+use PerlACE::Run_Test;
+
+print STDERR "\n********** RTCORBA Destroy_Thread_Pool Unit Test **********\n\n";
+
+$T = new PerlACE::Process ("Destroy_Thread_Pool");
+
+$test = $T->SpawnWaitKill (60);
+
+if ($test != 0) {
+    print STDERR "ERROR: test returned $test\n";
+    exit 1;
+}
+
+exit 0;
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/client.bor b/TAO/tests/RTCORBA/Explicit_Binding/client.bor
index 1ecc29f9ab9..d6de2353f13 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/client.bor
+++ b/TAO/tests/RTCORBA/Explicit_Binding/client.bor
@@ -14,14 +14,12 @@ CFLAGS = \
 	$(ACE_CFLAGS) \
 	$(TAO_CFLAGS) \
 	$(TAO_STRATEGIES_CFLAGS) \
-        $(TAO_PORTABLESERVER_CFLAGS) \
         $(TAO_RTCORBA_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
 	$(TAO_LIB) \
 	$(TAO_STRATEGIES_LIB) \
-        $(TAO_PORTABLESERVER_LIB) \
         $(TAO_RTCORBA_LIB)
 
 IDLFILES = \
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/client.dsp b/TAO/tests/RTCORBA/Explicit_Binding/client.dsp
index 752d411313f..a88afee15ce 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/client.dsp
+++ b/TAO/tests/RTCORBA/Explicit_Binding/client.dsp
@@ -51,7 +51,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 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_RTCORBA.lib TAO_RTPortableServer.lib ace.lib TAO.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 ace.lib TAO.lib TAO_RTCORBA.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\Strategies"
 
 !ELSEIF  "$(CFG)" == "Explicit_Binding Client - Win32 Debug"
 
@@ -76,7 +76,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 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 TAO_RTCORBAd.lib TAO_RTPortableServerd.lib TAO_Strategiesd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 aced.lib TAOd.lib TAO_RTCORBAd.lib TAO_Strategiesd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\Strategies"
 
 !ENDIF 
 
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/server.dsp b/TAO/tests/RTCORBA/Explicit_Binding/server.dsp
index 69a6797412b..736d298a48e 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/server.dsp
+++ b/TAO/tests/RTCORBA/Explicit_Binding/server.dsp
@@ -51,7 +51,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 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 ace.lib TAO.lib TAO_PortableServer.lib TAO_Strategies.lib TAO_RTCORBA.lib TAO_RTPortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_RTCORBA.lib TAO_RTPortableServer.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer" /libpath:"..\..\..\tao\Strategies"
 
 !ELSEIF  "$(CFG)" == "Explicit_Binding Server - Win32 Debug"
 
@@ -76,7 +76,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 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 TAO_Strategiesd.lib TAO_PortableServerd.lib TAOd.lib aced.lib  TAO_RTCORBAd.lib TAO_RTPortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_RTCORBAd.lib TAO_RTPortableServerd.lib TAO_Strategiesd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer" /libpath:"..\..\..\tao\Strategies"
 
 !ENDIF 
 
diff --git a/TAO/tests/RTCORBA/Linear_Priority/Linear_Priority.dsw b/TAO/tests/RTCORBA/Linear_Priority/Linear_Priority.dsw
new file mode 100644
index 00000000000..d17cf7c9604
--- /dev/null
+++ b/TAO/tests/RTCORBA/Linear_Priority/Linear_Priority.dsw
@@ -0,0 +1,41 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "client"=.\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "server"=.\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/TAO/tests/RTCORBA/Linear_Priority/Makefile b/TAO/tests/RTCORBA/Linear_Priority/Makefile
new file mode 100644
index 00000000000..abbfbf1bcab
--- /dev/null
+++ b/TAO/tests/RTCORBA/Linear_Priority/Makefile
@@ -0,0 +1,1208 @@
+#----------------------------------------------------------------------------
+#
+#       $Id$
+#
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+#       Local macros
+#----------------------------------------------------------------------------
+
+ifndef TAO_ROOT
+  TAO_ROOT = $(ACE_ROOT)/TAO
+endif # ! TAO_ROOT
+
+IDL_FILES = test
+IDL_SRC = testC.cpp testS.cpp
+BIN_UNCHECKED = client server
+
+SRC = $(addsuffix .cpp, $(BIN)) $(IDL_SRC)
+
+CLIENT_OBJS = client.o testC.o
+SERVER_OBJS = server.o $(IDL_SRC:.cpp=.o)
+
+TAO_IDLFLAGS += -Ge 1
+#----------------------------------------------------------------------------
+#       Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+
+ifeq ($(rt_corba),1)
+BIN=$(BIN_UNCHECKED)
+endif # rt_corba
+
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include $(TAO_ROOT)/taoconfig.mk
+
+#----------------------------------------------------------------------------
+#       Local targets
+#----------------------------------------------------------------------------
+
+.PRECIOUS: $(foreach ext, $(IDL_EXT), test$(ext))
+
+server: $(addprefix $(VDIR),$(SERVER_OBJS))
+	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(RT_TAO_SRVR_LIBS) $(POSTLINK)
+
+client: $(addprefix $(VDIR),$(CLIENT_OBJS))
+	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(RT_TAO_CLNT_LIBS) $(POSTLINK)
+
+realclean: clean
+	-$(RM) $(foreach ext, $(IDL_EXT), test$(ext))
+
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+
+.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
+  $(ACE_ROOT)/ace/Get_Opt.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Get_Opt.i \
+  $(ACE_ROOT)/ace/Task.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task_T.h \
+  $(ACE_ROOT)/ace/Message_Queue.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.i \
+  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Strategies.h \
+  $(ACE_ROOT)/ace/Strategies_T.h \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(ACE_ROOT)/ace/Synch_Options.h \
+  $(ACE_ROOT)/ace/Synch_Options.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Strategies_T.i \
+  $(ACE_ROOT)/ace/Strategies_T.cpp \
+  $(ACE_ROOT)/ace/Service_Repository.h \
+  $(ACE_ROOT)/ace/Service_Types.h \
+  $(ACE_ROOT)/ace/Service_Types.i \
+  $(ACE_ROOT)/ace/Service_Repository.i \
+  $(ACE_ROOT)/ace/WFMO_Reactor.h \
+  $(ACE_ROOT)/ace/Process_Mutex.h \
+  $(ACE_ROOT)/ace/Process_Mutex.inl \
+  $(ACE_ROOT)/ace/WFMO_Reactor.i \
+  $(ACE_ROOT)/ace/Strategies.i \
+  $(ACE_ROOT)/ace/Message_Queue.i \
+  $(ACE_ROOT)/ace/Task_T.i \
+  $(ACE_ROOT)/ace/Task_T.cpp \
+  $(ACE_ROOT)/ace/Module.h \
+  $(ACE_ROOT)/ace/Module.i \
+  $(ACE_ROOT)/ace/Module.cpp \
+  $(ACE_ROOT)/ace/Stream_Modules.h \
+  $(ACE_ROOT)/ace/Stream_Modules.cpp \
+  testC.h $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/ObjectIDList.h \
+  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  testC.i \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
+  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  ../check_supported_priorities.cpp \
+  $(ACE_ROOT)/ace/Sched_Params.h \
+  $(ACE_ROOT)/ace/Sched_Params.i \
+  readers.cpp \
+  $(ACE_ROOT)/ace/Read_Buffer.h \
+  $(ACE_ROOT)/ace/Read_Buffer.i
+
+.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \
+  $(ACE_ROOT)/ace/Get_Opt.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Get_Opt.i testS.h \
+  testC.h $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/ObjectIDList.h \
+  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  testC.i \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+  testS_T.h testS_T.i testS_T.cpp testS.i \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServer.h \
+  $(TAO_ROOT)/tao/RTPortableServer/rtportableserver_export.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
+  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.h \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.i \
+  ../check_supported_priorities.cpp \
+  $(ACE_ROOT)/ace/Sched_Params.h \
+  $(ACE_ROOT)/ace/Sched_Params.i \
+  readers.cpp \
+  $(ACE_ROOT)/ace/Read_Buffer.h \
+  $(ACE_ROOT)/ace/Read_Buffer.i \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp
+
+.obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/ObjectIDList.h \
+  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  testC.i $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.i \
+  $(TAO_ROOT)/tao/Invocation.h \
+  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
+  $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/TAOC.i \
+  $(TAO_ROOT)/tao/operation_details.h \
+  $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/Service_Context.inl \
+  $(TAO_ROOT)/tao/target_specification.h \
+  $(TAO_ROOT)/tao/target_specification.i \
+  $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+  $(TAO_ROOT)/tao/Invocation.i \
+  $(TAO_ROOT)/tao/PortableInterceptor.h \
+  $(TAO_ROOT)/tao/RequestInfo_Util.h \
+  $(TAO_ROOT)/tao/ClientRequestInfo.h \
+  $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+  $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
+  $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
+
+.obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/ObjectIDList.h \
+  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  testC.i \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+  testS_T.h testS_T.i testS_T.cpp testS.i \
+  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
+  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
+  $(ACE_ROOT)/ace/Map.h \
+  $(ACE_ROOT)/ace/Map_T.h \
+  $(ACE_ROOT)/ace/Pair.h \
+  $(ACE_ROOT)/ace/Pair_T.h \
+  $(ACE_ROOT)/ace/Pair_T.i \
+  $(ACE_ROOT)/ace/Pair_T.cpp \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Active_Map_Manager.h \
+  $(ACE_ROOT)/ace/Active_Map_Manager.i \
+  $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Map_T.i \
+  $(ACE_ROOT)/ace/Map_T.cpp \
+  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \
+  $(TAO_ROOT)/tao/PortableServer/poa_macros.h \
+  $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \
+  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+  $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PortableServer/Default_Policy_Validator.h \
+  $(TAO_ROOT)/tao/PortableServer/Policy_Validator.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policies.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policies.i \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \
+  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
+  $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \
+  $(TAO_ROOT)/tao/TAO_Server_Request.h \
+  $(TAO_ROOT)/tao/Tagged_Profile.h \
+  $(TAO_ROOT)/tao/GIOPC.h \
+  $(TAO_ROOT)/tao/GIOPC.i \
+  $(TAO_ROOT)/tao/Tagged_Profile.i \
+  $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/Service_Context.inl \
+  $(TAO_ROOT)/tao/TAO_Server_Request.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/Stub.i \
+  $(TAO_ROOT)/tao/IFR_Client_Adapter.h \
+  $(TAO_ROOT)/tao/PortableInterceptor.h \
+  $(TAO_ROOT)/tao/RequestInfo_Util.h \
+  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+  $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.h \
+  $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.inl \
+  $(ACE_ROOT)/ace/Dynamic_Service.h \
+  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
+  $(ACE_ROOT)/ace/Dynamic_Service.i \
+  $(ACE_ROOT)/ace/Dynamic_Service.cpp
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/RTCORBA/Linear_Priority/Makefile.bor b/TAO/tests/RTCORBA/Linear_Priority/Makefile.bor
new file mode 100644
index 00000000000..e2ee4acd23a
--- /dev/null
+++ b/TAO/tests/RTCORBA/Linear_Priority/Makefile.bor
@@ -0,0 +1,7 @@
+#
+# Makefile for building the Faults test executables
+#
+
+MAKEFILES = server.bor client.bor
+
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/RTCORBA/Linear_Priority/README b/TAO/tests/RTCORBA/Linear_Priority/README
new file mode 100644
index 00000000000..5064c84bdce
--- /dev/null
+++ b/TAO/tests/RTCORBA/Linear_Priority/README
@@ -0,0 +1,36 @@
+$Id$
+
+Description:
+
+This is a test for the Linear Priority mapping in TAO.  In addition,
+this test combines and tests several RT policies in different ways.
+This test can also be used for testing the different scheduling
+policies (e.g., FIFO, RR, OTHER) by using the ORBSchedPolicy and
+ORBScopePolicy options in svc.conf file.
+
+- The server can be setup to use bands or no bands and thread lanes or
+  no lanes.
+
+- The client can be setup to use bands or no bands and different
+  invocation priorities.  It creates a thread for each invocation
+  priority and issues multiple requests to the server from each
+  thread.
+
+- The following policy combinations are tested in this example:
+  __________________________________________________
+
+  Server-side   Thread   Client-side  Multi-priority
+     Bands       Lanes      Bands        Clients
+  __________________________________________________
+
+      NO          NO          NO           NO
+      YES         NO          NO           NO
+      NO          YES         NO           NO
+      YES         YES         NO           NO
+      NO          NO          YES          NO
+      NO          YES         YES          NO
+      NO          NO          NO           YES
+      YES         NO          NO           YES
+      YES         YES         NO           YES      
+      NO          NO          YES          YES
+      NO          YES         YES          YES
diff --git a/TAO/tests/RTCORBA/Linear_Priority/bands b/TAO/tests/RTCORBA/Linear_Priority/bands
new file mode 100644
index 00000000000..a3f7158df97
--- /dev/null
+++ b/TAO/tests/RTCORBA/Linear_Priority/bands
@@ -0,0 +1 @@
+0 5000 5000 10000 10000 15000 15000 20000 20000 25000 25000 30000
diff --git a/TAO/tests/RTCORBA/Linear_Priority/client.bor b/TAO/tests/RTCORBA/Linear_Priority/client.bor
new file mode 100644
index 00000000000..b626ed867c2
--- /dev/null
+++ b/TAO/tests/RTCORBA/Linear_Priority/client.bor
@@ -0,0 +1,37 @@
+#
+# Makefile for building the Faults ping executable
+#
+
+NAME = client
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+OBJFILES = \
+	$(OBJDIR)\testC.obj \
+	$(OBJDIR)\client.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+        $(TAO_CFLAGS) \
+        $(TAO_RTCORBA_CFLAGS)
+
+LIBFILES = \
+	$(ACE_LIB) \
+        $(TAO_LIB) \
+        $(TAO_RTCORBA_LIB)
+
+IDLFILES = \
+        $(IDLDIR)\test.idl
+
+CPPDIR = .
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
+	$(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Linear_Priority/client.cpp b/TAO/tests/RTCORBA/Linear_Priority/client.cpp
new file mode 100644
index 00000000000..91afdc1ea2a
--- /dev/null
+++ b/TAO/tests/RTCORBA/Linear_Priority/client.cpp
@@ -0,0 +1,259 @@
+// $Id$
+
+#include "ace/Get_Opt.h"
+#include "ace/Task.h"
+#include "testC.h"
+#include "tao/RTCORBA/RTCORBA.h"
+#include "tao/ORB_Core.h"
+#include "../check_supported_priorities.cpp"
+#include "./readers.cpp"
+
+static int iterations = 5;
+static int shutdown_server = 0;
+
+static const char *ior = "file://ior";
+
+static const char *invocation_priorities_file = "invocation_priorities";
+static const char *bands_file = "empty_file";
+
+static int
+parse_args (int argc, char **argv)
+{
+  ACE_Get_Opt get_opts (argc, argv, "b:p:k:i:x");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'k':
+        ior = get_opts.optarg;
+        break;
+
+      case 'i':
+        iterations = ::atoi (get_opts.optarg);
+        break;
+
+      case 'x':
+        shutdown_server = 1;
+        break;
+
+      case 'p':
+        invocation_priorities_file = get_opts.optarg;
+        break;
+
+      case 'b':
+        bands_file = get_opts.optarg;
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-b <bands_file> "
+                           "-p <invocation_priorities_file> "
+                           "-k ior "
+                           "-i iterations "
+                           "-x shutdown server "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+
+  return 0;
+}
+
+class Worker_Thread : public ACE_Task_Base
+{
+public:
+  Worker_Thread (test_ptr test,
+                 RTCORBA::Current_ptr current,
+                 CORBA::Short priority);
+
+  int svc (void);
+
+private:
+  test_var test_;
+  RTCORBA::Current_var current_;
+  CORBA::Short priority_;
+};
+
+Worker_Thread::Worker_Thread (test_ptr test,
+                              RTCORBA::Current_ptr current,
+                              CORBA::Short priority)
+  : test_ (test::_duplicate (test)),
+    current_ (RTCORBA::Current::_duplicate (current)),
+    priority_ (priority)
+{
+}
+
+int
+Worker_Thread::svc (void)
+{
+  ACE_TRY_NEW_ENV
+    {
+      this->current_->the_priority (this->priority_,
+                                    ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      for (int i = 0; i < iterations; i++)
+        {
+          this->test_->method (ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "Worker Thread exception:");
+    }
+  ACE_ENDTRY;
+  return 0;
+}
+
+int
+main (int argc, char **argv)
+{
+  // Make sure we can support multiple priorities that are required
+  // for this test.
+  check_supported_priorities ();
+
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc,
+                         argv,
+                         0,
+                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      int result =
+        parse_args (argc, argv);
+      if (result != 0)
+        return result;
+
+      CORBA::Object_var object =
+        orb->resolve_initial_references ("RTORB",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      RTCORBA::RTORB_var rt_orb =
+        RTCORBA::RTORB::_narrow (object.in (),
+                                 ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      object =
+        orb->resolve_initial_references ("RTCurrent",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      RTCORBA::Current_var current =
+        RTCORBA::Current::_narrow (object.in (),
+                                   ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      current->the_priority (0,
+                             ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      object =
+        orb->resolve_initial_references ("ORBPolicyManager",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      CORBA::PolicyManager_var policy_manager =
+        CORBA::PolicyManager::_narrow (object.in (),
+                                       ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      object =
+        orb->string_to_object (ior,
+                               ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      test_var test =
+        test::_narrow (object.in (),
+                       ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      Priorities priorities;
+      result =
+        get_priorities ("client",
+                        invocation_priorities_file,
+                        "invocation priorities",
+                        priorities);
+      if (result != 0)
+        return result;
+
+      CORBA::PolicyList policies;
+
+      result =
+        get_priority_bands ("client",
+                            bands_file,
+                            rt_orb.in (),
+                            policies,
+                            ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      if (result != 0)
+        return result;
+
+      policy_manager->set_policy_overrides (policies,
+                                            CORBA::SET_OVERRIDE,
+                                            ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      u_long i = 0;
+
+      // Workers.
+      Worker_Thread **workers = 0;
+
+      ACE_NEW_RETURN (workers,
+                      Worker_Thread *[priorities.size ()],
+                      -1);
+
+      for (i = 0;
+           i < priorities.size ();
+           ++i)
+        {
+          ACE_NEW_RETURN (workers[i],
+                          Worker_Thread (test.in (),
+                                         current.in (),
+                                         priorities[i]),
+                          -1);
+
+          long flags =
+            THR_NEW_LWP |
+            THR_JOINABLE |
+            orb->orb_core ()->orb_params ()->scope_policy () |
+            orb->orb_core ()->orb_params ()->sched_policy ();
+
+          result =
+            workers[i]->activate (flags);
+          if (result != 0)
+            return result;
+        }
+
+      ACE_Thread_Manager::instance ()->wait ();
+
+      for (i = 0;
+           i < priorities.size ();
+           ++i)
+        {
+          delete workers[i];
+        }
+      delete[] workers;
+
+      if (shutdown_server)
+        {
+          test->shutdown (ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception!");
+      return -1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
diff --git a/TAO/tests/RTCORBA/Linear_Priority/client.dsp b/TAO/tests/RTCORBA/Linear_Priority/client.dsp
new file mode 100644
index 00000000000..d9966138f60
--- /dev/null
+++ b/TAO/tests/RTCORBA/Linear_Priority/client.dsp
@@ -0,0 +1,204 @@
+# Microsoft Developer Studio Project File - Name="Linear_Priority Client" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=Linear_Priority Client - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "client.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "client.mak" CFG="Linear_Priority Client - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "Linear_Priority Client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Linear_Priority Client - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Linear_Priority Client - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 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 ace.lib TAO.lib TAO_RTCORBA.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA"
+
+!ELSEIF  "$(CFG)" == "Linear_Priority Client - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 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_RTCORBAd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Linear_Priority Client - Win32 Release"
+# Name "Linear_Priority Client - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\client.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\testC.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\testC.h
+# End Source File
+# End Group
+# Begin Group "Inline Files"
+
+# PROP Default_Filter "i"
+# Begin Source File
+
+SOURCE=.\testC.i
+# End Source File
+# End Group
+# Begin Group "IDL Files"
+
+# PROP Default_Filter "idl"
+# Begin Source File
+
+SOURCE=.\test.idl
+
+!IF  "$(CFG)" == "Linear_Priority Client - Win32 Release"
+
+USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe"	
+# Begin Custom Build
+InputPath=.\test.idl
+InputName=test
+
+BuildCmds= \
+	..\..\..\..\bin\Release\tao_idl.exe -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Linear_Priority Client - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"	
+# Begin Custom Build - Invoking TAO_IDL on $(InputName)
+InputPath=.\test.idl
+InputName=test
+
+BuildCmds= \
+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/TAO/tests/RTCORBA/Linear_Priority/empty_file b/TAO/tests/RTCORBA/Linear_Priority/empty_file
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/TAO/tests/RTCORBA/Linear_Priority/empty_file
diff --git a/TAO/tests/RTCORBA/Linear_Priority/invocation_priorities b/TAO/tests/RTCORBA/Linear_Priority/invocation_priorities
new file mode 100644
index 00000000000..2d32fee52d0
--- /dev/null
+++ b/TAO/tests/RTCORBA/Linear_Priority/invocation_priorities
@@ -0,0 +1 @@
+2500 7500 12500 17500 22500 27500
+\ No newline at end of file
diff --git a/TAO/tests/RTCORBA/Linear_Priority/lanes b/TAO/tests/RTCORBA/Linear_Priority/lanes
new file mode 100644
index 00000000000..02162bc453f
--- /dev/null
+++ b/TAO/tests/RTCORBA/Linear_Priority/lanes
@@ -0,0 +1 @@
+0 5000 10000 15000 20000 25000
+\ No newline at end of file
diff --git a/TAO/tests/RTCORBA/Linear_Priority/readers.cpp b/TAO/tests/RTCORBA/Linear_Priority/readers.cpp
new file mode 100644
index 00000000000..44d8c7baeef
--- /dev/null
+++ b/TAO/tests/RTCORBA/Linear_Priority/readers.cpp
@@ -0,0 +1,229 @@
+// $Id$
+
+#include "ace/Read_Buffer.h"
+#include "ace/Array_Base.h"
+
+typedef ACE_Array_Base<CORBA::Short> Priorities;
+
+int
+get_priority_bands (const char *test_type,
+                    const char *bands_file,
+                    RTCORBA::RTORB_ptr rt_orb,
+                    CORBA::PolicyList &policies,
+                    CORBA::Environment &ACE_TRY_ENV)
+{
+  //
+  // Read bands from a file.
+  //
+  FILE* file =
+    ACE_OS::fopen (bands_file, "r");
+
+  if (file == 0)
+    return -1;
+
+  ACE_Read_Buffer reader (file, 1);
+
+  char *string =
+    reader.read (EOF, ' ', '\0');
+
+  // Check for empty bands file.
+  if (string == 0)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "\n%s: No bands set!\n\n",
+                  test_type));
+      return 0;
+    }
+
+  CORBA::ULong bands_length =
+    (reader.replaced () + 1) / 2;
+
+  RTCORBA::PriorityBands bands;
+  bands.length (bands_length);
+
+  ACE_DEBUG ((LM_DEBUG,
+              "\n%s: There are %d bands: ",
+              test_type,
+              bands_length));
+
+  int result = 1;
+  char* working_string = string;
+  for (CORBA::ULong i = 0; i < bands_length; ++i)
+    {
+      result = ::sscanf (working_string,
+                         "%hd",
+                         &bands[i].low);
+      if (result == 0 || result == EOF)
+        break;
+
+      working_string += ACE_OS::strlen (working_string);
+      working_string += 1;
+
+      result = ::sscanf (working_string,
+                         "%hd",
+                         &bands[i].high);
+      if (result == 0 || result == EOF)
+        break;
+
+      working_string += ACE_OS::strlen (working_string);
+      working_string += 1;
+
+      ACE_DEBUG ((LM_DEBUG,
+                  "[%d %d] ",
+                  bands[i].low,
+                  bands[i].high));
+    }
+
+  reader.alloc ()->free (string);
+
+  if (result == 0 || result == EOF)
+    return -1;
+
+  ACE_DEBUG ((LM_DEBUG,
+              "\n\n"));
+
+  CORBA::Policy_var banded_connection_policy =
+    rt_orb->create_priority_banded_connection_policy (bands,
+                                                      ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  policies.length (policies.length () + 1);
+  policies[policies.length () - 1] =
+    banded_connection_policy;
+
+  return 0;
+}
+
+int
+get_priorities (const char *test_type,
+                const char *file_name,
+                const char *name,
+                Priorities &priorities)
+{
+  //
+  // Read lanes from a file.
+  //
+  FILE* file =
+    ACE_OS::fopen (file_name, "r");
+
+  if (file == 0)
+    return -1;
+
+  ACE_Read_Buffer reader (file, 1);
+
+  char *string =
+    reader.read (EOF, ' ', '\0');
+
+  // Check for empty lanes file.
+  if (string == 0)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "\n%s: No %s set!\n\n",
+                  test_type,
+                  name));
+      return 0;
+    }
+
+  size_t length =
+    reader.replaced () + 1;
+
+  priorities.size (length);
+
+  ACE_DEBUG ((LM_DEBUG,
+              "\n%s: There are %d %s: ",
+              test_type,
+              length,
+              name));
+
+  int result = 1;
+  char* working_string = string;
+  for (CORBA::ULong i = 0; i < length; ++i)
+    {
+      result = ::sscanf (working_string,
+                         "%hd",
+                         &priorities[i]);
+      if (result == 0 || result == EOF)
+        break;
+
+      working_string += ACE_OS::strlen (working_string);
+      working_string += 1;
+
+      ACE_DEBUG ((LM_DEBUG,
+                  "[%d] ",
+                  priorities[i]));
+    }
+
+  reader.alloc ()->free (string);
+
+  if (result == 0 || result == EOF)
+    return -1;
+
+  ACE_DEBUG ((LM_DEBUG,
+              "\n\n"));
+
+  return 0;
+}
+
+int
+get_priority_lanes (const char *test_type,
+                    const char *lanes_file,
+                    RTCORBA::RTORB_ptr rt_orb,
+                    CORBA::ULong stacksize,
+                    CORBA::ULong static_threads,
+                    CORBA::ULong dynamic_threads,
+                    CORBA::Boolean allow_request_buffering,
+                    CORBA::ULong max_buffered_requests,
+                    CORBA::ULong max_request_buffer_size,
+                    CORBA::Boolean allow_borrowing,
+                    CORBA::PolicyList &policies,
+                    CORBA::Environment &ACE_TRY_ENV)
+{
+  Priorities priorities;
+  int result =
+    get_priorities (test_type,
+                    lanes_file,
+                    "lanes",
+                    priorities);
+  if (result != 0 ||
+      priorities.size () == 0)
+    return result;
+
+  RTCORBA::ThreadpoolLanes lanes;
+  lanes.length (priorities.size ());
+
+  for (CORBA::ULong i = 0;
+       i < priorities.size ();
+       ++i)
+    {
+      lanes[i].lane_priority = priorities[i];
+      lanes[i].static_threads = static_threads;
+      lanes[i].dynamic_threads = dynamic_threads;
+    }
+
+  RTCORBA::ThreadpoolId threadpool_id =
+    rt_orb->create_threadpool_with_lanes (stacksize,
+                                          lanes,
+                                          allow_borrowing,
+                                          allow_request_buffering,
+                                          max_buffered_requests,
+                                          max_request_buffer_size,
+                                          ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  CORBA::Policy_var threadpool_policy =
+    rt_orb->create_threadpool_policy (threadpool_id,
+                                      ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  policies.length (policies.length () + 1);
+  policies[policies.length () - 1] =
+    threadpool_policy;
+
+  return 0;
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Array_Base<CORBA::Short>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Array_Base<CORBA::Short>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tests/RTCORBA/Linear_Priority/run_test.pl b/TAO/tests/RTCORBA/Linear_Priority/run_test.pl
new file mode 100755
index 00000000000..57e69de0773
--- /dev/null
+++ b/TAO/tests/RTCORBA/Linear_Priority/run_test.pl
@@ -0,0 +1,123 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib '../../../../bin';
+use PerlACE::Run_Test;
+
+$status = 0;
+$iorfile = "ior";
+
+@configurations = 
+    (
+     {
+         server => "-b empty_file -l empty_file", 
+         client => "-b empty_file -p empty_file -x",
+     },
+     {
+         server => "-b bands -l empty_file", 
+         client => "-b empty_file -p empty_file -x",
+     },
+     {
+         server => "-b empty_file -l lanes", 
+         client => "-b empty_file -p empty_file -x",
+     },
+     {
+         server => "-b bands -l lanes", 
+         client => "-b empty_file -p empty_file -x",
+     },
+     {
+         server => "-b empty_file -l empty_file", 
+         client => "-b bands -p empty_file -x",
+     },
+     {
+         server => "-b empty_file -l lanes", 
+         client => "-b bands -p empty_file -x",
+     },
+     {
+         server => "-b empty_file -l empty_file", 
+         client => "-b empty_file -p invocation_priorities -x",
+     },
+     {
+         server => "-b bands -l empty_file", 
+         client => "-b empty_file -p invocation_priorities -x",
+     },
+     {
+         server => "-b bands -l lanes", 
+         client => "-b empty_file -p invocation_priorities -x",
+     },
+     {
+         server => "-b empty_file -l empty_file", 
+         client => "-b bands -p invocation_priorities -x",
+     },
+     {
+         server => "-b empty_file -l lanes", 
+         client => "-b bands -p invocation_priorities -x",
+     },
+     );
+
+sub run_client
+{
+    $CL = new PerlACE::Process ("client", @_);
+
+    $CL->Spawn ();
+    
+    $client = $CL->WaitKill (120);
+
+    if ($client != 0) 
+    {
+        print STDERR "ERROR: client returned $client\n";
+        $status = 1;
+        zap_server (1);
+    }
+}
+
+sub run_server 
+{
+    $SV = new PerlACE::Process ("server", @_);
+
+    $SV->Spawn ();
+
+    if (PerlACE::waitforfile_timed ($iorfile, 5) == -1)
+    {
+        print STDERR "ERROR: cannot find ior file: $iorfile\n";
+        $status = 1;
+        zap_server (1);
+    }
+}
+
+sub zap_server
+{
+    $server = $SV->WaitKill (5);
+    
+    if ($server != 0) 
+    {
+        print STDERR "ERROR: server returned $server\n";
+        $status = 1;
+    }
+
+    unlink $iorfile;
+
+    if ($_[0])
+    {
+        exit $status;
+    }
+}
+
+for $test (@configurations)
+{
+    print STDERR "\n******************************************************\n";
+
+    unlink $iorfile;
+
+    run_server ($test->{server});
+
+    run_client ($test->{client});
+    
+    zap_server (0);
+}
+
+exit $status;
diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.bor b/TAO/tests/RTCORBA/Linear_Priority/server.bor
new file mode 100644
index 00000000000..0a158b04444
--- /dev/null
+++ b/TAO/tests/RTCORBA/Linear_Priority/server.bor
@@ -0,0 +1,42 @@
+#
+# Makefile for building the Faults test executable
+#
+
+NAME = server
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+OBJFILES = \
+	$(OBJDIR)\testC.obj \
+	$(OBJDIR)\testS.obj \
+	$(OBJDIR)\server.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+	$(TAO_CFLAGS) \
+        $(TAO_PORTABLESERVER_CFLAGS) \
+        $(TAO_RTCORBA_CFLAGS) \
+        $(TAO_RTPORTABLESERVER_CFLAGS)
+
+LIBFILES = \
+	$(ACE_LIB) \
+	$(TAO_LIB) \
+        $(TAO_PORTABLESERVER_LIB) \
+        $(TAO_RTCORBA_LIB) \
+        $(TAO_RTPORTABLESERVER_LIB)
+
+IDLFILES = \
+        $(IDLDIR)\test.idl
+
+CPPDIR = .
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
+	$(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
new file mode 100644
index 00000000000..9708fcf433e
--- /dev/null
+++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
@@ -0,0 +1,271 @@
+// $Id$
+
+#include "ace/Get_Opt.h"
+#include "testS.h"
+#include "tao/RTPortableServer/RTPortableServer.h"
+#include "../check_supported_priorities.cpp"
+#include "./readers.cpp"
+
+class test_i :
+  public POA_test,
+  public PortableServer::RefCountServantBase
+{
+public:
+  test_i (CORBA::ORB_ptr orb,
+          PortableServer::POA_ptr poa);
+
+  void method (CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  void shutdown (CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV);
+
+private:
+
+  CORBA::ORB_var orb_;
+  PortableServer::POA_var poa_;
+};
+
+test_i::test_i (CORBA::ORB_ptr orb,
+                PortableServer::POA_ptr poa)
+  : orb_ (CORBA::ORB::_duplicate (orb)),
+    poa_ (PortableServer::POA::_duplicate (poa))
+{
+}
+
+void
+test_i::method (CORBA::Environment &)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  ACE_DEBUG ((LM_DEBUG,
+              "test_i::method\n"));
+}
+
+void
+test_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  ACE_DEBUG ((LM_DEBUG,
+              "test_i::shutdown\n"));
+
+  this->orb_->shutdown (0,
+                        ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+PortableServer::POA_ptr
+test_i::_default_POA (CORBA_Environment &)
+{
+  return PortableServer::POA::_duplicate (this->poa_.in ());
+}
+
+static CORBA::ULong stacksize = 0;
+static CORBA::ULong static_threads = 2;
+static CORBA::ULong dynamic_threads = 0;
+static CORBA::Boolean allow_request_buffering = 0;
+static CORBA::ULong max_buffered_requests = 0;
+static CORBA::ULong max_request_buffer_size = 0;
+static CORBA::Boolean allow_borrowing = 0;
+
+static const char *ior = "ior";
+
+static const char *bands_file = "bands";
+static const char *lanes_file = "lanes";
+
+static int
+parse_args (int argc, char **argv)
+{
+  ACE_Get_Opt get_opts (argc, argv, "b:l:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'b':
+        bands_file = get_opts.optarg;
+        break;
+
+      case 'l':
+        lanes_file = get_opts.optarg;
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-b <bands_file> "
+                           "-l <lanes_file> "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+
+  return 0;
+}
+
+static void
+write_iors_to_file (CORBA::Object_ptr object,
+                    CORBA::ORB_ptr orb,
+                    const char *filename,
+                    CORBA::Environment &ACE_TRY_ENV)
+{
+  FILE *file =
+    ACE_OS::fopen (filename, "w");
+  ACE_ASSERT (file != 0);
+
+  CORBA::String_var ior =
+    orb->object_to_string (object,
+                           ACE_TRY_ENV);
+  ACE_CHECK;
+
+  u_int result = 0;
+  result =
+    ACE_OS::fprintf (file,
+                     "%s",
+                     ior.in ());
+
+  ACE_ASSERT (result == ACE_OS::strlen (ior.in ()));
+
+  ACE_OS::fclose (file);
+}
+
+int
+main (int argc, char **argv)
+{
+  // Make sure we can support multiple priorities that are required
+  // for this test.
+  check_supported_priorities ();
+
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc,
+                         argv,
+                         0,
+                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      CORBA::Object_var object =
+        orb->resolve_initial_references ("RTORB",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      RTCORBA::RTORB_var rt_orb =
+        RTCORBA::RTORB::_narrow (object.in (),
+                                 ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      int result =
+        parse_args (argc, argv);
+      if (result != 0)
+        return result;
+
+      object =
+        orb->resolve_initial_references ("RootPOA",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (object.in (),
+                                      ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      CORBA::PolicyList policies;
+
+      result =
+        get_priority_bands ("server",
+                            bands_file,
+                            rt_orb.in (),
+                            policies,
+                            ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      if (result != 0)
+        return result;
+
+      result =
+        get_priority_lanes ("server",
+                            lanes_file,
+                            rt_orb.in (),
+                            stacksize,
+                            static_threads,
+                            dynamic_threads,
+                            allow_request_buffering,
+                            max_buffered_requests,
+                            max_request_buffer_size,
+                            allow_borrowing,
+                            policies,
+                            ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      if (result != 0)
+        return result;
+
+      CORBA::Policy_var priority_model_policy =
+        rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
+                                              0,
+                                              ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      // Implicit_activation policy.
+      CORBA::Policy_var implicit_activation_policy =
+        root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION,
+                                                     ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      policies.length (policies.length () + 1);
+      policies[policies.length () - 1] =
+        priority_model_policy;
+
+      policies.length (policies.length () + 1);
+      policies[policies.length () - 1] =
+        implicit_activation_policy;
+
+      PortableServer::POA_var poa =
+        root_poa->create_POA ("child",
+                              poa_manager.in (),
+                              policies,
+                              ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      test_i *servant = 0;
+      ACE_NEW_THROW_EX (servant,
+                        test_i (orb.in (),
+                                poa.in ()),
+                        CORBA::NO_MEMORY ());
+      ACE_TRY_CHECK;
+
+      PortableServer::ServantBase_var safe_servant (servant);
+
+      test_var test =
+        servant->_this (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      write_iors_to_file (test.in (),
+                          orb.in (),
+                          ior,
+                          ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      poa_manager->activate (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      orb->run (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      orb->destroy (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      return -1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.dsp b/TAO/tests/RTCORBA/Linear_Priority/server.dsp
new file mode 100644
index 00000000000..3fdc69c65d9
--- /dev/null
+++ b/TAO/tests/RTCORBA/Linear_Priority/server.dsp
@@ -0,0 +1,216 @@
+# Microsoft Developer Studio Project File - Name="Linear_Priority Server" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=Linear_Priority Server - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "server.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "server.mak" CFG="Linear_Priority Server - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "Linear_Priority Server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Linear_Priority Server - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Linear_Priority Server - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 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 ace.lib TAO.lib TAO_PortableServer.lib TAO_RTCORBA.lib TAO_RTPortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+
+!ELSEIF  "$(CFG)" == "Linear_Priority Server - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 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 TAO_RTCORBAd.lib TAO_RTPortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Linear_Priority Server - Win32 Release"
+# Name "Linear_Priority Server - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\server.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\testC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\testS.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\testC.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\testS.h
+# End Source File
+# End Group
+# Begin Group "Inline Files"
+
+# PROP Default_Filter "i"
+# Begin Source File
+
+SOURCE=.\testC.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\testS.i
+# End Source File
+# End Group
+# Begin Group "IDL Files"
+
+# PROP Default_Filter "idl"
+# Begin Source File
+
+SOURCE=.\test.idl
+
+!IF  "$(CFG)" == "Linear_Priority Server - Win32 Release"
+
+USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe"	
+# Begin Custom Build
+InputPath=.\test.idl
+InputName=test
+
+BuildCmds= \
+	..\..\..\..\bin\Release\tao_idl.exe -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Linear_Priority Server - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"	
+# Begin Custom Build - Invoking TAO_IDL on $(InputName)
+InputPath=.\test.idl
+InputName=test
+
+BuildCmds= \
+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/TAO/tests/RTCORBA/Linear_Priority/svc.conf b/TAO/tests/RTCORBA/Linear_Priority/svc.conf
new file mode 100644
index 00000000000..7e4bf9ae870
--- /dev/null
+++ b/TAO/tests/RTCORBA/Linear_Priority/svc.conf
@@ -0,0 +1,5 @@
+# Regular test
+static RT_ORB_Loader "-ORBPriorityMapping linear"
+
+# For testing of RT threads
+# static RT_ORB_Loader "-ORBPriorityMapping linear -ORBSchedPolicy SCHED_RR -ORBScopePolicy SYSTEM"
diff --git a/TAO/tests/RTCORBA/Linear_Priority/test.idl b/TAO/tests/RTCORBA/Linear_Priority/test.idl
new file mode 100644
index 00000000000..93c7ac56f50
--- /dev/null
+++ b/TAO/tests/RTCORBA/Linear_Priority/test.idl
@@ -0,0 +1,8 @@
+// $Id$
+
+interface test
+{
+  void method ();
+
+  void shutdown ();
+};
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/Makefile b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/Makefile
index 58170521444..4252a04e24e 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/Makefile
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/Makefile
@@ -269,34 +269,21 @@ realclean: clean
   $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
-  $(TAO_ROOT)/tao/RTCORBA/Pool_Per_Endpoint.h \
-  $(ACE_ROOT)/ace/Task.h \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServer.h \
+  $(TAO_ROOT)/tao/RTPortableServer/rtportableserver_export.h \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.h \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.i \
+  $(TAO_ROOT)/tao/Strategies/advanced_resource.h \
+  $(TAO_ROOT)/tao/Strategies/strategies_export.h \
+  $(TAO_ROOT)/tao/default_resource.h \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
   $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Task.i \
-  $(ACE_ROOT)/ace/Task_T.h \
-  $(ACE_ROOT)/ace/Message_Queue.h \
-  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.i \
-  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Strategies.h \
-  $(ACE_ROOT)/ace/Strategies_T.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Reactor.h \
@@ -312,44 +299,6 @@ realclean: clean
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Synch_Options.h \
-  $(ACE_ROOT)/ace/Synch_Options.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Strategies_T.i \
-  $(ACE_ROOT)/ace/Strategies_T.cpp \
-  $(ACE_ROOT)/ace/Service_Repository.h \
-  $(ACE_ROOT)/ace/Service_Types.h \
-  $(ACE_ROOT)/ace/Service_Types.i \
-  $(ACE_ROOT)/ace/Service_Repository.i \
-  $(ACE_ROOT)/ace/WFMO_Reactor.h \
-  $(ACE_ROOT)/ace/Process_Mutex.h \
-  $(ACE_ROOT)/ace/Process_Mutex.inl \
-  $(ACE_ROOT)/ace/WFMO_Reactor.i \
-  $(ACE_ROOT)/ace/Strategies.i \
-  $(ACE_ROOT)/ace/Message_Queue.i \
-  $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp \
-  $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i \
-  $(ACE_ROOT)/ace/Module.cpp \
-  $(ACE_ROOT)/ace/Stream_Modules.h \
-  $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  $(TAO_ROOT)/tao/RTCORBA/Pool_Per_Endpoint.i \
-  $(TAO_ROOT)/tao/Strategies/advanced_resource.h \
-  $(TAO_ROOT)/tao/Strategies/strategies_export.h \
-  $(TAO_ROOT)/tao/default_resource.h \
-  $(TAO_ROOT)/tao/Resource_Factory.h \
-  $(TAO_ROOT)/tao/Pluggable.h \
-  $(TAO_ROOT)/tao/Pluggable.i \
-  $(TAO_ROOT)/tao/Protocol_Factory.h \
   $(TAO_ROOT)/tao/default_resource.i \
   $(TAO_ROOT)/tao/ORB_Core.h \
   $(TAO_ROOT)/tao/Policy_Manager.h \
@@ -372,13 +321,38 @@ realclean: clean
   $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
   $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
   $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
   $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
   $(TAO_ROOT)/tao/Interceptor_List.h \
   $(TAO_ROOT)/tao/Interceptor_List.inl \
   $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
   $(TAO_ROOT)/tao/ORB_Core.i \
-  $(TAO_ROOT)/tao/Strategies/advanced_resource.i
+  $(TAO_ROOT)/tao/Strategies/advanced_resource.i \
+  ../check_supported_priorities.cpp \
+  $(ACE_ROOT)/ace/Sched_Params.h \
+  $(ACE_ROOT)/ace/Sched_Params.i
 
 .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp testC.h \
   $(TAO_ROOT)/tao/corba.h \
@@ -577,8 +551,6 @@ realclean: clean
   $(TAO_ROOT)/tao/RTCORBA/Priority_Mapping_Manager.i \
   $(ACE_ROOT)/ace/Get_Opt.h \
   $(ACE_ROOT)/ace/Get_Opt.i \
-  $(ACE_ROOT)/ace/Sched_Params.h \
-  $(ACE_ROOT)/ace/Sched_Params.i \
   $(ACE_ROOT)/ace/Task.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
@@ -651,6 +623,9 @@ realclean: clean
   $(ACE_ROOT)/ace/Module.cpp \
   $(ACE_ROOT)/ace/Stream_Modules.h \
   $(ACE_ROOT)/ace/Stream_Modules.cpp \
+  ../check_supported_priorities.cpp \
+  $(ACE_ROOT)/ace/Sched_Params.h \
+  $(ACE_ROOT)/ace/Sched_Params.i \
   $(TAO_ROOT)/tao/Strategies/advanced_resource.h \
   $(TAO_ROOT)/tao/Strategies/strategies_export.h \
   $(TAO_ROOT)/tao/default_resource.h \
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/README b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/README
index 103c04aa4bc..0cf16bae659 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/README
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/README
@@ -6,6 +6,7 @@ when multiple threads are making invocations.
 
 NOTE:
 -----
+
 Since output verification script relies on ORB debug messages, i.e.,
 it checks for certain debug messages, it is BRITTLE.  Whenever ORB
 developers modify/remove certain debug messages in the ORB, the output
@@ -16,10 +17,8 @@ process-output.pl must be updated to reflect debug output changes.
 Description
 -----------
 
-Server creates a POA threadpool with lanes (until POA threadpools are
-fully supported, this is emulated with global threadpools), creates an
-object with RTCORBA::CLIENT_PROPAGATED priority model, and writes its
-IOR to the file.
+Server creates an object with RTCORBA::CLIENT_PROPAGATED priority
+model, and writes its IOR to the file.
 
 Client spawns two threads of different priorities.  Each thread sets
 RTCORBA::ClientProtocolPolicy override to a single protocol on the
@@ -37,103 +36,6 @@ verifying the output of the test using process-output.pl perl script.
 a sizeable output, which is impractical to verify manually).
 
 run_test.pl does both, i.e., it runs client and server and then runs
-the verification script on the output.  Below are instructions on how
-to run both  client/server and the verification script. 
-
-
-To run (on Unix):
--------
-$./server [-o <ior_output_file>]
-           -ORBdebuglevel 1 -ORBSvcConf server.conf
-           -ORBendpoint iiop://targethost:0/priority=<priority1>
-           -ORBendpoint iiop://targethost:0/priority=<priority2>
-           -ORBendpoint shmiop://targethost:0/priority=<priority1>
-           -ORBendpoint shmiop://targethost:0/priority=<priority2>
-           [more endpoints if desired]
-
-$./client [-o <ior> -n <iterations>]
-           -a <client_priority1> -b <client_priority2> 
-           [-e <protocol_id1> -f <protocol_id2>]
-
-
-To run output verification script:
-
-$./process-output.pl <data-file-name> 
-                     <number-of-iterations> 
-                     <priority1> 
-                     <priority2>
-
-where 
-
-<data_file_name> is the name of the file where output from running
-                 server and client was collected
-<number_of_iterations> number of iterations specified to the client
-                       with -n command-line option
-<priority1> priority for the first client thread (was specified to the
-                 client with -a command-line option)
-
-<priority2> priority for the second client thread (was specified to the
-                 client with -a command-line option)
-
-Note: Verification script is currently hardcoded to assume that
-      protocol used for one of the threads is iiop, and for the other
-      is shmiop.
-
-
-Options:
---------
-         Server:
-
--o <ior_output_file>   Default: test.ior
-                       Filename for output of object's IOR.
-
--ORBdebuglevel 1        Default: none
-                        This ORB option should be supplied to the
-                        server in order to obtain ORB debug output,
-                        which can then be verified with
-                        process-output.pl for correctness.
-
-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
--ORBendpoint xxx://targethost:0/priority=<priority1>
--ORBendpoint xxxx://targethost:0/priority=<priority2>
-... 
-For an example, see run_test.pl
-
-         Client:
-
--o <ior>               Default: file://test.ior
-                       IOR for the server object.
-
--n <n_iterations>      Default: 100
-                       Number of invocations each client thread will
-                       make on the server.
-
--a <client_priority1>   Default: -1, must be overridden.
-                        CORBA thread priority of the first client
-                        thread. 
-
--b <client_priority2>   Default: -1, must be overridden.
-                        CORBA thread priority of the second client
-                        thread. 
-
--e <profile_id1>        Default: 1413566210 (SHMIOP)
-                        Protocol for ClientProtocolPolicy override for
-                        the first client thread.
-
--f <profile_id2>        Default: 0 (IIOP)
-                        Protocol for ClientProtocolPolicy override for
-                        the second client thread.
-
-
-Expected output:
-----------------
-If there are no problems, run_test.pl will output
-
-
-********** MT Client Protocol & CLIENT_PROPAGATED combo Test
-
-Test output is ok 
-\ No newline at end of file
+the verification script on the output.  See run_test.pl for
+instructions on how to run both client/server and the verification
+script.
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.bor b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.bor
index 9d0c78909a0..9cdc7960016 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.bor
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.bor
@@ -14,14 +14,12 @@ CFLAGS = \
 	$(ACE_CFLAGS) \
 	$(TAO_CFLAGS) \
 	$(TAO_STRATEGIES_CFLAGS) \
-        $(TAO_PORTABLESERVER_CFLAGS) \
         $(TAO_RTCORBA_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
 	$(TAO_LIB) \
 	$(TAO_STRATEGIES_LIB) \
-        $(TAO_PORTABLESERVER_LIB) \
         $(TAO_RTCORBA_LIB)
 
 IDLFILES = \
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
index 9329d155095..14b94dc9382 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
@@ -4,9 +4,8 @@
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/RTCORBA/Priority_Mapping_Manager.h"
 #include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
 #include "ace/Task.h"
-
+#include "../check_supported_priorities.cpp"
 #include "tao/Strategies/advanced_resource.h"
 
 class Worker_Thread : public ACE_Task_Base
@@ -142,23 +141,12 @@ check_for_nil (CORBA::Object_ptr obj, const char *msg)
 int
 main (int argc, char *argv[])
 {
+  // Make sure we can support multiple priorities that are required
+  // for this test.
+  check_supported_priorities ();
+
   ACE_TRY_NEW_ENV
     {
-      // First check that we have sufficient priority range to run the
-      // test, i.e., more than 1 priority level.
-      int max_priority =
-        ACE_Sched_Params::priority_max (ACE_SCHED_OTHER);
-      int min_priority =
-        ACE_Sched_Params::priority_min (ACE_SCHED_OTHER);
-
-      if (max_priority == min_priority)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "Not enough priority levels on this platform"
-                      "to run the test, aborting\n"));
-          return 0;
-        }
-
       // Initialize the ORB, resolve references and parse arguments.
 
       // ORB.
@@ -232,8 +220,10 @@ main (int argc, char *argv[])
       int flags  = THR_NEW_LWP|THR_JOINABLE|THR_BOUND;
 
       // Worker 1.
-      Worker_Thread worker1 (orb.in (), server.in (),
-                             protocol1, &barrier);
+      Worker_Thread worker1 (orb.in (),
+                             server.in (),
+                             protocol1,
+                             &barrier);
 
       CORBA::Short native_priority1 = 0;
       if (pm->to_native (priority1, native_priority1) == 0)
@@ -250,8 +240,10 @@ main (int argc, char *argv[])
                           1);
 
       // Worker 2.
-      Worker_Thread worker2 (orb.in (), server.in (),
-                             protocol2, &barrier);
+      Worker_Thread worker2 (orb.in (),
+                             server.in (),
+                             protocol2,
+                             &barrier);
 
       CORBA::Short native_priority2 = 0;
       if (pm->to_native (priority2, native_priority2) == 0)
@@ -366,4 +358,3 @@ Worker_Thread::svc (void)
   ACE_ENDTRY;
   return 0;
 }
-
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.dsp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.dsp
index d9aabf9ea73..e3cce23daad 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.dsp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.dsp
@@ -51,7 +51,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 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_RTCORBA.lib TAO_RTPortableServer.lib TAO_Strategies.lib ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 ace.lib TAO.lib TAO_RTCORBA.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\Strategies"
 
 !ELSEIF  "$(CFG)" == "MT_Client_Protocol_Priority Client - Win32 Debug"
 
@@ -76,7 +76,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 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 TAO_RTCORBAd.lib TAO_RTPortableServerd.lib TAO_Strategiesd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 aced.lib TAOd.lib TAO_RTCORBAd.lib TAO_Strategiesd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\Strategies"
 
 !ENDIF 
 
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/process-output.pl b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/process-output.pl
index 5c802aec25d..56cc7f6a747 100755
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/process-output.pl
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/process-output.pl
@@ -42,7 +42,7 @@ else
 }
 
 $thread_priority_pattern =
-    "original thread priority = requested priority =";
+    "RTCORBA::CLIENT_PROPAGATED processing using default thread pool";
 
 $iiop_requests = 0;
 $shmiop_requests = 0;
@@ -89,11 +89,11 @@ while ($line = <DATA>)
     if ($line =~ /$thread_priority_pattern/
         and $threads_finished == 0)
     {
-        if ($words[10] == $priority1)
+        if ($words[@words - 1] == $priority1)
         {
             ++$priority1_requests;
         }
-        elsif ($words[10] == $priority2)
+        elsif ($words[@words - 1] == $priority2)
         {
             ++$priority2_requests;
         }
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 b3d985c0194..4997a5d88ef 100755
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl
@@ -20,25 +20,22 @@ if ($ARGV[0] eq '-q') {
 $iorfile = PerlACE::LocalFile ("test.ior");
 $data_file = PerlACE::LocalFile ("test_run.data");
 
+$debug_level = 1;
 $iterations = 50;
 $priority1 = 65;
 $priority2 = 70;
-$priority3 = 75;
 
 if ($^O eq "MSWin32") {
-    $priority1 = 6;
+    $priority1 = 2;
     $priority2 = 1;
-    $priority3 = 5;
 }
 elsif ($^O eq "dec_osf") {
     $priority1 = 20;
     $priority2 = 25;
-    $priority3 = 30;
 }
 elsif ($^O eq "hpux") {
     $priority1 = 17;
     $priority2 = 22;
-    $priority3 = 29;
 }
 
 # Clean up leftovers from previous runs.
@@ -48,13 +45,8 @@ unlink $data_file;
 $server_conf = PerlACE::LocalFile ("server.conf");
 
 $server_args =
-    "-o $iorfile -ORBdebuglevel 1 -ORBsvcconf $server_conf "
-    ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=$priority1 "
-    ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=$priority2 "
-    ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=$priority3 "
-    ."-ORBendpoint shmiop://0/priority=$priority1 "
-    ."-ORBendpoint shmiop://0/priority=$priority2 "
-    ."-ORBendpoint shmiop://0/priority=$priority3 ";
+    "-o $iorfile -ORBdebuglevel $debug_level -ORBsvcconf $server_conf "
+    ."-ORBendpoint iiop:// -ORBendpoint shmiop:// ";
 
 $client_args =
     "-o file://$iorfile  "
@@ -125,11 +117,11 @@ if ($errors > 0) {
         else {
             print STDERR "ERROR: Could not open $data_file\n";
         }
-        unlink $data_file;
     }
 }
 
 unlink $iorfile;
+unlink $data_file;
 
 # Clean up shmiop files
 PerlACE::check_n_cleanup_files ("server_shmiop_*");
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.conf b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.conf
index 65d4ff291ef..c736cfd6c60 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.conf
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.conf
@@ -1,4 +1,3 @@
 # $Id$
 #
 dynamic SHMIOP_Factory Service_Object *TAO_Strategies:_make_TAO_SHMIOP_Protocol_Factory () "-MMAPFilePrefix server_shmiop "
-static Advanced_Resource_Factory "-ORBReactorType tp -ORBReactorRegistry per-priority"
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
index d8d1550ae02..9a0ca3232bc 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
@@ -3,9 +3,9 @@
 #include "testS.h"
 #include "ace/Get_Opt.h"
 #include "tao/RTCORBA/RTCORBA.h"
-#include "tao/RTCORBA/Pool_Per_Endpoint.h"
-
+#include "tao/RTPortableServer/RTPortableServer.h"
 #include "tao/Strategies/advanced_resource.h"
+#include "../check_supported_priorities.cpp"
 
 class Test_i : public POA_Test
 {
@@ -92,7 +92,11 @@ check_for_nil (CORBA::Object_ptr obj, const char *msg)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+   // Make sure we can support multiple priorities that are required
+  // for this test.
+  check_supported_priorities ();
+
+ ACE_TRY_NEW_ENV
     {
       // ORB.
       CORBA::ORB_var orb =
@@ -180,11 +184,7 @@ main (int argc, char *argv[])
       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"));
@@ -199,4 +199,3 @@ main (int argc, char *argv[])
 
   return 0;
 }
-
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.dsp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.dsp
index 2bad19ccd92..3fded560b0f 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.dsp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.dsp
@@ -51,7 +51,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 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_RTCORBA.lib TAO_RTPortableServer.lib TAO_PortableServer.lib TAO_Strategies.lib ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_RTCORBA.lib TAO_RTPortableServer.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer" /libpath:"..\..\..\tao\Strategies"
 
 !ELSEIF  "$(CFG)" == "MT_Client_Protocol_Priority Server - Win32 Debug"
 
@@ -76,7 +76,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 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 TAO_RTCORBAd.lib TAO_RTPortableServerd.lib TAO_PortableServerd.lib TAO_Strategiesd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_RTCORBAd.lib TAO_RTPortableServerd.lib TAO_Strategiesd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer" /libpath:"..\..\..\tao\Strategies"
 
 !ENDIF 
 
diff --git a/TAO/tests/RTCORBA/Makefile b/TAO/tests/RTCORBA/Makefile
index b1f5213260c..9be2c8623c6 100644
--- a/TAO/tests/RTCORBA/Makefile
+++ b/TAO/tests/RTCORBA/Makefile
@@ -10,17 +10,23 @@
 #       Local macros
 #----------------------------------------------------------------------------
 
-DIRS  = Banded_Connections \
+DIRS  = \
+	Banded_Connections \
 	Client_Propagated \
 	Client_Protocol \
+	Collocation \
+	Destroy_Thread_Pool \
 	Explicit_Binding \
-	Server_Declared \
-        Server_Protocol \
-	Private_Connection \
-	Thread_Pool \
+	Linear_Priority \
 	MT_Client_Protocol_Priority \
+	ORB_init \
+	Persistent_IOR \
+	Policy_Combinations \
+	Private_Connection \
         RTMutex \
-	ORB_init
+	Server_Declared \
+        Server_Protocol \
+	Thread_Pool
 
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
diff --git a/TAO/tests/RTCORBA/Makefile.bor b/TAO/tests/RTCORBA/Makefile.bor
index c45189afe65..2dbcf62e323 100644
--- a/TAO/tests/RTCORBA/Makefile.bor
+++ b/TAO/tests/RTCORBA/Makefile.bor
@@ -6,13 +6,18 @@ DIRS = \
 	Banded_Connections \
 	Client_Propagated \
 	Client_Protocol \
+	Collocation \
+	Destroy_Thread_Pool \
 	Explicit_Binding \
-	Server_Declared \
-	Server_Protocol \
-	Private_Connection \
-	Thread_Pool \
+	Linear_Priority \
 	MT_Client_Protocol_Priority \
+	ORB_init \
+	Persistent_IOR \
+	Policy_Combinations \
+	Private_Connection \
         RTMutex \
-	ORB_init
+	Server_Declared \
+	Server_Protocol \
+	Thread_Pool
 
 !include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/RTCORBA/ORB_init/ORB_init.dsp b/TAO/tests/RTCORBA/ORB_init/ORB_init.dsp
index a8d997fb955..7d252e0a4a2 100644
--- a/TAO/tests/RTCORBA/ORB_init/ORB_init.dsp
+++ b/TAO/tests/RTCORBA/ORB_init/ORB_init.dsp
@@ -51,7 +51,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 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 ace.lib TAO.lib TAO_RTCORBA.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA"
+# ADD LINK32 ace.lib TAO.lib TAO_RTCORBA.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA"
 
 !ELSEIF  "$(CFG)" == "ORB_init - Win32 Debug"
 
@@ -76,7 +76,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 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 TAO_RTCORBAd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA"
+# ADD LINK32 aced.lib TAOd.lib TAO_RTCORBAd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA"
 
 !ENDIF
 
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/Makefile b/TAO/tests/RTCORBA/Persistent_IOR/Makefile
new file mode 100644
index 00000000000..1266195887b
--- /dev/null
+++ b/TAO/tests/RTCORBA/Persistent_IOR/Makefile
@@ -0,0 +1,1086 @@
+#----------------------------------------------------------------------------
+#
+#       $Id$
+#
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+#       Local macros
+#----------------------------------------------------------------------------
+
+ifndef TAO_ROOT
+  TAO_ROOT = $(ACE_ROOT)/TAO
+endif # ! TAO_ROOT
+
+IDL_FILES = test
+IDL_SRC = testC.cpp testS.cpp
+BIN_UNCHECKED = client server
+
+SRC = $(addsuffix .cpp, $(BIN)) $(IDL_SRC)
+
+CLIENT_OBJS = client.o testC.o
+SERVER_OBJS = server.o $(IDL_SRC:.cpp=.o)
+
+TAO_IDLFLAGS += -Ge 1
+#----------------------------------------------------------------------------
+#       Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+
+ifeq ($(rt_corba),1)
+BIN=$(BIN_UNCHECKED)
+endif # rt_corba
+
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include $(TAO_ROOT)/taoconfig.mk
+
+#----------------------------------------------------------------------------
+#       Local targets
+#----------------------------------------------------------------------------
+
+.PRECIOUS: $(foreach ext, $(IDL_EXT), test$(ext))
+
+server: $(addprefix $(VDIR),$(SERVER_OBJS))
+	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(RT_TAO_SRVR_LIBS) $(POSTLINK)
+
+client: $(addprefix $(VDIR),$(CLIENT_OBJS))
+	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_BASE_LIBS) $(POSTLINK)
+
+realclean: clean
+	-$(RM) $(foreach ext, $(IDL_EXT), test$(ext))
+
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+
+.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
+  $(ACE_ROOT)/ace/Get_Opt.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Get_Opt.i testC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/ObjectIDList.h \
+  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  testC.i
+
+.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \
+  $(ACE_ROOT)/ace/Get_Opt.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Get_Opt.i testS.h \
+  testC.h $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/ObjectIDList.h \
+  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  testC.i \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+  testS_T.h testS_T.i testS_T.cpp testS.i \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServer.h \
+  $(TAO_ROOT)/tao/RTPortableServer/rtportableserver_export.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
+  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.h \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.i
+
+.obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/ObjectIDList.h \
+  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  testC.i $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.i \
+  $(TAO_ROOT)/tao/Invocation.h \
+  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
+  $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/TAOC.i \
+  $(TAO_ROOT)/tao/operation_details.h \
+  $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/Service_Context.inl \
+  $(TAO_ROOT)/tao/target_specification.h \
+  $(TAO_ROOT)/tao/target_specification.i \
+  $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+  $(TAO_ROOT)/tao/Invocation.i \
+  $(TAO_ROOT)/tao/PortableInterceptor.h \
+  $(TAO_ROOT)/tao/RequestInfo_Util.h \
+  $(TAO_ROOT)/tao/ClientRequestInfo.h \
+  $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+  $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
+  $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
+
+.obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/ObjectIDList.h \
+  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  testC.i \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+  testS_T.h testS_T.i testS_T.cpp testS.i \
+  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
+  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
+  $(ACE_ROOT)/ace/Map.h \
+  $(ACE_ROOT)/ace/Map_T.h \
+  $(ACE_ROOT)/ace/Pair.h \
+  $(ACE_ROOT)/ace/Pair_T.h \
+  $(ACE_ROOT)/ace/Pair_T.i \
+  $(ACE_ROOT)/ace/Pair_T.cpp \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Active_Map_Manager.h \
+  $(ACE_ROOT)/ace/Active_Map_Manager.i \
+  $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Map_T.i \
+  $(ACE_ROOT)/ace/Map_T.cpp \
+  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \
+  $(TAO_ROOT)/tao/PortableServer/poa_macros.h \
+  $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \
+  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+  $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PortableServer/Default_Policy_Validator.h \
+  $(TAO_ROOT)/tao/PortableServer/Policy_Validator.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policies.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policies.i \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \
+  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
+  $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \
+  $(TAO_ROOT)/tao/TAO_Server_Request.h \
+  $(TAO_ROOT)/tao/Tagged_Profile.h \
+  $(TAO_ROOT)/tao/GIOPC.h \
+  $(TAO_ROOT)/tao/GIOPC.i \
+  $(TAO_ROOT)/tao/Tagged_Profile.i \
+  $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/Service_Context.inl \
+  $(TAO_ROOT)/tao/TAO_Server_Request.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/Stub.i \
+  $(TAO_ROOT)/tao/IFR_Client_Adapter.h \
+  $(TAO_ROOT)/tao/PortableInterceptor.h \
+  $(TAO_ROOT)/tao/RequestInfo_Util.h \
+  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+  $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.h \
+  $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.inl \
+  $(ACE_ROOT)/ace/Dynamic_Service.h \
+  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
+  $(ACE_ROOT)/ace/Dynamic_Service.i \
+  $(ACE_ROOT)/ace/Dynamic_Service.cpp
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/Makefile.bor b/TAO/tests/RTCORBA/Persistent_IOR/Makefile.bor
new file mode 100644
index 00000000000..e2ee4acd23a
--- /dev/null
+++ b/TAO/tests/RTCORBA/Persistent_IOR/Makefile.bor
@@ -0,0 +1,7 @@
+#
+# Makefile for building the Faults test executables
+#
+
+MAKEFILES = server.bor client.bor
+
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/Persistent_IOR.dsw b/TAO/tests/RTCORBA/Persistent_IOR/Persistent_IOR.dsw
new file mode 100644
index 00000000000..d17cf7c9604
--- /dev/null
+++ b/TAO/tests/RTCORBA/Persistent_IOR/Persistent_IOR.dsw
@@ -0,0 +1,41 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "client"=.\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "server"=.\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/README b/TAO/tests/RTCORBA/Persistent_IOR/README
new file mode 100644
index 00000000000..e1789a6b204
--- /dev/null
+++ b/TAO/tests/RTCORBA/Persistent_IOR/README
@@ -0,0 +1,16 @@
+$Id$
+
+Description:
+
+This test makes sure that:
+
+- For POAs using the default thread pool, the user can continue to use
+-ORBEndpoint option.
+
+- Makes sure that if the user tries to combine thread pools and
+persistence, an InvalidPolicy exception is thrown.
+
+- Makes sure that for POAs using thread pools, the user can specify
+the protocol selection, protocol version, and other protocol specific
+options (basically everything other than the endpoint address)
+through the -ORBEndpoint option.
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/client.bor b/TAO/tests/RTCORBA/Persistent_IOR/client.bor
new file mode 100644
index 00000000000..848c8e927dc
--- /dev/null
+++ b/TAO/tests/RTCORBA/Persistent_IOR/client.bor
@@ -0,0 +1,35 @@
+#
+# Makefile for building the Faults ping executable
+#
+
+NAME = client
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+OBJFILES = \
+	$(OBJDIR)\testC.obj \
+	$(OBJDIR)\client.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+        $(TAO_CFLAGS)
+
+LIBFILES = \
+	$(ACE_LIB) \
+        $(TAO_LIB)
+
+IDLFILES = \
+        $(IDLDIR)\test.idl
+
+CPPDIR = .
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
+	$(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
new file mode 100644
index 00000000000..96fe92a903d
--- /dev/null
+++ b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
@@ -0,0 +1,99 @@
+// $Id$
+
+#include "ace/Get_Opt.h"
+#include "testC.h"
+
+static int iterations = 5;
+static int shutdown_server = 0;
+
+static const char *ior = 0;
+
+static int
+parse_args (int argc, char **argv)
+{
+  ACE_Get_Opt get_opts (argc, argv, "k:i:x");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'k':
+        ior = get_opts.optarg;
+        break;
+
+      case 'i':
+        iterations = ::atoi (get_opts.optarg);
+        break;
+
+      case 'x':
+        shutdown_server = 1;
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-k ior "
+                           "-i iterations "
+                           "-x shutdown server "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+
+  if (ior == 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Error: No IOR specified\n"),
+                      -1);
+
+  return 0;
+}
+
+int
+main (int argc, char **argv)
+{
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc,
+                         argv,
+                         0,
+                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      int result =
+        parse_args (argc, argv);
+      if (result != 0)
+        return result;
+
+      CORBA::Object_var object =
+        orb->string_to_object (ior,
+                               ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      test_var test =
+        test::_narrow (object.in (),
+                       ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      for (int i = 0; i < iterations; i++)
+        {
+          test->method (ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+        }
+
+      if (shutdown_server)
+        {
+          test->shutdown (ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception!");
+      return -1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/client.dsp b/TAO/tests/RTCORBA/Persistent_IOR/client.dsp
new file mode 100644
index 00000000000..c19efbdd523
--- /dev/null
+++ b/TAO/tests/RTCORBA/Persistent_IOR/client.dsp
@@ -0,0 +1,204 @@
+# Microsoft Developer Studio Project File - Name="Persistent_IOR Client" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=Persistent_IOR Client - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "client.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "client.mak" CFG="Persistent_IOR Client - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "Persistent_IOR Client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Persistent_IOR Client - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Persistent_IOR Client - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 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 ace.lib TAO.lib TAO_RTCORBA.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA"
+
+!ELSEIF  "$(CFG)" == "Persistent_IOR Client - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 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_RTCORBAd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Persistent_IOR Client - Win32 Release"
+# Name "Persistent_IOR Client - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\client.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\testC.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\testC.h
+# End Source File
+# End Group
+# Begin Group "Inline Files"
+
+# PROP Default_Filter "i"
+# Begin Source File
+
+SOURCE=.\testC.i
+# End Source File
+# End Group
+# Begin Group "IDL Files"
+
+# PROP Default_Filter "idl"
+# Begin Source File
+
+SOURCE=.\test.idl
+
+!IF  "$(CFG)" == "Persistent_IOR Client - Win32 Release"
+
+USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe"	
+# Begin Custom Build
+InputPath=.\test.idl
+InputName=test
+
+BuildCmds= \
+	..\..\..\..\bin\Release\tao_idl.exe -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Persistent_IOR Client - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"	
+# Begin Custom Build - Invoking TAO_IDL on $(InputName)
+InputPath=.\test.idl
+InputName=test
+
+BuildCmds= \
+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl b/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl
new file mode 100755
index 00000000000..538e82e98a1
--- /dev/null
+++ b/TAO/tests/RTCORBA/Persistent_IOR/run_test.pl
@@ -0,0 +1,119 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib '../../../../bin';
+use PerlACE::Run_Test;
+
+$iiop_port = 27532;
+
+$extra_server_args = "-d 1 -ORBobjrefstyle url -ORBEndpoint iiop://1.0\@:$iiop_port";
+
+@iorfiles = 
+    (
+     "persistent_ior",
+     "transient_ior",
+     "not_used_ior",
+     );
+     
+@configurations = 
+    (
+     {
+         iorfiles => [ "persistent_ior", "transient_ior" ],
+         server => "-p persistent_ior -t transient_ior $extra_server_args", 
+         clients => [ "-k file://persistent_ior", "-k file://transient_ior -x" ],
+     },
+     {
+         iorfiles => [ "persistent_ior", "transient_ior", "not_used_ior" ],
+         server => "-p not_used_ior -t transient_ior $extra_server_args", 
+         clients => [ "-k file://not_used_ior", "-k file://transient_ior -x" ],
+     },
+     );
+
+sub run_client
+{
+    $CL = new PerlACE::Process ("client", @_);
+
+    $CL->Spawn ();
+    
+    $client = $CL->WaitKill (120);
+
+    if ($client != 0) 
+    {
+        print STDERR "ERROR: client returned $client\n";
+        $status = 1;
+        zap_server (1);
+    }
+}
+
+sub run_server 
+{
+    my @parms = @_;
+    my $args = $parms[0];
+    my $iorfiles = $parms[1];
+
+    $SV = new PerlACE::Process ("server", $args);
+
+    $SV->Spawn ();
+
+    for $file (@$iorfiles)
+    {
+        if (PerlACE::waitforfile_timed ($file, 5) == -1)
+        {
+            print STDERR "ERROR: cannot find ior file: $file\n";
+            $status = 1;
+            zap_server (1);
+        }
+    }
+}
+
+sub zap_server
+{
+    $server = $SV->WaitKill (5);
+    
+    if ($server != 0) 
+    {
+        print STDERR "ERROR: server returned $server\n";
+        $status = 1;
+    }
+
+    if ($_[0])
+    {
+        for $file (@iorfiles)
+        {
+            unlink $file;
+        }
+        
+        exit $status;
+    }
+}
+
+for $file (@iorfiles)
+{
+    unlink $file;
+}
+
+for $test (@configurations)
+{
+    print STDERR "\n******************************************************\n";
+
+    run_server ($test->{server}, $test->{iorfiles});
+
+    my $clients = $test->{clients};
+    for $args (@$clients)
+    {
+        run_client ($args);
+    }
+
+    zap_server (0);
+}
+
+for $file (@iorfiles)
+{
+    unlink $file;
+}
+
+exit $status;
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.bor b/TAO/tests/RTCORBA/Persistent_IOR/server.bor
new file mode 100644
index 00000000000..0a158b04444
--- /dev/null
+++ b/TAO/tests/RTCORBA/Persistent_IOR/server.bor
@@ -0,0 +1,42 @@
+#
+# Makefile for building the Faults test executable
+#
+
+NAME = server
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+OBJFILES = \
+	$(OBJDIR)\testC.obj \
+	$(OBJDIR)\testS.obj \
+	$(OBJDIR)\server.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+	$(TAO_CFLAGS) \
+        $(TAO_PORTABLESERVER_CFLAGS) \
+        $(TAO_RTCORBA_CFLAGS) \
+        $(TAO_RTPORTABLESERVER_CFLAGS)
+
+LIBFILES = \
+	$(ACE_LIB) \
+	$(TAO_LIB) \
+        $(TAO_PORTABLESERVER_LIB) \
+        $(TAO_RTCORBA_LIB) \
+        $(TAO_RTPORTABLESERVER_LIB)
+
+IDLFILES = \
+        $(IDLDIR)\test.idl
+
+CPPDIR = .
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
+	$(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
new file mode 100644
index 00000000000..a27ba151e54
--- /dev/null
+++ b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
@@ -0,0 +1,415 @@
+// $Id$
+
+#include "ace/Get_Opt.h"
+#include "testS.h"
+#include "tao/RTPortableServer/RTPortableServer.h"
+
+class test_i :
+  public POA_test,
+  public PortableServer::RefCountServantBase
+{
+public:
+  test_i (CORBA::ORB_ptr orb,
+          PortableServer::POA_ptr poa);
+
+  void method (CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  void shutdown (CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV);
+
+private:
+
+  CORBA::ORB_var orb_;
+  PortableServer::POA_var poa_;
+};
+
+test_i::test_i (CORBA::ORB_ptr orb,
+                PortableServer::POA_ptr poa)
+  : orb_ (CORBA::ORB::_duplicate (orb)),
+    poa_ (PortableServer::POA::_duplicate (poa))
+{
+}
+
+void
+test_i::method (CORBA::Environment &)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  ACE_DEBUG ((LM_DEBUG,
+              "test_i::method\n"));
+}
+
+void
+test_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  ACE_DEBUG ((LM_DEBUG,
+              "test_i::shutdown\n"));
+
+  this->orb_->shutdown (0,
+                        ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+PortableServer::POA_ptr
+test_i::_default_POA (CORBA_Environment &)
+{
+  return PortableServer::POA::_duplicate (this->poa_.in ());
+}
+
+static const char *persistent_ior = "persistent_ior";
+static const char *transient_ior = "transient_ior";
+static int debug = 0;
+
+static CORBA::ULong stacksize = 0;
+static CORBA::ULong static_threads = 2;
+static CORBA::ULong dynamic_threads = 0;
+static RTCORBA::Priority default_thread_priority;
+static CORBA::Boolean allow_request_buffering = 0;
+static CORBA::ULong max_buffered_requests = 0;
+static CORBA::ULong max_request_buffer_size = 0;
+
+int
+parse_args (int argc, char *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, "p:t:d:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'p':
+        persistent_ior = get_opts.optarg;
+        break;
+
+      case 't':
+        transient_ior = get_opts.optarg;
+        break;
+
+      case 'd':
+        debug = ACE_OS::atoi (get_opts.optarg);
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-p <persistent ior file> "
+                           "-t <transient ior file> "
+                           "-d <debug> "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+
+  // Indicates sucessful parsing of the command line
+  return 0;
+}
+
+static void
+write_iors_to_file (CORBA::Object_ptr object,
+                    CORBA::ORB_ptr orb,
+                    const char *filename,
+                    CORBA::Environment &ACE_TRY_ENV)
+{
+  FILE *file =
+    ACE_OS::fopen (filename, "w");
+  ACE_ASSERT (file != 0);
+
+  CORBA::String_var ior =
+    orb->object_to_string (object,
+                           ACE_TRY_ENV);
+  ACE_CHECK;
+
+  if (debug)
+    ACE_DEBUG ((LM_DEBUG,
+                "%s\n",
+                ior.in ()));
+
+  u_int result = 0;
+  result =
+    ACE_OS::fprintf (file,
+                     "%s",
+                     ior.in ());
+
+  ACE_ASSERT (result == ACE_OS::strlen (ior.in ()));
+
+  ACE_OS::fclose (file);
+}
+
+void
+create_poa_and_servant_with_persistent_policy (CORBA::ORB_ptr orb,
+                                               PortableServer::POA_ptr root_poa,
+                                               PortableServer::POAManager_ptr poa_manager,
+                                               CORBA::Environment &ACE_TRY_ENV)
+{
+  CORBA::PolicyList policies;
+
+  CORBA::Policy_var implicit_activation_policy =
+    root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION,
+                                                 ACE_TRY_ENV);
+  ACE_CHECK;
+
+  CORBA::Policy_var lifespan_policy =
+    root_poa->create_lifespan_policy (PortableServer::PERSISTENT,
+                                      ACE_TRY_ENV);
+  ACE_CHECK;
+
+  policies.length (policies.length () + 1);
+  policies[policies.length () - 1] =
+    implicit_activation_policy;
+
+  policies.length (policies.length () + 1);
+  policies[policies.length () - 1] =
+    lifespan_policy;
+
+  PortableServer::POA_var poa =
+    root_poa->create_POA ("persistent_child",
+                          poa_manager,
+                          policies,
+                          ACE_TRY_ENV);
+  ACE_CHECK;
+
+  test_i *servant = 0;
+  ACE_NEW_THROW_EX (servant,
+                    test_i (orb,
+                            poa.in ()),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK;
+
+  PortableServer::ServantBase_var safe_servant (servant);
+
+  test_var test =
+    servant->_this (ACE_TRY_ENV);
+  ACE_CHECK;
+
+  write_iors_to_file (test.in (),
+                      orb,
+                      persistent_ior,
+                      ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+void
+create_poa_and_servant_with_tp_policy (CORBA::ORB_ptr orb,
+                                       RTCORBA::RTORB_ptr rt_orb,
+                                       PortableServer::POA_ptr root_poa,
+                                       PortableServer::POAManager_ptr poa_manager,
+                                       CORBA::Environment &ACE_TRY_ENV)
+{
+  RTCORBA::ThreadpoolId threadpool_id =
+    rt_orb->create_threadpool (stacksize,
+                               static_threads,
+                               dynamic_threads,
+                               default_thread_priority,
+                               allow_request_buffering,
+                               max_buffered_requests,
+                               max_request_buffer_size,
+                               ACE_TRY_ENV);
+  ACE_CHECK;
+
+  CORBA::Policy_var threadpool_policy =
+    rt_orb->create_threadpool_policy (threadpool_id,
+                                      ACE_TRY_ENV);
+  ACE_CHECK;
+
+  CORBA::Policy_var implicit_activation_policy =
+    root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION,
+                                                 ACE_TRY_ENV);
+  ACE_CHECK;
+
+  CORBA::PolicyList policies;
+
+  policies.length (policies.length () + 1);
+  policies[policies.length () - 1] =
+    implicit_activation_policy;
+
+  policies.length (policies.length () + 1);
+  policies[policies.length () - 1] =
+    threadpool_policy;
+
+  PortableServer::POA_var poa =
+    root_poa->create_POA ("tp_child",
+                          poa_manager,
+                          policies,
+                          ACE_TRY_ENV);
+  ACE_CHECK;
+
+  test_i *servant = 0;
+  ACE_NEW_THROW_EX (servant,
+                    test_i (orb,
+                            poa.in ()),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK;
+
+  PortableServer::ServantBase_var safe_servant (servant);
+
+  test_var test =
+    servant->_this (ACE_TRY_ENV);
+  ACE_CHECK;
+
+  write_iors_to_file (test.in (),
+                      orb,
+                      transient_ior,
+                      ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+void
+create_poa_with_tp_and_persistent_policy (RTCORBA::RTORB_ptr rt_orb,
+                                          PortableServer::POA_ptr root_poa,
+                                          CORBA::Environment &ACE_TRY_ENV)
+{
+  ACE_TRY
+    {
+      CORBA::PolicyList policies;
+
+      RTCORBA::ThreadpoolId threadpool_id =
+        rt_orb->create_threadpool (stacksize,
+                                   static_threads,
+                                   dynamic_threads,
+                                   default_thread_priority,
+                                   allow_request_buffering,
+                                   max_buffered_requests,
+                                   max_request_buffer_size,
+                                   ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      CORBA::Policy_var threadpool_policy =
+        rt_orb->create_threadpool_policy (threadpool_id,
+                                          ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      CORBA::Policy_var lifespan_policy =
+        root_poa->create_lifespan_policy (PortableServer::PERSISTENT,
+                                          ACE_TRY_ENV);
+      ACE_CHECK;
+
+      policies.length (policies.length () + 1);
+      policies[policies.length () - 1] =
+        lifespan_policy;
+
+      policies.length (policies.length () + 1);
+      policies[policies.length () - 1] =
+        threadpool_policy;
+
+      PortableServer::POA_var invalid_poa =
+        root_poa->create_POA ("invalid",
+                              PortableServer::POAManager::_nil (),
+                              policies,
+                              ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      // This next line of code should not run because an exception
+      // should have been raised.
+      ACE_DEBUG ((LM_DEBUG, "ERROR: no exception caught\n"));
+    }
+  ACE_CATCH (PortableServer::POA::InvalidPolicy, ex)
+    {
+      // Expected exception.
+      ACE_DEBUG ((LM_DEBUG,
+                  "InvalidPolicy exception is caught as expected.\n"));
+    }
+  ACE_CATCHANY
+    {
+      // Unexpected exception.
+      ACE_DEBUG ((LM_DEBUG, "ERROR: unexpected exception caught\n"));
+      ACE_RE_THROW;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK;
+}
+
+int
+main (int argc, char **argv)
+{
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc,
+                         argv,
+                         0,
+                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      int result =
+        parse_args (argc, argv);
+      if (result != 0)
+        return result;
+
+      CORBA::Object_var object =
+        orb->resolve_initial_references ("RTORB",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      RTCORBA::RTORB_var rt_orb =
+        RTCORBA::RTORB::_narrow (object.in (),
+                                 ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      object =
+        orb->resolve_initial_references ("RTCurrent",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      RTCORBA::Current_var current =
+        RTCORBA::Current::_narrow (object.in (),
+                                   ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      default_thread_priority =
+        current->the_priority (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      object =
+        orb->resolve_initial_references ("RootPOA",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (object.in (),
+                                      ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      create_poa_and_servant_with_tp_policy (orb.in (),
+                                             rt_orb.in (),
+                                             root_poa.in  (),
+                                             poa_manager.in (),
+                                             ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      create_poa_and_servant_with_persistent_policy (orb.in (),
+                                                     root_poa.in  (),
+                                                     poa_manager.in (),
+                                                     ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      create_poa_with_tp_and_persistent_policy (rt_orb.in (),
+                                                root_poa.in  (),
+                                                ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      poa_manager->activate (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      orb->run (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      orb->destroy (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      return -1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.dsp b/TAO/tests/RTCORBA/Persistent_IOR/server.dsp
new file mode 100644
index 00000000000..3c20a7f7f4a
--- /dev/null
+++ b/TAO/tests/RTCORBA/Persistent_IOR/server.dsp
@@ -0,0 +1,216 @@
+# Microsoft Developer Studio Project File - Name="Persistent_IOR Server" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=Persistent_IOR Server - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "server.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "server.mak" CFG="Persistent_IOR Server - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "Persistent_IOR Server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Persistent_IOR Server - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Persistent_IOR Server - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 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 ace.lib TAO.lib TAO_PortableServer.lib TAO_RTCORBA.lib TAO_RTPortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+
+!ELSEIF  "$(CFG)" == "Persistent_IOR Server - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 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 TAO_RTCORBAd.lib TAO_RTPortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Persistent_IOR Server - Win32 Release"
+# Name "Persistent_IOR Server - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\server.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\testC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\testS.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\testC.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\testS.h
+# End Source File
+# End Group
+# Begin Group "Inline Files"
+
+# PROP Default_Filter "i"
+# Begin Source File
+
+SOURCE=.\testC.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\testS.i
+# End Source File
+# End Group
+# Begin Group "IDL Files"
+
+# PROP Default_Filter "idl"
+# Begin Source File
+
+SOURCE=.\test.idl
+
+!IF  "$(CFG)" == "Persistent_IOR Server - Win32 Release"
+
+USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe"	
+# Begin Custom Build
+InputPath=.\test.idl
+InputName=test
+
+BuildCmds= \
+	..\..\..\..\bin\Release\tao_idl.exe -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Persistent_IOR Server - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"	
+# Begin Custom Build - Invoking TAO_IDL on $(InputName)
+InputPath=.\test.idl
+InputName=test
+
+BuildCmds= \
+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/test.idl b/TAO/tests/RTCORBA/Persistent_IOR/test.idl
new file mode 100644
index 00000000000..93c7ac56f50
--- /dev/null
+++ b/TAO/tests/RTCORBA/Persistent_IOR/test.idl
@@ -0,0 +1,8 @@
+// $Id$
+
+interface test
+{
+  void method ();
+
+  void shutdown ();
+};
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/Makefile b/TAO/tests/RTCORBA/Policy_Combinations/Makefile
new file mode 100644
index 00000000000..b37a038e3af
--- /dev/null
+++ b/TAO/tests/RTCORBA/Policy_Combinations/Makefile
@@ -0,0 +1,1240 @@
+#----------------------------------------------------------------------------
+#
+#       $Id$
+#
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+#       Local macros
+#----------------------------------------------------------------------------
+
+ifndef TAO_ROOT
+  TAO_ROOT = $(ACE_ROOT)/TAO
+endif # ! TAO_ROOT
+
+IDL_FILES = test
+IDL_SRC = testC.cpp testS.cpp
+BIN_UNCHECKED = client server
+
+SRC = $(addsuffix .cpp, $(BIN)) $(IDL_SRC)
+
+CLIENT_OBJS = client.o testC.o
+SERVER_OBJS = server.o $(IDL_SRC:.cpp=.o)
+
+TAO_IDLFLAGS += -Ge 1
+#----------------------------------------------------------------------------
+#       Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+
+ifeq ($(rt_corba),1)
+BIN=$(BIN_UNCHECKED)
+endif # rt_corba
+
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include $(TAO_ROOT)/taoconfig.mk
+
+#----------------------------------------------------------------------------
+#       Local targets
+#----------------------------------------------------------------------------
+
+.PRECIOUS: $(foreach ext, $(IDL_EXT), test$(ext))
+
+server: $(addprefix $(VDIR),$(SERVER_OBJS))
+	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(RT_TAO_SRVR_LIBS) $(POSTLINK)
+
+client: $(addprefix $(VDIR),$(CLIENT_OBJS))
+	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(RT_TAO_CLNT_LIBS) $(POSTLINK)
+
+realclean: clean
+	-$(RM) $(foreach ext, $(IDL_EXT), test$(ext))
+
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+
+.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
+  $(ACE_ROOT)/ace/Get_Opt.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Get_Opt.i testC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/ObjectIDList.h \
+  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  testC.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
+  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
+  ../check_supported_priorities.cpp \
+  $(ACE_ROOT)/ace/Sched_Params.h \
+  $(ACE_ROOT)/ace/Sched_Params.i
+
+.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \
+  $(ACE_ROOT)/ace/Get_Opt.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Get_Opt.i testS.h \
+  testC.h $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/ObjectIDList.h \
+  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  testC.i \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+  testS_T.h testS_T.i testS_T.cpp testS.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServer.h \
+  $(TAO_ROOT)/tao/RTPortableServer/rtportableserver_export.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
+  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.h \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.i \
+  ../check_supported_priorities.cpp \
+  $(ACE_ROOT)/ace/Sched_Params.h \
+  $(ACE_ROOT)/ace/Sched_Params.i
+
+.obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/ObjectIDList.h \
+  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  testC.i $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.i \
+  $(TAO_ROOT)/tao/Invocation.h \
+  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+  $(TAO_ROOT)/tao/LF_Event.h \
+  $(TAO_ROOT)/tao/LF_Event.inl \
+  $(TAO_ROOT)/tao/TAOC.h \
+  $(TAO_ROOT)/tao/TAOC.i \
+  $(TAO_ROOT)/tao/operation_details.h \
+  $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/Service_Context.inl \
+  $(TAO_ROOT)/tao/target_specification.h \
+  $(TAO_ROOT)/tao/target_specification.i \
+  $(TAO_ROOT)/tao/operation_details.i \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+  $(TAO_ROOT)/tao/Invocation.i \
+  $(TAO_ROOT)/tao/PortableInterceptor.h \
+  $(TAO_ROOT)/tao/RequestInfo_Util.h \
+  $(TAO_ROOT)/tao/ClientRequestInfo.h \
+  $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+  $(TAO_ROOT)/tao/ClientInterceptorAdapter.h \
+  $(TAO_ROOT)/tao/ClientInterceptorAdapter.inl
+
+.obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/svc_export.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h \
+  $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Record.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/Log_Record.i \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/try_macros.h \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any.h \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/Services.h \
+  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/ObjectIDList.h \
+  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PollableC.h \
+  $(TAO_ROOT)/tao/PollableC.i \
+  $(TAO_ROOT)/tao/MessagingC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  testC.i \
+  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+  testS_T.h testS_T.i testS_T.cpp testS.i \
+  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
+  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
+  $(ACE_ROOT)/ace/Map.h \
+  $(ACE_ROOT)/ace/Map_T.h \
+  $(ACE_ROOT)/ace/Pair.h \
+  $(ACE_ROOT)/ace/Pair_T.h \
+  $(ACE_ROOT)/ace/Pair_T.i \
+  $(ACE_ROOT)/ace/Pair_T.cpp \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Active_Map_Manager.h \
+  $(ACE_ROOT)/ace/Active_Map_Manager.i \
+  $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Map_T.i \
+  $(ACE_ROOT)/ace/Map_T.cpp \
+  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \
+  $(TAO_ROOT)/tao/PortableServer/poa_macros.h \
+  $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \
+  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+  $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PortableServer/Default_Policy_Validator.h \
+  $(TAO_ROOT)/tao/PortableServer/Policy_Validator.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policies.h \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policies.i \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/PortableServer/POA_Policy_Set.i \
+  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
+  $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \
+  $(TAO_ROOT)/tao/TAO_Server_Request.h \
+  $(TAO_ROOT)/tao/Tagged_Profile.h \
+  $(TAO_ROOT)/tao/GIOPC.h \
+  $(TAO_ROOT)/tao/GIOPC.i \
+  $(TAO_ROOT)/tao/Tagged_Profile.i \
+  $(TAO_ROOT)/tao/Service_Context.h \
+  $(TAO_ROOT)/tao/Service_Context.inl \
+  $(TAO_ROOT)/tao/TAO_Server_Request.i \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/Stub.h \
+  $(TAO_ROOT)/tao/MProfile.h \
+  $(TAO_ROOT)/tao/Profile.h \
+  $(TAO_ROOT)/tao/Tagged_Components.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+  $(TAO_ROOT)/tao/Tagged_Components.i \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.h \
+  $(TAO_ROOT)/tao/GIOP_Message_Version.inl \
+  $(TAO_ROOT)/tao/Profile.i \
+  $(TAO_ROOT)/tao/MProfile.i \
+  $(TAO_ROOT)/tao/Stub.i \
+  $(TAO_ROOT)/tao/IFR_Client_Adapter.h \
+  $(TAO_ROOT)/tao/PortableInterceptor.h \
+  $(TAO_ROOT)/tao/RequestInfo_Util.h \
+  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+  $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.h \
+  $(TAO_ROOT)/tao/PortableServer/ServerInterceptorAdapter.inl \
+  $(ACE_ROOT)/ace/Dynamic_Service.h \
+  $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
+  $(ACE_ROOT)/ace/Dynamic_Service.i \
+  $(ACE_ROOT)/ace/Dynamic_Service.cpp
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/Makefile.bor b/TAO/tests/RTCORBA/Policy_Combinations/Makefile.bor
new file mode 100644
index 00000000000..e2ee4acd23a
--- /dev/null
+++ b/TAO/tests/RTCORBA/Policy_Combinations/Makefile.bor
@@ -0,0 +1,7 @@
+#
+# Makefile for building the Faults test executables
+#
+
+MAKEFILES = server.bor client.bor
+
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/Policy_Combinations.dsw b/TAO/tests/RTCORBA/Policy_Combinations/Policy_Combinations.dsw
new file mode 100644
index 00000000000..d17cf7c9604
--- /dev/null
+++ b/TAO/tests/RTCORBA/Policy_Combinations/Policy_Combinations.dsw
@@ -0,0 +1,41 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "client"=.\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "server"=.\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/README b/TAO/tests/RTCORBA/Policy_Combinations/README
new file mode 100644
index 00000000000..7dd8ed6e665
--- /dev/null
+++ b/TAO/tests/RTCORBA/Policy_Combinations/README
@@ -0,0 +1,44 @@
+$Id$
+
+Description:
+
+Test combines and tests several RT policies in different ways.
+
+- The IDL interface has two methods: method() and
+  prioritized_method().
+
+- The client sets its thread to the default priority, calls method()
+  which returns a priority.  If the priority returned is different
+  from <TAO_INVALID_PRIORITY>, the client sets its thread to the
+  priority returned by the server and calls prioritized_method()
+
+- The servant returns the <client_priority_> member in method().  In
+  prioritized_method(), it makes sure that the thread running the
+  upcall is at priority <server_priority_>.  These two members allow
+  several different policies to be tested with the same code.
+
+- In addition to testing servants in the RootPOA and in a simple child
+  POA, the following policy combinations are tested in this example:
+  ________________________________________________________________________________
+
+  Thread-pool    BANDS   PRIORITY MODEL    Client Priority    Server Priority
+  ________________________________________________________________________________
+
+  Default Pool     NO   CLIENT_PROPAGATED        3                  3
+  Default Pool     NO   SERVER_DECLARED          3                  5
+  Without Lanes    NO   CLIENT_PROPAGATED        1                  1
+  Without Lanes    NO   SERVER_DECLARED          1                  5
+  With Lanes       NO   CLIENT_PROPAGATED        2                  2
+  With Lanes       NO   SERVER_DECLARED          3                  5
+  Default Pool    YES   CLIENT_PROPAGATED        3                  3
+  Default Pool    YES   SERVER_DECLARED          1                  5
+  Without Lanes   YES   CLIENT_PROPAGATED        1                  1
+  Without Lanes   YES   SERVER_DECLARED          3                  5
+  With Lanes      YES   CLIENT_PROPAGATED        3                  2
+  With Lanes      YES   SERVER_DECLARED          1                  5
+
+  where the priorities are relative to the minimum priority of the
+  thread scheduling policy used for the test.
+
+- This test uses the -ORBPriorityMapping continuous option.
+
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/client.bor b/TAO/tests/RTCORBA/Policy_Combinations/client.bor
new file mode 100644
index 00000000000..b626ed867c2
--- /dev/null
+++ b/TAO/tests/RTCORBA/Policy_Combinations/client.bor
@@ -0,0 +1,37 @@
+#
+# Makefile for building the Faults ping executable
+#
+
+NAME = client
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+OBJFILES = \
+	$(OBJDIR)\testC.obj \
+	$(OBJDIR)\client.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+        $(TAO_CFLAGS) \
+        $(TAO_RTCORBA_CFLAGS)
+
+LIBFILES = \
+	$(ACE_LIB) \
+        $(TAO_LIB) \
+        $(TAO_RTCORBA_LIB)
+
+IDLFILES = \
+        $(IDLDIR)\test.idl
+
+CPPDIR = .
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
+	$(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
new file mode 100644
index 00000000000..bf74a4cd00e
--- /dev/null
+++ b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
@@ -0,0 +1,154 @@
+// $Id$
+
+#include "ace/Get_Opt.h"
+#include "testC.h"
+#include "tao/ORB_Core.h"
+#include "tao/RTCORBA/RTCORBA.h"
+#include "../check_supported_priorities.cpp"
+
+static const char *ior = 0;
+static int iterations = 5;
+static int shutdown_server = 0;
+static RTCORBA::Priority default_thread_priority;
+
+static int
+parse_args (int argc, char **argv)
+{
+  ACE_Get_Opt get_opts (argc, argv, "k:i:x");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'k':
+        ior = get_opts.optarg;
+        break;
+
+      case 'i':
+        iterations = ::atoi (get_opts.optarg);
+        break;
+
+      case 'x':
+        shutdown_server = 1;
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-k ior "
+                           "-i iterations "
+                           "-x shutdown server "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+
+  if (ior == 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "An IOR must be specified\n"),
+                      -1);
+
+  return 0;
+}
+
+int
+main (int argc, char **argv)
+{
+  // Make sure we can support multiple priorities that are required
+  // for this test.
+  check_supported_priorities ();
+
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc,
+                         argv,
+                         0,
+                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      int result =
+        parse_args (argc, argv);
+      if (result != 0)
+        return result;
+
+      // The following sets the current thread to the lowest priority
+      // for this scheduling policy.  This will give us the biggest
+      // range on NT since the default priority is 0 where as the
+      // lowest priority is -15.
+      ACE_hthread_t current_thread;
+      ACE_Thread::self (current_thread);
+
+      long sched_policy =
+        orb->orb_core ()->orb_params ()->sched_policy ();
+
+      int minimum_priority =
+        ACE_Sched_Params::priority_min (sched_policy);
+
+      result =
+        ACE_Thread::setprio (current_thread,
+                             minimum_priority);
+      if (result != 0)
+        return result;
+
+      CORBA::Object_var object =
+        orb->resolve_initial_references ("RTCurrent",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      RTCORBA::Current_var current =
+        RTCORBA::Current::_narrow (object.in (),
+                                   ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      default_thread_priority =
+        current->the_priority (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      object =
+        orb->string_to_object (ior,
+                               ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      test_var test =
+        test::_narrow (object.in (),
+                       ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      for (int i = 0; i < iterations; i++)
+        {
+          current->the_priority (default_thread_priority,
+                                 ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          CORBA::Short priority =
+            test->method (ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+
+          if (priority != TAO_INVALID_PRIORITY)
+            {
+              current->the_priority (priority,
+                                     ACE_TRY_ENV);
+              ACE_TRY_CHECK;
+
+              test->prioritized_method (ACE_TRY_ENV);
+              ACE_TRY_CHECK;
+            }
+        }
+
+      if (shutdown_server)
+        {
+          test->shutdown (ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception!");
+      return -1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/client.dsp b/TAO/tests/RTCORBA/Policy_Combinations/client.dsp
new file mode 100644
index 00000000000..b3ca5dcd3d9
--- /dev/null
+++ b/TAO/tests/RTCORBA/Policy_Combinations/client.dsp
@@ -0,0 +1,204 @@
+# Microsoft Developer Studio Project File - Name="Policy_Combinations Client" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=Policy_Combinations Client - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "client.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "client.mak" CFG="Policy_Combinations Client - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "Policy_Combinations Client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Policy_Combinations Client - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Policy_Combinations Client - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 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 ace.lib TAO.lib TAO_RTCORBA.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA"
+
+!ELSEIF  "$(CFG)" == "Policy_Combinations Client - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 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_RTCORBAd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Policy_Combinations Client - Win32 Release"
+# Name "Policy_Combinations Client - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\client.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\testC.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\testC.h
+# End Source File
+# End Group
+# Begin Group "Inline Files"
+
+# PROP Default_Filter "i"
+# Begin Source File
+
+SOURCE=.\testC.i
+# End Source File
+# End Group
+# Begin Group "IDL Files"
+
+# PROP Default_Filter "idl"
+# Begin Source File
+
+SOURCE=.\test.idl
+
+!IF  "$(CFG)" == "Policy_Combinations Client - Win32 Release"
+
+USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe"	
+# Begin Custom Build
+InputPath=.\test.idl
+InputName=test
+
+BuildCmds= \
+	..\..\..\..\bin\Release\tao_idl.exe -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Policy_Combinations Client - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"	
+# Begin Custom Build - Invoking TAO_IDL on $(InputName)
+InputPath=.\test.idl
+InputName=test
+
+BuildCmds= \
+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/run_test.pl b/TAO/tests/RTCORBA/Policy_Combinations/run_test.pl
new file mode 100755
index 00000000000..ba5ea0cf50a
--- /dev/null
+++ b/TAO/tests/RTCORBA/Policy_Combinations/run_test.pl
@@ -0,0 +1,92 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib '../../../../bin';
+use PerlACE::Run_Test;
+
+$status = 0;
+
+@iorfiles = 
+    (
+     "root",
+     "child",
+     "default_pool_no_bands_client_propagated",
+     "default_pool_no_bands_server_declared",
+     "no_lanes_no_bands_client_propagated",
+     "no_lanes_no_bands_server_declared",
+     "lanes_no_bands_client_propagated",
+     "lanes_no_bands_server_declared",
+     "default_pool_bands_client_propagated",
+     "default_pool_bands_server_declared",
+     "no_lanes_bands_client_propagated",
+     "no_lanes_bands_server_declared",
+     "lanes_bands_client_propagated",
+     "lanes_bands_server_declared",
+     );
+
+sub run_client
+{
+    $CL = new PerlACE::Process ("client", @_);
+
+    $CL->Spawn ();
+    
+    $client = $CL->WaitKill (120);
+
+    if ($client != 0) 
+    {
+        print STDERR "ERROR: client returned $client\n";
+        $status = 1;
+        goto kill_server;
+    }
+}
+
+for $file (@iorfiles)
+{
+    unlink $file;
+}
+
+$SV = new PerlACE::Process ("server");
+
+$SV->Spawn ();
+
+for $file (@iorfiles)
+{
+    if (PerlACE::waitforfile_timed ($file, 5) == -1)
+    {
+        print STDERR "ERROR: cannot find ior file: $file\n";
+        $status = 1;
+        goto kill_server;
+    }
+
+    print STDERR "\n******************************************************\n";
+    print STDERR "Invoking methods on servant in $file poa\n";
+    print STDERR "******************************************************\n\n";
+
+    run_client ("-k file://$file");
+}
+
+print STDERR "\n**************************\n";
+print STDERR "Shutting down the server\n";
+print STDERR "**************************\n\n";
+
+run_client ("-k file://$iorfiles[0] -i 0 -x");
+
+kill_server:
+
+$server = $SV->WaitKill (5);
+
+if ($server != 0) {
+    print STDERR "ERROR: server returned $server\n";
+    $status = 1
+}
+
+for $file (@iorfiles)
+{
+    unlink $file;
+}
+
+exit $status
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.bor b/TAO/tests/RTCORBA/Policy_Combinations/server.bor
new file mode 100644
index 00000000000..0a158b04444
--- /dev/null
+++ b/TAO/tests/RTCORBA/Policy_Combinations/server.bor
@@ -0,0 +1,42 @@
+#
+# Makefile for building the Faults test executable
+#
+
+NAME = server
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+OBJFILES = \
+	$(OBJDIR)\testC.obj \
+	$(OBJDIR)\testS.obj \
+	$(OBJDIR)\server.obj
+
+CFLAGS = \
+	$(ACE_CFLAGS) \
+	$(TAO_CFLAGS) \
+        $(TAO_PORTABLESERVER_CFLAGS) \
+        $(TAO_RTCORBA_CFLAGS) \
+        $(TAO_RTPORTABLESERVER_CFLAGS)
+
+LIBFILES = \
+	$(ACE_LIB) \
+	$(TAO_LIB) \
+        $(TAO_PORTABLESERVER_LIB) \
+        $(TAO_RTCORBA_LIB) \
+        $(TAO_RTPORTABLESERVER_LIB)
+
+IDLFILES = \
+        $(IDLDIR)\test.idl
+
+CPPDIR = .
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
+	$(TAO_IDL) $**
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
new file mode 100644
index 00000000000..4fc38f62c2d
--- /dev/null
+++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
@@ -0,0 +1,901 @@
+// $Id$
+
+#include "ace/Get_Opt.h"
+#include "testS.h"
+#include "tao/ORB_Core.h"
+#include "tao/RTPortableServer/RTPortableServer.h"
+#include "../check_supported_priorities.cpp"
+
+class test_i :
+  public POA_test,
+  public PortableServer::RefCountServantBase
+{
+public:
+  test_i (CORBA::ORB_ptr orb,
+          PortableServer::POA_ptr poa,
+          CORBA::Short server_priority,
+          CORBA::Short client_priority);
+
+  CORBA::Short method (CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  void prioritized_method (CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  void shutdown (CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV);
+
+private:
+
+  CORBA::ORB_var orb_;
+  PortableServer::POA_var poa_;
+  CORBA::Short server_priority_;
+  CORBA::Short client_priority_;
+};
+
+test_i::test_i (CORBA::ORB_ptr orb,
+                PortableServer::POA_ptr poa,
+                CORBA::Short server_priority,
+                CORBA::Short client_priority)
+  : orb_ (CORBA::ORB::_duplicate (orb)),
+    poa_ (PortableServer::POA::_duplicate (poa)),
+    server_priority_ (server_priority),
+    client_priority_ (client_priority)
+{
+}
+
+CORBA::Short
+test_i::method (CORBA::Environment &)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  ACE_DEBUG ((LM_DEBUG,
+              "test_i::method\n"));
+
+  return this->client_priority_;
+}
+
+void
+test_i::prioritized_method (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  CORBA::Object_var object =
+    this->orb_->resolve_initial_references ("RTCurrent",
+                                            ACE_TRY_ENV);
+  ACE_CHECK;
+
+  RTCORBA::Current_var current =
+    RTCORBA::Current::_narrow (object.in (),
+                               ACE_TRY_ENV);
+  ACE_CHECK;
+
+  CORBA::Short priority =
+    current->the_priority (ACE_TRY_ENV);
+  ACE_CHECK;
+
+  ACE_DEBUG ((LM_DEBUG,
+              "test_i::prioritized_method: client = %d server = %d (should be %d)\n",
+              this->client_priority_,
+              priority,
+              this->server_priority_));
+
+  ACE_ASSERT (this->server_priority_ == priority);
+}
+
+void
+test_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  ACE_DEBUG ((LM_DEBUG,
+              "test_i::shutdown\n"));
+
+  this->orb_->shutdown (0,
+                        ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+PortableServer::POA_ptr
+test_i::_default_POA (CORBA_Environment &)
+{
+  return PortableServer::POA::_duplicate (this->poa_.in ());
+}
+
+static CORBA::Short server_priority;
+static CORBA::Short client_priority;
+static CORBA::ULong stacksize = 0;
+static CORBA::ULong static_threads = 2;
+static CORBA::ULong dynamic_threads = 0;
+static RTCORBA::Priority default_thread_priority;
+static CORBA::Boolean allow_request_buffering = 0;
+static CORBA::ULong max_buffered_requests = 0;
+static CORBA::ULong max_request_buffer_size = 0;
+static CORBA::Boolean allow_borrowing = 0;
+
+static int
+parse_args (int argc, char **argv)
+{
+  ACE_Get_Opt get_opts (argc, argv, "s:c:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 's':
+        ::server_priority = ::atoi (get_opts.optarg);
+      break;
+
+      case 'c':
+        ::client_priority = ::atoi (get_opts.optarg);
+      break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-s server priority "
+                           "-c client priority "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+
+  return 0;
+}
+
+static void
+write_iors_to_file (CORBA::Object_ptr object,
+                    CORBA::ORB_ptr orb,
+                    const char *filename,
+                    CORBA::Environment &ACE_TRY_ENV)
+{
+  FILE *file =
+    ACE_OS::fopen (filename, "w");
+  ACE_ASSERT (file != 0);
+
+  CORBA::String_var ior =
+    orb->object_to_string (object,
+                           ACE_TRY_ENV);
+  ACE_CHECK;
+
+  u_int result = 0;
+  result =
+    ACE_OS::fprintf (file,
+                     "%s",
+                     ior.in ());
+
+  ACE_ASSERT (result == ACE_OS::strlen (ior.in ()));
+
+  ACE_OS::fclose (file);
+}
+
+class server
+{
+public:
+  server (CORBA::ORB_ptr orb,
+          RTCORBA::RTORB_ptr rt_orb,
+          PortableServer::POA_ptr root_poa,
+          PortableServer::POAManager_ptr poa_manager);
+
+  void test_root_poa (CORBA::Environment &ACE_TRY_ENV);
+  void test_child_poa (CORBA::Environment &ACE_TRY_ENV);
+
+  typedef void (server::*test_function) (CORBA::PolicyList &policies,
+                                         CORBA::Short server_priority,
+                                         CORBA::Short client_priority,
+                                         const char *test_name,
+                                         CORBA::Environment &ACE_TRY_ENV);
+
+  void test_default_pool_poa (CORBA::Short server_priority,
+                              CORBA::Short client_priority,
+                              server::test_function function,
+                              const char *test_name,
+                              CORBA::Environment &ACE_TRY_ENV);
+
+  void test_bands_poa (CORBA::PolicyList &policies,
+                       CORBA::Short server_priority,
+                       CORBA::Short client_priority,
+                       server::test_function function,
+                       const char *test_name,
+                       CORBA::Environment &ACE_TRY_ENV);
+
+  void test_no_lanes_poa (CORBA::Short server_priority,
+                          CORBA::Short client_priority,
+                          server::test_function function,
+                          const char *test_name,
+                          CORBA::Environment &ACE_TRY_ENV);
+
+  void test_lanes_poa (CORBA::Short server_priority,
+                       CORBA::Short client_priority,
+                       server::test_function function,
+                       const char *test_name,
+                       CORBA::Environment &ACE_TRY_ENV);
+
+  void test_no_bands_client_propagated_poa (CORBA::PolicyList &policies,
+                                            CORBA::Short server_priority,
+                                            CORBA::Short client_priority,
+                                            const char *test_name,
+                                            CORBA::Environment &ACE_TRY_ENV);
+
+  void test_bands_client_propagated_poa (CORBA::PolicyList &policies,
+                                         CORBA::Short server_priority,
+                                         CORBA::Short client_priority,
+                                         const char *test_name,
+                                         CORBA::Environment &ACE_TRY_ENV);
+
+  void test_no_bands_server_declared_poa (CORBA::PolicyList &policies,
+                                          CORBA::Short server_priority,
+                                          CORBA::Short client_priority,
+                                          const char *test_name,
+                                          CORBA::Environment &ACE_TRY_ENV);
+
+  void test_bands_server_declared_poa (CORBA::PolicyList &policies,
+                                       CORBA::Short server_priority,
+                                       CORBA::Short client_priority,
+                                       const char *test_name,
+                                       CORBA::Environment &ACE_TRY_ENV);
+
+  void test_default_pool_no_bands_client_propagated_poa (CORBA::Environment &ACE_TRY_ENV);
+
+  void test_no_lanes_no_bands_client_propagated_poa (CORBA::Environment &ACE_TRY_ENV);
+
+  void test_lanes_no_bands_client_propagated_poa (CORBA::Environment &ACE_TRY_ENV);
+
+  void test_default_pool_bands_client_propagated_poa (CORBA::Environment &ACE_TRY_ENV);
+
+  void test_no_lanes_bands_client_propagated_poa (CORBA::Environment &ACE_TRY_ENV);
+
+  void test_lanes_bands_client_propagated_poa (CORBA::Environment &ACE_TRY_ENV);
+
+  void test_default_pool_no_bands_server_declared_poa (CORBA::Environment &ACE_TRY_ENV);
+
+  void test_no_lanes_no_bands_server_declared_poa (CORBA::Environment &ACE_TRY_ENV);
+
+  void test_lanes_no_bands_server_declared_poa (CORBA::Environment &ACE_TRY_ENV);
+
+  void test_default_pool_bands_server_declared_poa (CORBA::Environment &ACE_TRY_ENV);
+
+  void test_no_lanes_bands_server_declared_poa (CORBA::Environment &ACE_TRY_ENV);
+
+  void test_lanes_bands_server_declared_poa (CORBA::Environment &ACE_TRY_ENV);
+
+private:
+
+  CORBA::ORB_var orb_;
+  RTCORBA::RTORB_var rt_orb_;
+  PortableServer::POA_var root_poa_;
+  PortableServer::POAManager_var poa_manager_;
+};
+
+server::server (CORBA::ORB_ptr orb,
+                RTCORBA::RTORB_ptr rt_orb,
+                PortableServer::POA_ptr root_poa,
+                PortableServer::POAManager_ptr poa_manager)
+  : orb_ (CORBA::ORB::_duplicate (orb)),
+    rt_orb_ (RTCORBA::RTORB::_duplicate (rt_orb)),
+    root_poa_ (PortableServer::POA::_duplicate (root_poa)),
+    poa_manager_ (PortableServer::POAManager::_duplicate (poa_manager))
+{
+}
+
+void
+server::test_root_poa (CORBA::Environment &ACE_TRY_ENV)
+{
+  test_i *servant = 0;
+  ACE_NEW_THROW_EX (servant,
+                    test_i (this->orb_.in (),
+                            this->root_poa_.in (),
+                            TAO_INVALID_PRIORITY,
+                            TAO_INVALID_PRIORITY),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK;
+
+  PortableServer::ServantBase_var safe_servant (servant);
+
+  test_var test =
+    servant->_this (ACE_TRY_ENV);
+  ACE_CHECK;
+
+  write_iors_to_file (test.in (),
+                      this->orb_.in (),
+                      "root",
+                      ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+void
+server::test_child_poa (CORBA::Environment &ACE_TRY_ENV)
+{
+  CORBA::PolicyList policies;
+  policies.length (1);
+  policies[policies.length () - 1] =
+    this->root_poa_->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION,
+                                                        ACE_TRY_ENV);
+  ACE_CHECK;
+
+  PortableServer::POA_var poa =
+    this->root_poa_->create_POA ("child",
+                                 this->poa_manager_.in (),
+                                 policies,
+                                 ACE_TRY_ENV);
+  ACE_CHECK;
+
+  test_i *servant = 0;
+  ACE_NEW_THROW_EX (servant,
+                    test_i (this->orb_.in (),
+                            poa.in (),
+                            TAO_INVALID_PRIORITY,
+                            TAO_INVALID_PRIORITY),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK;
+
+  PortableServer::ServantBase_var safe_servant (servant);
+
+  test_var test =
+    servant->_this (ACE_TRY_ENV);
+  ACE_CHECK;
+
+  write_iors_to_file (test.in (),
+                      this->orb_.in (),
+                      "child",
+                      ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+void
+server::test_default_pool_poa (CORBA::Short server_priority,
+                               CORBA::Short client_priority,
+                               server::test_function function,
+                               const char *test_name,
+                               CORBA::Environment &ACE_TRY_ENV)
+{
+  CORBA::PolicyList empty_policies;
+  (this->*function) (empty_policies,
+                     server_priority,
+                     client_priority,
+                     test_name,
+                     ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+void
+server::test_bands_poa (CORBA::PolicyList &policies,
+                        CORBA::Short server_priority,
+                        CORBA::Short client_priority,
+                        server::test_function function,
+                        const char *test_name,
+                        CORBA::Environment &ACE_TRY_ENV)
+{
+  RTCORBA::PriorityBands bands;
+  bands.length (3);
+
+  bands[0].low = default_thread_priority;
+  bands[0].high = default_thread_priority;
+  bands[1].low = ::server_priority - 1;
+  bands[1].high = ::server_priority + 1;
+  bands[2].low = ::client_priority - 1;
+  bands[2].high = ::client_priority + 1;
+
+  policies.length (policies.length () + 1);
+  policies[policies.length () - 1] =
+    this->rt_orb_->create_priority_banded_connection_policy (bands,
+                                                             ACE_TRY_ENV);
+  ACE_CHECK;
+
+  (this->*function) (policies,
+                     server_priority,
+                     client_priority,
+                     test_name,
+                     ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+void
+server::test_no_lanes_poa (CORBA::Short server_priority,
+                           CORBA::Short client_priority,
+                           server::test_function function,
+                           const char *test_name,
+                           CORBA::Environment &ACE_TRY_ENV)
+{
+  RTCORBA::ThreadpoolId threadpool_id =
+    this->rt_orb_->create_threadpool (stacksize,
+                                      static_threads,
+                                      dynamic_threads,
+                                      default_thread_priority,
+                                      allow_request_buffering,
+                                      max_buffered_requests,
+                                      max_request_buffer_size,
+                                      ACE_TRY_ENV);
+  ACE_CHECK;
+
+  CORBA::Policy_var threadpool_policy =
+    this->rt_orb_->create_threadpool_policy (threadpool_id,
+                                             ACE_TRY_ENV);
+  ACE_CHECK;
+
+  CORBA::PolicyList policies;
+  policies.length (1);
+  policies[0] =
+    threadpool_policy;
+
+  (this->*function) (policies,
+                     server_priority,
+                     client_priority,
+                     test_name,
+                     ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+void
+server::test_lanes_poa (CORBA::Short server_priority,
+                        CORBA::Short client_priority,
+                        server::test_function function,
+                        const char *test_name,
+                        CORBA::Environment &ACE_TRY_ENV)
+{
+  RTCORBA::ThreadpoolLanes lanes;
+  lanes.length (3);
+
+  lanes[0].lane_priority = ::client_priority;
+  lanes[0].static_threads = static_threads;
+  lanes[0].dynamic_threads = dynamic_threads;
+
+  lanes[1].lane_priority = ::server_priority;
+  lanes[1].static_threads = static_threads;
+  lanes[1].dynamic_threads = dynamic_threads;
+
+  lanes[2].lane_priority = default_thread_priority;
+  lanes[2].static_threads = static_threads;
+  lanes[2].dynamic_threads = dynamic_threads;
+
+  RTCORBA::ThreadpoolId threadpool_id =
+    this->rt_orb_->create_threadpool_with_lanes (stacksize,
+                                                 lanes,
+                                                 allow_borrowing,
+                                                 allow_request_buffering,
+                                                 max_buffered_requests,
+                                                 max_request_buffer_size,
+                                                 ACE_TRY_ENV);
+  ACE_CHECK;
+
+  CORBA::Policy_var threadpool_policy =
+    this->rt_orb_->create_threadpool_policy (threadpool_id,
+                                             ACE_TRY_ENV);
+  ACE_CHECK;
+
+  CORBA::PolicyList policies;
+  policies.length (1);
+  policies[0] =
+    threadpool_policy;
+
+  (this->*function) (policies,
+                     server_priority,
+                     client_priority,
+                     test_name,
+                     ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+void
+server::test_no_bands_client_propagated_poa (CORBA::PolicyList &policies,
+                                             CORBA::Short server_priority,
+                                             CORBA::Short client_priority,
+                                             const char *test_name,
+                                             CORBA::Environment &ACE_TRY_ENV)
+{
+  policies.length (policies.length () + 1);
+  policies[policies.length () - 1] =
+    this->rt_orb_->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
+                                                 default_thread_priority,
+                                                 ACE_TRY_ENV);
+  ACE_CHECK;
+
+  PortableServer::POA_var poa =
+    this->root_poa_->create_POA (test_name,
+                                 this->poa_manager_.in (),
+                                 policies,
+                                 ACE_TRY_ENV);
+  ACE_CHECK;
+
+  RTPortableServer::POA_var rt_poa =
+    RTPortableServer::POA::_narrow (poa.in (),
+                                    ACE_TRY_ENV);
+  ACE_CHECK;
+
+  test_i *servant = 0;
+  ACE_NEW_THROW_EX (servant,
+                    test_i (this->orb_.in (),
+                            poa.in (),
+                            server_priority,
+                            client_priority),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK;
+
+  PortableServer::ServantBase_var safe_servant (servant);
+
+  PortableServer::ObjectId_var id =
+    rt_poa->activate_object (servant,
+                             ACE_TRY_ENV);
+  ACE_CHECK;
+
+  CORBA::Object_var object =
+    poa->id_to_reference (id.in (),
+                          ACE_TRY_ENV);
+  ACE_CHECK;
+
+  write_iors_to_file (object.in (),
+                      this->orb_.in (),
+                      test_name,
+                      ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+void
+server::test_bands_client_propagated_poa (CORBA::PolicyList &policies,
+                                          CORBA::Short server_priority,
+                                          CORBA::Short client_priority,
+                                          const char *test_name,
+                                          CORBA::Environment &ACE_TRY_ENV)
+{
+  this->test_bands_poa (policies,
+                        server_priority,
+                        client_priority,
+                        &server::test_no_bands_client_propagated_poa,
+                        test_name,
+                        ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+void
+server::test_default_pool_no_bands_client_propagated_poa (CORBA::Environment &ACE_TRY_ENV)
+{
+  this->test_default_pool_poa (::client_priority + 1,
+                               ::client_priority + 1,
+                               &server::test_no_bands_client_propagated_poa,
+                               "default_pool_no_bands_client_propagated",
+                               ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+void
+server::test_no_lanes_no_bands_client_propagated_poa (CORBA::Environment &ACE_TRY_ENV)
+{
+  this->test_no_lanes_poa (::client_priority - 1,
+                           ::client_priority - 1,
+                           &server::test_no_bands_client_propagated_poa,
+                           "no_lanes_no_bands_client_propagated",
+                           ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+void
+server::test_lanes_no_bands_client_propagated_poa (CORBA::Environment &ACE_TRY_ENV)
+{
+  this->test_lanes_poa (::client_priority,
+                        ::client_priority,
+                        &server::test_no_bands_client_propagated_poa,
+                        "lanes_no_bands_client_propagated",
+                        ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+void
+server::test_default_pool_bands_client_propagated_poa (CORBA::Environment &ACE_TRY_ENV)
+{
+  this->test_default_pool_poa (::client_priority + 1,
+                               ::client_priority + 1,
+                               &server::test_bands_client_propagated_poa,
+                               "default_pool_bands_client_propagated",
+                               ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+void
+server::test_no_lanes_bands_client_propagated_poa (CORBA::Environment &ACE_TRY_ENV)
+{
+  this->test_no_lanes_poa (::client_priority - 1,
+                           ::client_priority - 1,
+                           &server::test_bands_client_propagated_poa,
+                           "no_lanes_bands_client_propagated",
+                           ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+void
+server::test_lanes_bands_client_propagated_poa (CORBA::Environment &ACE_TRY_ENV)
+{
+  this->test_lanes_poa (::client_priority,
+                        ::client_priority + 1,
+                        &server::test_bands_client_propagated_poa,
+                        "lanes_bands_client_propagated",
+                        ACE_TRY_ENV);
+  ACE_CHECK;
+
+}
+
+void
+server::test_no_bands_server_declared_poa (CORBA::PolicyList &policies,
+                                           CORBA::Short server_priority,
+                                           CORBA::Short client_priority,
+                                           const char *test_name,
+                                           CORBA::Environment &ACE_TRY_ENV)
+{
+  policies.length (policies.length () + 1);
+  policies[policies.length () - 1] =
+    this->rt_orb_->create_priority_model_policy (RTCORBA::SERVER_DECLARED,
+                                                 default_thread_priority,
+                                                 ACE_TRY_ENV);
+  ACE_CHECK;
+
+  PortableServer::POA_var poa =
+    this->root_poa_->create_POA (test_name,
+                                 this->poa_manager_.in (),
+                                 policies,
+                                 ACE_TRY_ENV);
+  ACE_CHECK;
+
+  RTPortableServer::POA_var rt_poa =
+    RTPortableServer::POA::_narrow (poa.in (),
+                                    ACE_TRY_ENV);
+  ACE_CHECK;
+
+  test_i *servant = 0;
+  ACE_NEW_THROW_EX (servant,
+                    test_i (this->orb_.in (),
+                            poa.in (),
+                            server_priority,
+                            client_priority),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK;
+
+  PortableServer::ServantBase_var safe_servant (servant);
+
+  PortableServer::ObjectId_var id =
+    rt_poa->activate_object_with_priority (servant,
+                                           ::server_priority,
+                                           ACE_TRY_ENV);
+  ACE_CHECK;
+
+  CORBA::Object_var object =
+    poa->id_to_reference (id.in (),
+                          ACE_TRY_ENV);
+  ACE_CHECK;
+
+  write_iors_to_file (object.in (),
+                      this->orb_.in (),
+                      test_name,
+                      ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+void
+server::test_bands_server_declared_poa (CORBA::PolicyList &policies,
+                                        CORBA::Short server_priority,
+                                        CORBA::Short client_priority,
+                                        const char *test_name,
+                                        CORBA::Environment &ACE_TRY_ENV)
+{
+  this->test_bands_poa (policies,
+                        server_priority,
+                        client_priority,
+                        &server::test_no_bands_server_declared_poa,
+                        test_name,
+                        ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+void
+server::test_default_pool_no_bands_server_declared_poa (CORBA::Environment &ACE_TRY_ENV)
+{
+  this->test_default_pool_poa (::server_priority,
+                               ::client_priority + 1,
+                               &server::test_no_bands_server_declared_poa,
+                               "default_pool_no_bands_server_declared",
+                               ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+void
+server::test_no_lanes_no_bands_server_declared_poa (CORBA::Environment &ACE_TRY_ENV)
+{
+  this->test_no_lanes_poa (::server_priority,
+                           ::client_priority - 1,
+                           &server::test_no_bands_server_declared_poa,
+                           "no_lanes_no_bands_server_declared",
+                           ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+void
+server::test_lanes_no_bands_server_declared_poa (CORBA::Environment &ACE_TRY_ENV)
+{
+  this->test_lanes_poa (::server_priority,
+                        ::client_priority + 1,
+                        &server::test_no_bands_server_declared_poa,
+                        "lanes_no_bands_server_declared",
+                        ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+void
+server::test_default_pool_bands_server_declared_poa (CORBA::Environment &ACE_TRY_ENV)
+{
+  this->test_default_pool_poa (::server_priority,
+                               ::client_priority - 1,
+                               &server::test_bands_server_declared_poa,
+                               "default_pool_bands_server_declared",
+                               ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+void
+server::test_no_lanes_bands_server_declared_poa (CORBA::Environment &ACE_TRY_ENV)
+{
+  this->test_no_lanes_poa (::server_priority,
+                           ::client_priority + 1,
+                           &server::test_bands_server_declared_poa,
+                           "no_lanes_bands_server_declared",
+                           ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+void
+server::test_lanes_bands_server_declared_poa (CORBA::Environment &ACE_TRY_ENV)
+{
+  this->test_lanes_poa (::server_priority,
+                        ::client_priority - 1,
+                        &server::test_bands_server_declared_poa,
+                        "lanes_bands_server_declared",
+                        ACE_TRY_ENV);
+  ACE_CHECK;
+}
+
+int
+main (int argc, char **argv)
+{
+  // Make sure we can support multiple priorities that are required
+  // for this test.
+  check_supported_priorities ();
+
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc,
+                         argv,
+                         0,
+                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      CORBA::Object_var object =
+        orb->resolve_initial_references ("RTORB",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      RTCORBA::RTORB_var rt_orb =
+        RTCORBA::RTORB::_narrow (object.in (),
+                                 ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      // The following sets the current thread to the lowest priority
+      // for this scheduling policy.  This will give us the biggest
+      // range on NT since the default priority is 0 where as the
+      // lowest priority is -15.
+      ACE_hthread_t current_thread;
+      ACE_Thread::self (current_thread);
+
+      long sched_policy =
+        orb->orb_core ()->orb_params ()->sched_policy ();
+
+      int minimum_priority =
+        ACE_Sched_Params::priority_min (sched_policy);
+
+      int result =
+        ACE_Thread::setprio (current_thread,
+                             minimum_priority);
+      if (result != 0)
+        return result;
+
+      object =
+        orb->resolve_initial_references ("RTCurrent",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      RTCORBA::Current_var current =
+        RTCORBA::Current::_narrow (object.in (),
+                                   ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      default_thread_priority =
+        current->the_priority (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      client_priority =
+        default_thread_priority + 2;
+
+      server_priority =
+        default_thread_priority + 5;
+
+      result =
+        parse_args (argc, argv);
+      if (result != 0)
+        return result;
+
+      object =
+        orb->resolve_initial_references ("RootPOA",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (object.in (),
+                                      ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      server server (orb.in (),
+                     rt_orb.in (),
+                     root_poa.in (),
+                     poa_manager.in ());
+
+      server.test_root_poa (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      server.test_child_poa (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      server.test_default_pool_no_bands_client_propagated_poa (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      server.test_default_pool_no_bands_server_declared_poa (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      server.test_no_lanes_no_bands_client_propagated_poa (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      server.test_no_lanes_no_bands_server_declared_poa (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      server.test_lanes_no_bands_client_propagated_poa (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      server.test_lanes_no_bands_server_declared_poa (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      server.test_default_pool_bands_client_propagated_poa (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      server.test_default_pool_bands_server_declared_poa (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      server.test_no_lanes_bands_client_propagated_poa (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      server.test_no_lanes_bands_server_declared_poa (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      server.test_lanes_bands_client_propagated_poa (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      server.test_lanes_bands_server_declared_poa (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      poa_manager->activate (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      orb->run (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      orb->destroy (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      return -1;
+    }
+  ACE_ENDTRY;
+
+  return 0;
+}
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.dsp b/TAO/tests/RTCORBA/Policy_Combinations/server.dsp
new file mode 100644
index 00000000000..be72331a327
--- /dev/null
+++ b/TAO/tests/RTCORBA/Policy_Combinations/server.dsp
@@ -0,0 +1,216 @@
+# Microsoft Developer Studio Project File - Name="Policy_Combinations Server" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=Policy_Combinations Server - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "server.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "server.mak" CFG="Policy_Combinations Server - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "Policy_Combinations Server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Policy_Combinations Server - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Policy_Combinations Server - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 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 ace.lib TAO.lib TAO_PortableServer.lib TAO_RTCORBA.lib TAO_RTPortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+
+!ELSEIF  "$(CFG)" == "Policy_Combinations Server - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# 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 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 TAO_RTCORBAd.lib TAO_RTPortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Policy_Combinations Server - Win32 Release"
+# Name "Policy_Combinations Server - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\server.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\testC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\testS.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\testC.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\testS.h
+# End Source File
+# End Group
+# Begin Group "Inline Files"
+
+# PROP Default_Filter "i"
+# Begin Source File
+
+SOURCE=.\testC.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\testS.i
+# End Source File
+# End Group
+# Begin Group "IDL Files"
+
+# PROP Default_Filter "idl"
+# Begin Source File
+
+SOURCE=.\test.idl
+
+!IF  "$(CFG)" == "Policy_Combinations Server - Win32 Release"
+
+USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe"	
+# Begin Custom Build
+InputPath=.\test.idl
+InputName=test
+
+BuildCmds= \
+	..\..\..\..\bin\Release\tao_idl.exe -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Policy_Combinations Server - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"	
+# Begin Custom Build - Invoking TAO_IDL on $(InputName)
+InputPath=.\test.idl
+InputName=test
+
+BuildCmds= \
+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl
+
+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/svc.conf b/TAO/tests/RTCORBA/Policy_Combinations/svc.conf
new file mode 100644
index 00000000000..7b06f1319bb
--- /dev/null
+++ b/TAO/tests/RTCORBA/Policy_Combinations/svc.conf
@@ -0,0 +1 @@
+static RT_ORB_Loader "-ORBPriorityMapping continuous"
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/test.idl b/TAO/tests/RTCORBA/Policy_Combinations/test.idl
new file mode 100644
index 00000000000..6d6ba1c9f84
--- /dev/null
+++ b/TAO/tests/RTCORBA/Policy_Combinations/test.idl
@@ -0,0 +1,10 @@
+// $Id$
+
+interface test
+{
+  short method ();
+
+  void prioritized_method ();
+
+  void shutdown ();
+};
diff --git a/TAO/tests/RTCORBA/Private_Connection/client.bor b/TAO/tests/RTCORBA/Private_Connection/client.bor
index ace9de13ef5..86ad0a916ce 100644
--- a/TAO/tests/RTCORBA/Private_Connection/client.bor
+++ b/TAO/tests/RTCORBA/Private_Connection/client.bor
@@ -13,13 +13,11 @@ OBJFILES = \
 CFLAGS = \
 	$(ACE_CFLAGS) \
 	$(TAO_CFLAGS) \
-        $(TAO_PORTABLESERVER_CFLAGS) \
         $(TAO_RTCORBA_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
 	$(TAO_LIB) \
-        $(TAO_PORTABLESERVER_LIB) \
         $(TAO_RTCORBA_LIB)
 
 IDLFILES = \
diff --git a/TAO/tests/RTCORBA/Private_Connection/client.dsp b/TAO/tests/RTCORBA/Private_Connection/client.dsp
index 2f7f8c6d815..72e62ad41f6 100644
--- a/TAO/tests/RTCORBA/Private_Connection/client.dsp
+++ b/TAO/tests/RTCORBA/Private_Connection/client.dsp
@@ -51,7 +51,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 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_RTCORBA.lib TAO_RTPortableServer.lib ace.lib TAO.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 ace.lib TAO.lib TAO_RTCORBA.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA"
 
 !ELSEIF  "$(CFG)" == "Private_Connection Client - Win32 Debug"
 
@@ -76,7 +76,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 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 TAO_RTCORBAd.lib TAO_RTPortableServerd.lib TAO_Strategiesd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 aced.lib TAOd.lib TAO_RTCORBAd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA"
 
 !ENDIF 
 
diff --git a/TAO/tests/RTCORBA/Private_Connection/server.dsp b/TAO/tests/RTCORBA/Private_Connection/server.dsp
index 39c74eeea8a..eec85adaf0d 100644
--- a/TAO/tests/RTCORBA/Private_Connection/server.dsp
+++ b/TAO/tests/RTCORBA/Private_Connection/server.dsp
@@ -51,7 +51,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 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_RTCORBA.lib TAO_RTPortableServer.lib ace.lib TAO.lib TAO_PortableServer.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_RTCORBA.lib TAO_RTPortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
 
 !ELSEIF  "$(CFG)" == "Private_Connection Server - Win32 Debug"
 
@@ -76,7 +76,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 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 TAO_RTCORBAd.lib TAO_RTPortableServerd.lib TAO_Strategiesd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_RTCORBAd.lib TAO_RTPortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
 
 !ENDIF 
 
diff --git a/TAO/tests/RTCORBA/RTCORBA_tests.dsw b/TAO/tests/RTCORBA/RTCORBA_tests.dsw
index f2f059be667..fd0adcfd92a 100644
--- a/TAO/tests/RTCORBA/RTCORBA_tests.dsw
+++ b/TAO/tests/RTCORBA/RTCORBA_tests.dsw
@@ -75,6 +75,30 @@ Package=<4>
 
 ###############################################################################
 
+Project: "Collocation"=.\Collocation\Collocation.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Destroy_Thread_Pool"=.\Destroy_Thread_Pool\Destroy_Thread_Pool.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "Explicit_Binding Client"=.\Explicit_Binding\client.dsp - Package Owner=<4>
 
 Package=<5>
@@ -99,6 +123,30 @@ Package=<4>
 
 ###############################################################################
 
+Project: "Linear_Priority Client"=.\Linear_Priority\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Linear_Priority Server"=.\Linear_Priority\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "MT_Client_Protocol_Priority Client"=.\MT_Client_Protocol_Priority\client.dsp - Package Owner=<4>
 
 Package=<5>
@@ -123,7 +171,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Private_Connection Client"=.\Private_Connection\client.dsp - Package Owner=<4>
+Project: "Mutexes Server"=.\RTMutex\server.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -135,7 +183,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Private_Connection Server"=.\Private_Connection\server.dsp - Package Owner=<4>
+Project: "ORB_init"=.\ORB_init\ORB_init.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -147,7 +195,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Server_Declared Client"=.\Server_Declared\client.dsp - Package Owner=<4>
+Project: "Persistent_IOR Client"=.\Persistent_IOR\client.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -159,7 +207,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Server_Declared Server"=.\Server_Declared\server.dsp - Package Owner=<4>
+Project: "Persistent_IOR Server"=.\Persistent_IOR\server.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -171,7 +219,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Server_Protocol Client"=.\Server_Protocol\client.dsp - Package Owner=<4>
+Project: "Policy_Combinations Client"=.\Policy_Combinations\client.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -183,7 +231,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Server_Protocol Server"=.\Server_Protocol\server.dsp - Package Owner=<4>
+Project: "Policy_Combinations Server"=.\Policy_Combinations\server.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -195,7 +243,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Thread_Pool Client"=.\Thread_Pool\client.dsp - Package Owner=<4>
+Project: "Private_Connection Client"=.\Private_Connection\client.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -207,7 +255,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Thread_Pool Server"=.\Thread_Pool\server.dsp - Package Owner=<4>
+Project: "Private_Connection Server"=.\Private_Connection\server.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -219,7 +267,67 @@ Package=<4>
 
 ###############################################################################
 
-Project: "RTMutex Server"=.\RTMutex\server.dsp - Package Owner=<4>
+Project: "Server_Declared Client"=.\Server_Declared\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Server_Declared Server"=.\Server_Declared\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Server_Protocol Client"=.\Server_Protocol\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Server_Protocol Server"=.\Server_Protocol\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Thread_Pool Client"=.\Thread_Pool\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Thread_Pool Server"=.\Thread_Pool\server.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
diff --git a/TAO/tests/RTCORBA/RTMutex/server.dsp b/TAO/tests/RTCORBA/RTMutex/server.dsp
index 281e6d3e504..f20ab0cee2a 100644
--- a/TAO/tests/RTCORBA/RTMutex/server.dsp
+++ b/TAO/tests/RTCORBA/RTMutex/server.dsp
@@ -51,7 +51,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 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 ace.lib TAO.lib TAO_RTCORBA.lib TAO_RTPortableServer.lib  /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 ace.lib TAO.lib TAO_RTCORBA.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA"
 
 !ELSEIF  "$(CFG)" == "Mutexes Server - Win32 Debug"
 
@@ -76,7 +76,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 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 TAO_RTCORBAd.lib TAO_RTPortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 aced.lib TAOd.lib TAO_RTCORBAd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA"
 
 !ENDIF
 
diff --git a/TAO/tests/RTCORBA/Server_Declared/Makefile b/TAO/tests/RTCORBA/Server_Declared/Makefile
index 4d566309b51..4699e08d87e 100644
--- a/TAO/tests/RTCORBA/Server_Declared/Makefile
+++ b/TAO/tests/RTCORBA/Server_Declared/Makefile
@@ -42,9 +42,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 include $(TAO_ROOT)/taoconfig.mk
 
-RT_TAO_SRVR_LIBS := -lTAO_Strategies $(RT_TAO_SRVR_LIBS)
-RT_TAO_CLNT_LIBS := -lTAO_Strategies $(RT_TAO_CLNT_LIBS)
-
 #----------------------------------------------------------------------------
 #       Local targets
 #----------------------------------------------------------------------------
@@ -269,120 +266,13 @@ realclean: clean
   $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
-  $(TAO_ROOT)/tao/RTCORBA/Pool_Per_Endpoint.h \
-  $(ACE_ROOT)/ace/Task.h \
-  $(ACE_ROOT)/ace/Service_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.h \
-  $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Service_Object.i \
-  $(ACE_ROOT)/ace/Thread_Manager.h \
-  $(ACE_ROOT)/ace/Containers.h \
-  $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h \
-  $(ACE_ROOT)/ace/Array_Base.h \
-  $(ACE_ROOT)/ace/Array_Base.inl \
-  $(ACE_ROOT)/ace/Array_Base.cpp \
-  $(ACE_ROOT)/ace/Containers_T.i \
-  $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h \
-  $(ACE_ROOT)/ace/Singleton.i \
-  $(ACE_ROOT)/ace/Singleton.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i \
-  $(ACE_ROOT)/ace/Task.i \
-  $(ACE_ROOT)/ace/Task_T.h \
-  $(ACE_ROOT)/ace/Message_Queue.h \
-  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.h \
-  $(ACE_ROOT)/ace/Message_Queue_T.i \
-  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Strategies.h \
-  $(ACE_ROOT)/ace/Strategies_T.h \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Service_Config.i \
-  $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h \
-  $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
-  $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(ACE_ROOT)/ace/Synch_Options.h \
-  $(ACE_ROOT)/ace/Synch_Options.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  $(ACE_ROOT)/ace/Functor.h \
-  $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h \
-  $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Strategies_T.i \
-  $(ACE_ROOT)/ace/Strategies_T.cpp \
-  $(ACE_ROOT)/ace/Service_Repository.h \
-  $(ACE_ROOT)/ace/Service_Types.h \
-  $(ACE_ROOT)/ace/Service_Types.i \
-  $(ACE_ROOT)/ace/Service_Repository.i \
-  $(ACE_ROOT)/ace/WFMO_Reactor.h \
-  $(ACE_ROOT)/ace/Process_Mutex.h \
-  $(ACE_ROOT)/ace/Process_Mutex.inl \
-  $(ACE_ROOT)/ace/WFMO_Reactor.i \
-  $(ACE_ROOT)/ace/Strategies.i \
-  $(ACE_ROOT)/ace/Message_Queue.i \
-  $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp \
-  $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i \
-  $(ACE_ROOT)/ace/Module.cpp \
-  $(ACE_ROOT)/ace/Stream_Modules.h \
-  $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  $(TAO_ROOT)/tao/RTCORBA/Pool_Per_Endpoint.i \
   $(TAO_ROOT)/tao/RTPortableServer/RTPortableServer.h \
   $(TAO_ROOT)/tao/RTPortableServer/rtportableserver_export.h \
   $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.h \
   $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.i \
-  $(TAO_ROOT)/tao/Strategies/advanced_resource.h \
-  $(TAO_ROOT)/tao/Strategies/strategies_export.h \
-  $(TAO_ROOT)/tao/default_resource.h \
-  $(TAO_ROOT)/tao/Resource_Factory.h \
-  $(TAO_ROOT)/tao/Pluggable.h \
-  $(TAO_ROOT)/tao/Pluggable.i \
-  $(TAO_ROOT)/tao/Protocol_Factory.h \
-  $(TAO_ROOT)/tao/default_resource.i \
-  $(TAO_ROOT)/tao/ORB_Core.h \
-  $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/Policy_Set.h \
-  $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/Policy_Manager.i \
-  $(TAO_ROOT)/tao/params.h \
-  $(TAO_ROOT)/tao/params.i \
-  $(TAO_ROOT)/tao/Adapter.h \
-  $(TAO_ROOT)/tao/Adapter.i \
-  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
-  $(TAO_ROOT)/tao/Parser_Registry.h \
-  $(TAO_ROOT)/tao/Parser_Registry.i \
-  $(TAO_ROOT)/tao/Service_Callbacks.h \
-  $(TAO_ROOT)/tao/Service_Callbacks.i \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
-  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
-  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
-  $(TAO_ROOT)/tao/Object_Ref_Table.h \
-  $(TAO_ROOT)/tao/Interceptor_List.h \
-  $(TAO_ROOT)/tao/Interceptor_List.inl \
-  $(TAO_ROOT)/tao/Protocols_Hooks.h \
-  $(TAO_ROOT)/tao/ORB_Core.i \
-  $(TAO_ROOT)/tao/Strategies/advanced_resource.i
+  ../check_supported_priorities.cpp \
+  $(ACE_ROOT)/ace/Sched_Params.h \
+  $(ACE_ROOT)/ace/Sched_Params.i
 
 .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp testC.h \
   $(TAO_ROOT)/tao/corba.h \
@@ -572,12 +462,13 @@ realclean: clean
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   testC.i $(ACE_ROOT)/ace/Get_Opt.h \
   $(ACE_ROOT)/ace/Get_Opt.i \
-  $(ACE_ROOT)/ace/Sched_Params.h \
-  $(ACE_ROOT)/ace/Sched_Params.i \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
   $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
-  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
+  ../check_supported_priorities.cpp \
+  $(ACE_ROOT)/ace/Sched_Params.h \
+  $(ACE_ROOT)/ace/Sched_Params.i
 
 .obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \
   $(TAO_ROOT)/tao/corba.h \
diff --git a/TAO/tests/RTCORBA/Server_Declared/README b/TAO/tests/RTCORBA/Server_Declared/README
index fc367260a41..43152bf757a 100644
--- a/TAO/tests/RTCORBA/Server_Declared/README
+++ b/TAO/tests/RTCORBA/Server_Declared/README
@@ -8,17 +8,7 @@ Scenario:
 The server creates a POA with RTCORBA::SERVER_DECLARED priority model
 policy.  Two objects are created using this POA, one inherits the POA
 priority and the second one overrides POA priority with its own.
-Server threadpool resources are configured appropriately.  (Once POA
-threadpools are completely supported, this means associating a
-two-lane threadpool with the POA, one lane corresponding to POA
-priority, and another to object priority.  However, currently, while
-RTCORBA POA threadpools are not in place yet, this means emulating POA
-threadpool with TAO's Reactor-per-priority scheme, i.e., ORB-level
-pool with lane for each endpoint priority.)  Finally, the server
-attempts to create a third object, using invalid/not matching the
-resources priority, i.e., priority not matching any of the pool
-lanes.  This attempt should fail, and the server expects to receive
-the appropriate exception.
+Server threadpool resources are configured appropriately.  
 
 The client obtains two object references and invokes a method on each
 several times.  On each invocation, the client passes object's server
@@ -28,103 +18,4 @@ requests.  In particular, servant checks that priority of the thread
 used for servicing the request equals to the server declared priority
 of the object, known from the operation argument.
 
-
-To run (on Unix):
--------
-$./server [-p <ior_output_file1> -o <ior_output_file2> -c <wrong_priority>] 
-           -a <poa_priority> -b <object_priority>
-           -ORBsvcconf server.conf 
-           -ORBendpoint xxxx://targethost:0/priority=<poa_priority>
-           -ORBendpoint xxxx://targethost:0/priority=<object_priority>
-           [more endpoints if desired]
-
-$./client [-p <ior1> -o <ior2>]
-
-
-Options:
---------
-         Server:
-
--p <ior_output_file1>   Default: test1.ior
-                        Filename for output of the first object's IOR
-                        (i.e., object that does not override POA
-                        priority). 
-
--o <ior_output_file2>   Default: test2.ior
-                        Filename for output of the second object's IOR
-                        (i.e., object that overrides POA priority). 
-
--a <poa_priority>       Default: -1, must be overridden
-                        SERVER_DECLARED priority of the poa.
-
--b <object_priority>    Default: -1, must be overridden
-                        SERVER_DECLARED priority of the second object.
-
--c <wrong_priority>     Default: -1 
-                        Invalid/not matching the configuration
-                        priority value, used in an attempt to activate
-                        a third object.  The test checks that such
-                        attempt fails and an appropriate exception is
-                        thrown. 
-
-The following are the required server ORB options for this test.
-These options help set up server resources to emulate a two-lane POA
-threadpool, one lane with <poa_priority>, and one lane
-with <object_priority>.  Once POA threadpools are implemented, these
-options will go away.           
--ORBSvcConf server.conf 
--ORBendpoint xxxx://targethost:0/priority=<poa_priority>
--ORBendpoint xxxx://targethost:0/priority=<object_priority>
-
-         Client:
-
--p <ior1>               Default: file://test1.ior
-                        IOR for the first object (with POA's
-                        priority). 
-
--o <ior2>               Default: file://test2.ior
-                        IOR for the second object.
-
-
-Expected output:
-----------------
-Below is the expected output from run_test.pl on a Windows
-platform. See run_test.pl for command-line options used for client and
-server.  NOTE: expected output differs on unix.
-
-In general, the output must contain "BAD_PARAM exception is caught as
-expected.", and server declared priorities must equal corresponding
-servant thread priorities.
-
-
-********** RTCORBA SERVER_DECLARED Priority Unit Test
-
-
-Activated object one as <IOR:010000000d00000049444c3a546573743a312e3000000000010
-0000000000000b2000000010102cd0a0000006c6f63616c686f7374004b052300000014010f004e5
-354790af039d4650c000100000001000000000000000100000001000000cd0400000000000000080
-0000001cdcdcd004f4154010000001400000001cdcdcd01000100000000000901010000000000024
-f41541a00000001cdcdcd010000000a0000006c6f63616c686f7374004b050300cdcd020000001a0
-0000001cdcdcd01000000020041540a00000001cdcdcd010000000300>
-
-
-Activated object two as <IOR:010000000d00000049444c3a546573743a312e3000000000010
-0000000000000b2000000010102cd0a0000006c6f63616c686f7374004e052300000014010f004e5
-354790af039d4650c000100000001000000010000000100000002000000cd0400000000000000080
-0000001cdcdcd004f4154010000001400000001cdcdcd01000100000000000901010000000000024
-f41541a00000001cdcdcd010000000a0000006c6f63616c686f7374004e050500cdcd020000001a0
-0000001cdcdcd01000000020041540a00000001cdcdcd010000000500>
-
-BAD_PARAM exception is caught as expected.
-Server_Declared priority: 3  Servant thread priority: 3
-Server_Declared priority: 5  Servant thread priority: 5
-Server_Declared priority: 3  Servant thread priority: 3
-Server_Declared priority: 5  Servant thread priority: 5
-Server_Declared priority: 3  Servant thread priority: 3
-Server_Declared priority: 5  Servant thread priority: 5
-Server_Declared priority: 3  Servant thread priority: 3
-Server_Declared priority: 5  Servant thread priority: 5
-Server_Declared priority: 3  Servant thread priority: 3
-Server_Declared priority: 5  Servant thread priority: 5
-Server ORB event loop finished
-
+See run_test.pl for instructions on how to run both this test.
diff --git a/TAO/tests/RTCORBA/Server_Declared/client.bor b/TAO/tests/RTCORBA/Server_Declared/client.bor
index 9d0c78909a0..d11cf2a2032 100644
--- a/TAO/tests/RTCORBA/Server_Declared/client.bor
+++ b/TAO/tests/RTCORBA/Server_Declared/client.bor
@@ -13,15 +13,11 @@ OBJFILES = \
 CFLAGS = \
 	$(ACE_CFLAGS) \
 	$(TAO_CFLAGS) \
-	$(TAO_STRATEGIES_CFLAGS) \
-        $(TAO_PORTABLESERVER_CFLAGS) \
         $(TAO_RTCORBA_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
 	$(TAO_LIB) \
-	$(TAO_STRATEGIES_LIB) \
-        $(TAO_PORTABLESERVER_LIB) \
         $(TAO_RTCORBA_LIB)
 
 IDLFILES = \
diff --git a/TAO/tests/RTCORBA/Server_Declared/client.cpp b/TAO/tests/RTCORBA/Server_Declared/client.cpp
index f358863b567..2cb28785ec2 100644
--- a/TAO/tests/RTCORBA/Server_Declared/client.cpp
+++ b/TAO/tests/RTCORBA/Server_Declared/client.cpp
@@ -2,8 +2,8 @@
 
 #include "testC.h"
 #include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
 #include "tao/RTCORBA/RTCORBA.h"
+#include "../check_supported_priorities.cpp"
 
 const char *ior1 = "file://test1.ior";
 const char *ior2 = "file://test2.ior";
@@ -80,23 +80,12 @@ check_policy (Test_ptr server,
 int
 main (int argc, char *argv[])
 {
+  // Make sure we can support multiple priorities that are required
+  // for this test.
+  check_supported_priorities ();
+
   ACE_TRY_NEW_ENV
     {
-      // First check that we have sufficient priority range to run the
-      // test, i.e., more than 1 priority level.
-      int max_priority =
-        ACE_Sched_Params::priority_max (ACE_SCHED_OTHER);
-      int min_priority =
-        ACE_Sched_Params::priority_min (ACE_SCHED_OTHER);
-
-      if (max_priority == min_priority)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "Not enough priority levels on this platform"
-                      "to run the test, aborting\n"));
-          return 0;
-        }
-
       // Initialize the ORB, resolve references and parse arguments.
 
       // ORB.
@@ -171,4 +160,3 @@ main (int argc, char *argv[])
 
   return 0;
 }
-
diff --git a/TAO/tests/RTCORBA/Server_Declared/client.dsp b/TAO/tests/RTCORBA/Server_Declared/client.dsp
index 5faca411cd8..2fe4b11dad3 100644
--- a/TAO/tests/RTCORBA/Server_Declared/client.dsp
+++ b/TAO/tests/RTCORBA/Server_Declared/client.dsp
@@ -51,7 +51,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 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_RTCORBA.lib TAO_RTPortableServer.lib ace.lib TAO.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 ace.lib TAO.lib TAO_RTCORBA.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA"
 
 !ELSEIF  "$(CFG)" == "Server_Declared Client - Win32 Debug"
 
@@ -76,7 +76,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 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 TAO_RTCORBAd.lib TAO_RTPortableServerd.lib TAO_Strategiesd.lib TAOd.lib aced.lib TAO_RTCORBAd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 aced.lib TAOd.lib TAO_RTCORBAd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA"
 
 !ENDIF 
 
diff --git a/TAO/tests/RTCORBA/Server_Declared/run_test.pl b/TAO/tests/RTCORBA/Server_Declared/run_test.pl
index 48c36011841..cecb0a7d8a3 100755
--- a/TAO/tests/RTCORBA/Server_Declared/run_test.pl
+++ b/TAO/tests/RTCORBA/Server_Declared/run_test.pl
@@ -15,41 +15,27 @@ unlink $iorfile1;
 unlink $iorfile2;
 $status = 0;
 
-$server_conf = PerlACE::LocalFile ("server.conf");
-
 # CORBA priorities 65, 70 and 75 are for the SCHED_OTHER class on
 # Solaris.  May need to use different values for other platforms
 # depending on their native priorities scheme, i.e., based on the
 # available range.
 
 $server_args =
-    "-p $iorfile1 -o $iorfile2 -a 65 -b 75 -c 70 -ORBSvcConf $server_conf "
-    ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=65 "
-    ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=75 "
-    ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=73 ";
+    "-p $iorfile1 -o $iorfile2 -a 65 -b 75";
 
 print STDERR "Value is " . $^O;
 
 if ($^O eq "MSWin32") {
     $server_args =
-        "-p $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 ";
+        "-p $iorfile1 -o $iorfile2 -a 1 -b 2";
 }
 elsif ($^O eq "dec_osf") {
     $server_args =
-        "-p $iorfile1 -o $iorfile2 -a 20 -b 30 -c 25 -ORBSvcConf $server_conf "
-        ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=20 "
-        ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=30 "
-        ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=28 ";
+        "-p $iorfile1 -o $iorfile2 -a 20 -b 30";
 }
 elsif ($^O eq "hpux") {
     $server_args =
-        "-p $iorfile1 -o $iorfile2 -a 17 -b 29 -c 24 -ORBSvcConf $server_conf "
-        ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=17 "
-        ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=29 "
-        ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=27 ";
+        "-p $iorfile1 -o $iorfile2 -a 17 -b 29";
 }
 
 $client_args = "-p file://$iorfile1 -o file://$iorfile2";
diff --git a/TAO/tests/RTCORBA/Server_Declared/server.bor b/TAO/tests/RTCORBA/Server_Declared/server.bor
index 6e5c8787e5a..ebe031bbdaa 100644
--- a/TAO/tests/RTCORBA/Server_Declared/server.bor
+++ b/TAO/tests/RTCORBA/Server_Declared/server.bor
@@ -14,7 +14,6 @@ OBJFILES = \
 CFLAGS = \
 	$(ACE_CFLAGS) \
 	$(TAO_CFLAGS) \
-	$(TAO_STRATEGIES_CFLAGS) \
         $(TAO_PORTABLESERVER_CFLAGS) \
         $(TAO_RTCORBA_CFLAGS) \
         $(TAO_RTPORTABLESERVER_CFLAGS)
@@ -22,7 +21,6 @@ CFLAGS = \
 LIBFILES = \
 	$(ACE_LIB) \
 	$(TAO_LIB) \
-	$(TAO_STRATEGIES_LIB) \
         $(TAO_PORTABLESERVER_LIB) \
         $(TAO_RTCORBA_LIB) \
         $(TAO_RTPORTABLESERVER_LIB)
diff --git a/TAO/tests/RTCORBA/Server_Declared/server.cpp b/TAO/tests/RTCORBA/Server_Declared/server.cpp
index b1b49851acc..b214fe6b6ee 100644
--- a/TAO/tests/RTCORBA/Server_Declared/server.cpp
+++ b/TAO/tests/RTCORBA/Server_Declared/server.cpp
@@ -3,10 +3,8 @@
 #include "testS.h"
 #include "ace/Get_Opt.h"
 #include "tao/RTCORBA/RTCORBA.h"
-#include "tao/RTCORBA/Pool_Per_Endpoint.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
-
-#include "tao/Strategies/advanced_resource.h"
+#include "../check_supported_priorities.cpp"
 
 class Test_i : public POA_Test
 {
@@ -82,13 +80,12 @@ const char *ior_output_file1 = "test1.ior";
 const char *ior_output_file2 = "test2.ior";
 CORBA::Short poa_priority = -1;
 CORBA::Short object_priority = -1;
-CORBA::Short wrong_priority = -1;
 
 // Parse command-line arguments.
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "p:o:a:b:c:");
+  ACE_Get_Opt get_opts (argc, argv, "p:o:a:b:");
   int c, result;
 
   while ((c = get_opts ()) != -1)
@@ -122,16 +119,6 @@ parse_args (int argc, char *argv[])
                             -1);
         break;
 
-      case 'c':
-        result = ::sscanf (get_opts.optarg,
-                           "%hd",
-                           &wrong_priority);
-        if (result == 0 || result == EOF)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to process <-c> option"),
-                            -1);
-        break;
-
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -140,7 +127,6 @@ parse_args (int argc, char *argv[])
                            "-o <iorfile2> "
                            "-a <poa_priority> "
                            "-b <object_priority> "
-                           "-c <wrong_priority> "
                            "\n",
                            argv [0]),
                           -1);
@@ -216,46 +202,13 @@ create_object (RTPortableServer::POA_ptr poa,
   return 0;
 }
 
-void
-exception_test (RTPortableServer::POA_ptr poa,
-                Test_i *server_impl,
-                CORBA::Short priority,
-                const char *msg,
-                CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_TRY
-    {
-      // Register with poa.
-      PortableServer::ObjectId_var id =
-        poa->activate_object_with_priority (server_impl,
-                                            priority,
-                                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var server =
-        poa->id_to_reference (id.in (),
-                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, msg));
-    }
-  ACE_CATCH (CORBA::BAD_PARAM, ex)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "BAD_PARAM exception is caught as expected.\n"));
-    }
-  ACE_CATCHANY
-    {
-      ACE_DEBUG ((LM_DEBUG, msg));
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
 int
 main (int argc, char *argv[])
 {
+  // Make sure we can support multiple priorities that are required
+  // for this test.
+  check_supported_priorities ();
+
   ACE_TRY_NEW_ENV
     {
       // ORB.
@@ -342,24 +295,12 @@ main (int argc, char *argv[])
       if (result == -1)
         return 1;
 
-          // Attempt to create object 3, overriding POA's priority with
-      // the priority value that does not match server resource
-      // configuration.  Should get BAD_PARAM exception.
-      exception_test (rt_poa.in (), &server_impl, wrong_priority,
-                      "ERROR: BAD_PARAM exception not thrown.\n",
-                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
       // Activate POA manager.
       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"));
@@ -374,4 +315,3 @@ main (int argc, char *argv[])
 
   return 0;
 }
-
diff --git a/TAO/tests/RTCORBA/Server_Declared/server.dsp b/TAO/tests/RTCORBA/Server_Declared/server.dsp
index fc2f78b5ea0..80246937b0b 100644
--- a/TAO/tests/RTCORBA/Server_Declared/server.dsp
+++ b/TAO/tests/RTCORBA/Server_Declared/server.dsp
@@ -51,7 +51,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 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_RTCORBA.lib TAO_RTPortableServer.lib ace.lib TAO.lib TAO_PortableServer.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_RTCORBA.lib TAO_RTPortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
 
 !ELSEIF  "$(CFG)" == "Server_Declared Server - Win32 Debug"
 
@@ -76,7 +76,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 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 TAO_RTCORBAd.lib TAO_RTPortableServerd.lib TAO_Strategiesd.lib TAO_PortableServerd.lib TAO_RTPortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTPortableServer" /libpath:"..\..\..\tao\RTCORBA"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_RTCORBAd.lib TAO_RTPortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
 
 !ENDIF 
 
diff --git a/TAO/tests/RTCORBA/Server_Protocol/Makefile b/TAO/tests/RTCORBA/Server_Protocol/Makefile
index 3665b2d5d0b..fc9f85eb64e 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/Makefile
+++ b/TAO/tests/RTCORBA/Server_Protocol/Makefile
@@ -42,8 +42,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 include $(TAO_ROOT)/taoconfig.mk
 
-RT_TAO_SRVR_LIBS := -lTAO_Strategies  $(RT_TAO_SRVR_LIBS)
-RT_TAO_CLNT_LIBS := -lTAO_Strategies  $(RT_TAO_CLNT_LIBS)
+RT_TAO_SRVR_LIBS := -lTAO_Strategies $(RT_TAO_SRVR_LIBS)
+RT_TAO_CLNT_LIBS := -lTAO_Strategies $(RT_TAO_CLNT_LIBS)
 
 #----------------------------------------------------------------------------
 #       Local targets
@@ -265,19 +265,12 @@ realclean: clean
   testS_T.h testS_T.i testS_T.cpp testS.i \
   $(ACE_ROOT)/ace/Get_Opt.h \
   $(ACE_ROOT)/ace/Get_Opt.i \
-  $(TAO_ROOT)/tao/RTCORBA/RT_Policy_i.h \
-  $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
-  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
-  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
-  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
-  $(TAO_ROOT)/tao/RTCORBA/RT_Policy_i.i \
-  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServer.h \
-  $(TAO_ROOT)/tao/RTPortableServer/rtportableserver_export.h \
-  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.h \
-  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.i \
-  $(TAO_ROOT)/tao/Strategies/advanced_resource.h \
-  $(TAO_ROOT)/tao/Strategies/strategies_export.h \
-  $(TAO_ROOT)/tao/default_resource.h \
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
   $(TAO_ROOT)/tao/Resource_Factory.h \
   $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
@@ -286,6 +279,14 @@ realclean: clean
   $(TAO_ROOT)/tao/Pluggable.h \
   $(TAO_ROOT)/tao/Pluggable.i \
   $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
   $(ACE_ROOT)/ace/Service_Config.h \
   $(ACE_ROOT)/ace/Service_Config.i \
   $(ACE_ROOT)/ace/Reactor.h \
@@ -301,21 +302,6 @@ realclean: clean
   $(ACE_ROOT)/ace/Reactor.i \
   $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
-  $(TAO_ROOT)/tao/default_resource.i \
-  $(TAO_ROOT)/tao/ORB_Core.h \
-  $(TAO_ROOT)/tao/Policy_Manager.h \
-  $(TAO_ROOT)/tao/Policy_Set.h \
-  $(TAO_ROOT)/tao/Policy_Set.i \
-  $(TAO_ROOT)/tao/debug.h \
-  $(TAO_ROOT)/tao/Policy_Manager.i \
-  $(TAO_ROOT)/tao/params.h \
-  $(TAO_ROOT)/tao/params.i \
-  $(TAO_ROOT)/tao/Adapter.h \
-  $(TAO_ROOT)/tao/Adapter.i \
-  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
-  $(ACE_ROOT)/ace/Map_Manager.h \
-  $(ACE_ROOT)/ace/Map_Manager.i \
-  $(ACE_ROOT)/ace/Map_Manager.cpp \
   $(TAO_ROOT)/tao/Parser_Registry.h \
   $(TAO_ROOT)/tao/Parser_Registry.i \
   $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -351,6 +337,20 @@ realclean: clean
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
   $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/RTCORBA/RT_Policy_i.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
+  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
+  $(TAO_ROOT)/tao/RTCORBA/RT_Policy_i.i \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServer.h \
+  $(TAO_ROOT)/tao/RTPortableServer/rtportableserver_export.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.h \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.i \
+  $(TAO_ROOT)/tao/Strategies/advanced_resource.h \
+  $(TAO_ROOT)/tao/Strategies/strategies_export.h \
+  $(TAO_ROOT)/tao/default_resource.h \
+  $(TAO_ROOT)/tao/default_resource.i \
   $(TAO_ROOT)/tao/Strategies/advanced_resource.i
 
 .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp testC.h \
@@ -541,6 +541,10 @@ realclean: clean
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   testC.i $(ACE_ROOT)/ace/Get_Opt.h \
   $(ACE_ROOT)/ace/Get_Opt.i \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
+  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
   $(TAO_ROOT)/tao/Strategies/advanced_resource.h \
   $(TAO_ROOT)/tao/Strategies/strategies_export.h \
   $(TAO_ROOT)/tao/default_resource.h \
@@ -617,11 +621,7 @@ realclean: clean
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Thread_Manager.i \
   $(TAO_ROOT)/tao/ORB_Core.i \
-  $(TAO_ROOT)/tao/Strategies/advanced_resource.i \
-  $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
-  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
-  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
-  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i
+  $(TAO_ROOT)/tao/Strategies/advanced_resource.i
 
 .obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \
   $(TAO_ROOT)/tao/corba.h \
diff --git a/TAO/tests/RTCORBA/Server_Protocol/client.bor b/TAO/tests/RTCORBA/Server_Protocol/client.bor
index 9d0c78909a0..9cdc7960016 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/client.bor
+++ b/TAO/tests/RTCORBA/Server_Protocol/client.bor
@@ -14,14 +14,12 @@ CFLAGS = \
 	$(ACE_CFLAGS) \
 	$(TAO_CFLAGS) \
 	$(TAO_STRATEGIES_CFLAGS) \
-        $(TAO_PORTABLESERVER_CFLAGS) \
         $(TAO_RTCORBA_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
 	$(TAO_LIB) \
 	$(TAO_STRATEGIES_LIB) \
-        $(TAO_PORTABLESERVER_LIB) \
         $(TAO_RTCORBA_LIB)
 
 IDLFILES = \
diff --git a/TAO/tests/RTCORBA/Server_Protocol/client.cpp b/TAO/tests/RTCORBA/Server_Protocol/client.cpp
index 6b142023635..78bc5b69407 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/client.cpp
+++ b/TAO/tests/RTCORBA/Server_Protocol/client.cpp
@@ -2,9 +2,8 @@
 
 #include "testC.h"
 #include "ace/Get_Opt.h"
-
-#include "tao/Strategies/advanced_resource.h"
 #include "tao/RTCORBA/RTCORBA.h"
+#include "tao/Strategies/advanced_resource.h"
 
 const char *ior = "file://test.ior";
 
@@ -76,4 +75,3 @@ main (int argc, char *argv[])
 
   return 0;
 }
-
diff --git a/TAO/tests/RTCORBA/Server_Protocol/client.dsp b/TAO/tests/RTCORBA/Server_Protocol/client.dsp
index 2b7864e9579..e36bcac925b 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/client.dsp
+++ b/TAO/tests/RTCORBA/Server_Protocol/client.dsp
@@ -51,7 +51,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 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_RTCORBA.lib TAO_RTPortableServer.lib ace.lib TAO.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 ace.lib TAO.lib TAO_RTCORBA.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\Strategies"
 
 !ELSEIF  "$(CFG)" == "Server_Protocol Client - Win32 Debug"
 
@@ -76,7 +76,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 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 TAO_RTCORBAd.lib TAO_RTPortableServerd.lib TAO_Strategiesd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 aced.lib TAOd.lib TAO_RTCORBAd.lib TAO_Strategiesd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\Strategies"
 
 !ENDIF 
 
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.cpp b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
index b65b50dc3e4..cd3802e1386 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
@@ -2,9 +2,9 @@
 
 #include "testS.h"
 #include "ace/Get_Opt.h"
+#include "tao/ORB_Core.h"
 #include "tao/RTCORBA/RT_Policy_i.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
-
 #include "tao/Strategies/advanced_resource.h"
 
 class Test_i : public POA_Test
@@ -90,9 +90,8 @@ check_default_server_protocol (CORBA::ORB_ptr orb,
   // Users should never write code like below.
   // It is for testing purposes only! (Unfortunately, there
   // is no standard way to access ORB default policies).
-  CORBA_ORB *tao_orb = ACE_dynamic_cast (CORBA_ORB *, orb);
   CORBA::Policy_var server_protocol =
-    tao_orb->orb_core ()->get_default_policies ()->get_policy (RTCORBA::SERVER_PROTOCOL_POLICY_TYPE);
+    orb->orb_core ()->get_default_policies ()->get_policy (RTCORBA::SERVER_PROTOCOL_POLICY_TYPE);
 
   RTCORBA::ServerProtocolPolicy_var policy =
     RTCORBA::ServerProtocolPolicy::_narrow (server_protocol.in (),
@@ -167,9 +166,7 @@ check_default_server_protocol (CORBA::ORB_ptr orb,
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
+  ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.dsp b/TAO/tests/RTCORBA/Server_Protocol/server.dsp
index 6f9d932a8e8..c43ce3b9174 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server.dsp
+++ b/TAO/tests/RTCORBA/Server_Protocol/server.dsp
@@ -51,7 +51,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 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_RTCORBA.lib TAO_RTPortableServer.lib ace.lib TAO.lib TAO_PortableServer.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_RTCORBA.lib TAO_RTPortableServer.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer" /libpath:"..\..\..\tao\Strategies"
 
 !ELSEIF  "$(CFG)" == "Server_Protocol Server - Win32 Debug"
 
@@ -76,7 +76,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 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 TAO_RTCORBAd.lib TAO_RTPortableServerd.lib TAO_Strategiesd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\Strategies" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_RTCORBAd.lib TAO_RTPortableServerd.lib TAO_Strategiesd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer" /libpath:"..\..\..\tao\Strategies"
 
 !ENDIF 
 
diff --git a/TAO/tests/RTCORBA/Thread_Pool/Makefile b/TAO/tests/RTCORBA/Thread_Pool/Makefile
index ab292185a7e..2de704d1055 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/Makefile
+++ b/TAO/tests/RTCORBA/Thread_Pool/Makefile
@@ -96,9 +96,8 @@ realclean: clean
   $(ACE_ROOT)/ace/Sock_Connect.h \
   $(ACE_ROOT)/ace/Sock_Connect.i \
   $(ACE_ROOT)/ace/ACE.i \
-  $(ACE_ROOT)/ace/Get_Opt.i \
-  $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
-  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
+  $(ACE_ROOT)/ace/Get_Opt.i testC.h \
+  $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/corbafwd.h \
   $(ACE_ROOT)/ace/CDR_Base.h \
   $(ACE_ROOT)/ace/Message_Block.h \
@@ -159,8 +158,12 @@ realclean: clean
   $(TAO_ROOT)/tao/varbase.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
-  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SString.i \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.h \
   $(TAO_ROOT)/tao/CDR.h \
   $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -172,44 +175,7 @@ realclean: clean
   $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object.i \
-  $(TAO_ROOT)/tao/Typecode.h \
-  $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/SString.h \
-  $(ACE_ROOT)/ace/SString.i \
-  $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Typecode.i \
   $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/Sequence.h \
-  $(TAO_ROOT)/tao/Managed_Types.h \
-  $(TAO_ROOT)/tao/Managed_Types.i \
-  $(TAO_ROOT)/tao/Sequence.i \
-  $(TAO_ROOT)/tao/Sequence_T.h \
-  $(TAO_ROOT)/tao/Sequence_T.i \
-  $(TAO_ROOT)/tao/Sequence_T.cpp \
-  $(TAO_ROOT)/tao/IOPC.i \
-  $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
-  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
-  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
-  $(TAO_ROOT)/tao/TimeBaseC.i \
-  $(TAO_ROOT)/tao/PolicyC.h \
-  $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/CurrentC.h \
-  $(TAO_ROOT)/tao/CurrentC.i \
-  $(TAO_ROOT)/tao/PolicyC.i \
-  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
-  testC.h $(TAO_ROOT)/tao/corba.h \
   $(TAO_ROOT)/tao/NVList.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.h \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
@@ -219,6 +185,13 @@ realclean: clean
   $(TAO_ROOT)/tao/LocalObject.i \
   $(TAO_ROOT)/tao/Principal.h \
   $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
   $(TAO_ROOT)/tao/OctetSeqC.i \
   $(TAO_ROOT)/tao/Principal.i \
   $(TAO_ROOT)/tao/ORB.h \
@@ -226,6 +199,12 @@ realclean: clean
   $(TAO_ROOT)/tao/Services.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/Encodable.h \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
   $(TAO_ROOT)/tao/ORB.i \
   $(TAO_ROOT)/tao/BoundsC.h \
   $(TAO_ROOT)/tao/BoundsC.i \
@@ -246,11 +225,35 @@ realclean: clean
   $(TAO_ROOT)/tao/DynamicC.h \
   $(TAO_ROOT)/tao/DynamicC.i \
   $(TAO_ROOT)/tao/MessagingC.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
+  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.h \
+  $(TAO_ROOT)/tao/TAO_Singleton.inl \
+  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PollableC.h \
   $(TAO_ROOT)/tao/PollableC.i \
   $(TAO_ROOT)/tao/MessagingC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
-  testC.i
+  testC.i \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
+  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
+  ../check_supported_priorities.cpp \
+  $(ACE_ROOT)/ace/Sched_Params.h \
+  $(ACE_ROOT)/ace/Sched_Params.i
 
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp test_i.h testS.h testC.h \
   $(TAO_ROOT)/tao/corba.h \
@@ -453,14 +456,17 @@ realclean: clean
   testS_T.h testS_T.i testS_T.cpp testS.i \
   $(ACE_ROOT)/ace/Get_Opt.h \
   $(ACE_ROOT)/ace/Get_Opt.i \
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServer.h \
+  $(TAO_ROOT)/tao/RTPortableServer/rtportableserver_export.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
   $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
-  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServer.h \
-  $(TAO_ROOT)/tao/RTPortableServer/rtportableserver_export.h \
   $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.h \
-  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.i
+  $(TAO_ROOT)/tao/RTPortableServer/RTPortableServerC.i \
+  ../check_supported_priorities.cpp \
+  $(ACE_ROOT)/ace/Sched_Params.h \
+  $(ACE_ROOT)/ace/Sched_Params.i
 
 .obj/test_i.o .obj/test_i.so .shobj/test_i.o .shobj/test_i.so: test_i.cpp test_i.h testS.h testC.h \
   $(TAO_ROOT)/tao/corba.h \
@@ -661,7 +667,117 @@ realclean: clean
   $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
   testS_T.h testS_T.i testS_T.cpp testS.i \
-  $(TAO_ROOT)/tao/debug.h
+  $(TAO_ROOT)/tao/ORB_Core.h \
+  $(TAO_ROOT)/tao/Policy_Manager.h \
+  $(TAO_ROOT)/tao/Policy_Set.h \
+  $(TAO_ROOT)/tao/Policy_Set.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/Policy_Manager.i \
+  $(TAO_ROOT)/tao/Resource_Factory.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.h \
+  $(ACE_ROOT)/ace/Shared_Object.i \
+  $(ACE_ROOT)/ace/Service_Object.i \
+  $(TAO_ROOT)/tao/Pluggable.h \
+  $(TAO_ROOT)/tao/Pluggable.i \
+  $(TAO_ROOT)/tao/Protocol_Factory.h \
+  $(TAO_ROOT)/tao/params.h \
+  $(TAO_ROOT)/tao/params.i \
+  $(TAO_ROOT)/tao/Adapter.h \
+  $(TAO_ROOT)/tao/Adapter.i \
+  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+  $(ACE_ROOT)/ace/Map_Manager.h \
+  $(ACE_ROOT)/ace/Map_Manager.i \
+  $(ACE_ROOT)/ace/Map_Manager.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Parser_Registry.h \
+  $(TAO_ROOT)/tao/Parser_Registry.i \
+  $(TAO_ROOT)/tao/Service_Callbacks.h \
+  $(TAO_ROOT)/tao/Service_Callbacks.i \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Array_Base.inl \
+  $(ACE_ROOT)/ace/Array_Base.cpp \
+  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+  $(TAO_ROOT)/tao/Object_Ref_Table.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(TAO_ROOT)/tao/Interceptor_List.h \
+  $(TAO_ROOT)/tao/Interceptor_List.inl \
+  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+  $(ACE_ROOT)/ace/Thread_Manager.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Containers_T.i \
+  $(ACE_ROOT)/ace/Containers_T.cpp \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(TAO_ROOT)/tao/ORB_Core.i \
+  $(TAO_ROOT)/tao/RTCORBA/Thread_Pool.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
+  $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
+  $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.h \
+  $(TAO_ROOT)/tao/Thread_Lane_Resources.i \
+  $(TAO_ROOT)/tao/New_Leader_Generator.h \
+  $(ACE_ROOT)/ace/Task.h \
+  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task_T.h \
+  $(ACE_ROOT)/ace/Message_Queue.h \
+  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.h \
+  $(ACE_ROOT)/ace/Message_Queue_T.i \
+  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Strategies.h \
+  $(ACE_ROOT)/ace/Strategies_T.h \
+  $(ACE_ROOT)/ace/Synch_Options.h \
+  $(ACE_ROOT)/ace/Synch_Options.i \
+  $(ACE_ROOT)/ace/Strategies_T.i \
+  $(ACE_ROOT)/ace/Strategies_T.cpp \
+  $(ACE_ROOT)/ace/Service_Repository.h \
+  $(ACE_ROOT)/ace/Service_Types.h \
+  $(ACE_ROOT)/ace/Service_Types.i \
+  $(ACE_ROOT)/ace/Service_Repository.i \
+  $(ACE_ROOT)/ace/WFMO_Reactor.h \
+  $(ACE_ROOT)/ace/Process_Mutex.h \
+  $(ACE_ROOT)/ace/Process_Mutex.inl \
+  $(ACE_ROOT)/ace/WFMO_Reactor.i \
+  $(ACE_ROOT)/ace/Strategies.i \
+  $(ACE_ROOT)/ace/Message_Queue.i \
+  $(ACE_ROOT)/ace/Task_T.i \
+  $(ACE_ROOT)/ace/Task_T.cpp \
+  $(ACE_ROOT)/ace/Module.h \
+  $(ACE_ROOT)/ace/Module.i \
+  $(ACE_ROOT)/ace/Module.cpp \
+  $(ACE_ROOT)/ace/Stream_Modules.h \
+  $(ACE_ROOT)/ace/Stream_Modules.cpp \
+  $(TAO_ROOT)/tao/RTCORBA/Thread_Pool.i
 
 .obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \
   $(TAO_ROOT)/tao/corba.h \
diff --git a/TAO/tests/RTCORBA/Thread_Pool/README b/TAO/tests/RTCORBA/Thread_Pool/README
index 95161aaa6b1..95b07c46c2c 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/README
+++ b/TAO/tests/RTCORBA/Thread_Pool/README
@@ -2,17 +2,9 @@ $Id$
 
 Description:
 This is a simple test for a RT thread-pool server.  It creates a
-server process with a variable number of threads, multiple clients can
-send requests to it, the requests are handled in different threads.
+server process with multiple thread pools, POAs, and servants.  The
+test also spawns multiple clients for each servant.  The servants with
+multiple threads in their thread-pool respond faster than the servants
+with a single thread thread-pool.
 
-Expected output:
-The server prints out the IOR of the object it serves and the thread
-that handles each request.
-
-How to run:
-You can use the run_test.pl script to run it or:
-
-$ server 
-$ client 
-$ client 
-$ client -x 
+See run_test.pl to see how to run this test.
+\ No newline at end of file
diff --git a/TAO/tests/RTCORBA/Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Thread_Pool/client.cpp
index fc0f2a36a7e..9921524a61a 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/client.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/client.cpp
@@ -1,12 +1,13 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
-#include "tao/RTCORBA/RTCORBA.h"
 #include "testC.h"
+#include "tao/RTCORBA/RTCORBA.h"
+#include "../check_supported_priorities.cpp"
 
-ACE_RCSID(Thread_Pools, client, "$Id$")
+ACE_RCSID(Thread_Pool, client, "$Id$")
 
-const char *ior = "file://ior";
+const char *ior = "file://ior_1";
 int iterations = 6;
 int shutdown_server = 0;
 
@@ -50,6 +51,10 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
+  // Make sure we can support multiple priorities that are required
+  // for this test.
+  check_supported_priorities ();
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
diff --git a/TAO/tests/RTCORBA/Thread_Pool/client.dsp b/TAO/tests/RTCORBA/Thread_Pool/client.dsp
index 5a5b389ed5a..faad9b1e086 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/client.dsp
+++ b/TAO/tests/RTCORBA/Thread_Pool/client.dsp
@@ -51,7 +51,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 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 ace.lib tao.lib TAO_RTCORBA.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA"
+# ADD LINK32 ace.lib TAO.lib TAO_RTCORBA.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA"
 
 !ELSEIF  "$(CFG)" == "Thread_Pool Client - Win32 Debug"
 
@@ -76,7 +76,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 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_RTCORBAd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\RTCORBA"
+# ADD LINK32 aced.lib TAOd.lib TAO_RTCORBAd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\RTCORBA"
 
 !ENDIF 
 
diff --git a/TAO/tests/RTCORBA/Thread_Pool/run_test.pl b/TAO/tests/RTCORBA/Thread_Pool/run_test.pl
index fabf9e0b21c..18821726b98 100755
--- a/TAO/tests/RTCORBA/Thread_Pool/run_test.pl
+++ b/TAO/tests/RTCORBA/Thread_Pool/run_test.pl
@@ -8,55 +8,96 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib '../../../../bin';
 use PerlACE::Run_Test;
 
+$number_of_clients = 4;
 $status = 0;
-$iorfile = PerlACE::LocalFile ("ior");
 
-unlink $iorfile;
+@configurations = 
+    (
+     {
+         file => "ior_1", 
+         description => "Invoking methods on servant in default thread pool",
+     },
+     {
+         file => "ior_2", 
+         description => "Invoking methods on servant in first RT thread pool (without lanes)",
+     },
+     {
+         file => "ior_3", 
+         description => "Invoking methods on servant in second RT thread pool (with lanes)",
+     },
+     );
+
+for $test (@configurations)
+{
+    unlink $test->{file};
+}
+
+sub run_clients
+{
+    my @parms = @_;
+    $arg = $parms[0];
+    $clients = $parms[1];
+
+    for ($i = 0; $i < $clients; $i++)
+    {
+        $CL[$i] = new PerlACE::Process ("client", $arg);
+        $CL[$i]->Spawn ();
+    }
+
+    for ($i = 0; $i < $clients; $i++)
+    {    
+        $client = $CL[$i]->WaitKill (120);
+        if ($client != 0) 
+        {
+            print STDERR "ERROR: client returned $client\n";
+            $status = 1;
+            goto kill_server;
+        }
+    }
+}
 
 $SV = new PerlACE::Process ("server");
-$CL1 = new PerlACE::Process ("client");
-$CL2 = new PerlACE::Process ("client");
-$CL3 = new PerlACE::Process ("client", "-x ");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
+for $test (@configurations)
+{
+    if (PerlACE::waitforfile_timed ($test->{file}, 5) == -1)
+    {
+        print STDERR "ERROR: cannot find ior file: $test->{file}\n";
+        $status = 1;
+        goto kill_server;
+    }
 }
 
-$CL1->Spawn ();
-$CL2->Spawn ();
-$CL3->Spawn ();
-
-$client = $CL1->WaitKill (120);
+for $test (@configurations)
+{
+    print STDERR "\n*************************************************************\n";
+    print STDERR "$test->{description}\n";
+    print STDERR "*************************************************************\n\n";
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+    run_clients ("-k file://$test->{file}", $number_of_clients);
 }
-$client = $CL2->WaitKill (30);
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
+print STDERR "\n************************\n";
+print STDERR "Shutting down the server\n";
+print STDERR "************************\n\n";
 
-$client = $CL3->WaitKill (30);
+run_clients ("-k file://$configurations[0]->{file} -i 0 -x", 1);
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
+kill_server:
 
 $server = $SV->WaitKill (5);
 
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+    $status = 1
+}
+
+for $test (@configurations)
+{
+    unlink $test->{file};
 }
 
-unlink $iorfile;
+exit $status
 
-exit $status;
diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
index 89fe265df5d..0d50b2c58b7 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/server.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
@@ -2,12 +2,13 @@
 
 #include "test_i.h"
 #include "ace/Get_Opt.h"
-#include "tao/RTCORBA/RTCORBA.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
+#include "../check_supported_priorities.cpp"
 
-ACE_RCSID(Thread_Pools, server, "$Id$")
+ACE_RCSID(Thread_Pool, server, "$Id$")
 
 const char *ior_output_file = "ior";
+int ior_count = 1;
 CORBA::ULong static_threads = 2;
 CORBA::ULong dynamic_threads = 2;
 long nap_time = 1000;
@@ -55,8 +56,115 @@ parse_args (int argc, char *argv[])
 }
 
 int
+write_ior_to_file (CORBA::ORB_ptr orb,
+                   test_ptr test,
+                   CORBA_Environment &ACE_TRY_ENV)
+{
+  CORBA::String_var ior =
+    orb->object_to_string (test,
+                           ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  char filename[BUFSIZ];
+  ACE_OS::sprintf (filename,
+                   "%s_%d",
+                   ior_output_file,
+                   ior_count++);
+
+  FILE *output_file =
+    ACE_OS::fopen (filename,
+                   "w");
+
+  if (output_file == 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Cannot open output file for writing IOR: %s",
+                       filename),
+                      -1);
+
+  ACE_OS::fprintf (output_file,
+                   "%s",
+                   ior.in ());
+
+  ACE_OS::fclose (output_file);
+
+  return 0;
+}
+
+int
+create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
+                                 const char *poa_name,
+                                 PortableServer::POAManager_ptr poa_manager,
+                                 PortableServer::POA_ptr root_poa,
+                                 CORBA::ORB_ptr orb,
+                                 RTCORBA::RTORB_ptr rt_orb,
+                                 CORBA_Environment &ACE_TRY_ENV)
+{
+  // Policies for the firstPOA to be created.
+  CORBA::PolicyList policies (3); policies.length (3);
+
+  // Implicit_activation policy.
+  policies[0] =
+    root_poa->create_implicit_activation_policy
+      (PortableServer::IMPLICIT_ACTIVATION,
+       ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  // Thread pool policy.
+  policies[1] =
+    CORBA::Policy::_duplicate (threadpool_policy);
+
+  // Priority Model policy.
+  policies[2] =
+    rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
+                                          0,
+                                          ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  // Create the POA under the RootPOA.
+  PortableServer::POA_var poa =
+    root_poa->create_POA (poa_name,
+                          poa_manager,
+                          policies,
+                          ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  // Creation of POAs is over. Destroy the Policy objects.
+  for (CORBA::ULong i = 0;
+       i < policies.length ();
+       ++i)
+    {
+      policies[i]->destroy (ACE_TRY_ENV);
+      ACE_CHECK_RETURN (-1);
+    }
+
+  test_i *servant =
+    new test_i (orb,
+                poa.in (),
+                nap_time);
+
+  PortableServer::ServantBase_var safe_servant (servant);
+  ACE_UNUSED_ARG (safe_servant);
+
+  test_var test =
+    servant->_this (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  int result =
+    write_ior_to_file (orb,
+                       test.in (),
+                       ACE_TRY_ENV);
+  ACE_CHECK_RETURN (-1);
+
+  return result;
+}
+
+int
 main (int argc, char *argv[])
 {
+  // Make sure we can support multiple priorities that are required
+  // for this test.
+  check_supported_priorities ();
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
@@ -76,91 +184,92 @@ main (int argc, char *argv[])
                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      if (CORBA::is_nil (root_poa.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "ERROR: Panic <RootPOA> is nil\n"),
-                          -1);
-
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
+      object =
+        orb->resolve_initial_references ("RTORB",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      RTCORBA::RTORB_var rt_orb =
+        RTCORBA::RTORB::_narrow (object.in (),
+                                 ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      object =
+        orb->resolve_initial_references ("RTCurrent",
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      RTCORBA::Current_var current =
+        RTCORBA::Current::_narrow (object.in (),
+                                   ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      RTCORBA::Priority default_thread_priority =
+        current->the_priority (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
       int result =
         parse_args (argc, argv);
       if (result != 0)
         return result;
 
       test_i servant (orb.in (),
+                      root_poa.in (),
                       nap_time);
       test_var test =
         servant._this (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      CORBA::String_var ior =
-        orb->object_to_string (test.in (),
-                               ACE_TRY_ENV);
+      result =
+        write_ior_to_file (orb.in (),
+                           test.in (),
+                           ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      FILE *output_file =
-        ACE_OS::fopen (ior_output_file,
-                       "w");
-
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                          -1);
-
-      ACE_OS::fprintf (output_file,
-                       "%s",
-                       ior.in ());
-
-      ACE_OS::fclose (output_file);
+      if (result != 0)
+        return result;
 
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       CORBA::ULong stacksize = 0;
-      // Do this wierd intermediate variable and
-      // casting to avoid a warning on HP-UX with aCC
-      CORBA::Long defp = ACE_DEFAULT_THREAD_PRIORITY;
-      RTCORBA::Priority default_priority = RTCORBA::Priority (
-                                                     (CORBA::Short)defp);
       CORBA::Boolean allow_request_buffering = 0;
       CORBA::ULong max_buffered_requests = 0;
       CORBA::ULong max_request_buffer_size = 0;
 
-      object =
-        orb->resolve_initial_references ("RTORB",
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in (),
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      RTCORBA::ThreadpoolId id1 =
+      RTCORBA::ThreadpoolId threadpool_id_1 =
         rt_orb->create_threadpool (stacksize,
                                    static_threads,
                                    dynamic_threads,
-                                   default_priority,
+                                   default_thread_priority,
                                    allow_request_buffering,
                                    max_buffered_requests,
                                    max_request_buffer_size,
                                    ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      ACE_UNUSED_ARG (id1);
+
+      CORBA::Policy_var threadpool_policy_1 =
+        rt_orb->create_threadpool_policy (threadpool_id_1,
+                                          ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
       CORBA::Boolean allow_borrowing = 0;
-      RTCORBA::ThreadpoolLanes lanes;
-      lanes.length (1);
+      RTCORBA::ThreadpoolLanes lanes (2);
+      lanes.length (2);
 
-      lanes[0].lane_priority = default_priority;
+      lanes[0].lane_priority = default_thread_priority;
       lanes[0].static_threads = static_threads;
       lanes[0].dynamic_threads = dynamic_threads;
 
-      RTCORBA::ThreadpoolId id2 =
+      lanes[1].lane_priority = default_thread_priority;
+      lanes[1].static_threads = static_threads * 2;
+      lanes[1].dynamic_threads = dynamic_threads * 2;
+
+      RTCORBA::ThreadpoolId threadpool_id_2 =
         rt_orb->create_threadpool_with_lanes (stacksize,
                                               lanes,
                                               allow_borrowing,
@@ -169,7 +278,35 @@ main (int argc, char *argv[])
                                               max_request_buffer_size,
                                               ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      ACE_UNUSED_ARG (id2);
+
+      CORBA::Policy_var threadpool_policy_2 =
+        rt_orb->create_threadpool_policy (threadpool_id_2,
+                                          ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      result =
+        create_POA_and_register_servant (threadpool_policy_1.in (),
+                                         "first_poa",
+                                         poa_manager.in (),
+                                         root_poa.in (),
+                                         orb.in (),
+                                         rt_orb.in (),
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      if (result != 0)
+        return result;
+
+      result =
+        create_POA_and_register_servant (threadpool_policy_2.in (),
+                                         "second_poa",
+                                         poa_manager.in (),
+                                         root_poa.in (),
+                                         orb.in (),
+                                         rt_orb.in (),
+                                         ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      if (result != 0)
+        return result;
 
       orb->run (ACE_TRY_ENV);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.dsp b/TAO/tests/RTCORBA/Thread_Pool/server.dsp
index 25d377520b3..15265d18608 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/server.dsp
+++ b/TAO/tests/RTCORBA/Thread_Pool/server.dsp
@@ -51,7 +51,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 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_RTCORBA.lib TAO_RTPortableServer.lib ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\lib" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_RTCORBA.lib TAO_RTPortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
 
 !ELSEIF  "$(CFG)" == "Thread_Pool Server - Win32 Debug"
 
@@ -76,7 +76,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 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 TAO_RTCORBAd.lib TAO_RTPortableServerd.lib aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\lib" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_RTCORBAd.lib TAO_RTPortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer"
 
 !ENDIF 
 
diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
index d058a8f6360..0597652d87d 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp
@@ -1,13 +1,16 @@
 // $Id$
 
 #include "test_i.h"
-#include "tao/debug.h"
+#include "tao/ORB_Core.h"
+#include "tao/RTCORBA/Thread_Pool.h"
 
 ACE_RCSID(Thread_Pools, test_i, "$Id$")
 
 test_i::test_i (CORBA::ORB_ptr orb,
+                PortableServer::POA_ptr poa,
                 long msec_sleep)
   : orb_ (CORBA::ORB::_duplicate (orb)),
+    poa_ (PortableServer::POA::_duplicate (poa)),
     nap_time_ ()
 {
   this->nap_time_.msec (msec_sleep);
@@ -19,16 +22,38 @@ test_i::method (CORBA::Long client_id,
                 CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  // if (TAO_debug_level > 0)
-  ACE_DEBUG ((LM_DEBUG,
-              "Request in thread %t for client %d iteration %d\n",
-              client_id,
-              iteration));
+  // Get the ORB_Core's TSS resources.
+  TAO_ORB_Core_TSS_Resources *tss =
+    this->orb_->orb_core ()->get_tss_resources ();
+
+  /// Get the lane attribute in TSS.
+  TAO_Thread_Lane *lane =
+    (TAO_Thread_Lane *) tss->lane_;
+
+  if (lane)
+    ACE_DEBUG ((LM_DEBUG,
+                "Request in thread %t (pool id = %d; lane id = %d) for client %d iteration %d\n",
+                lane->pool ().id (),
+                lane->id (),
+                client_id,
+                iteration));
+  else
+    ACE_DEBUG ((LM_DEBUG,
+                "Request in thread %t (default thread pool) for client %d iteration %d\n",
+                client_id,
+                iteration));
 
   ACE_OS::sleep (this->nap_time_);
+
   return iteration;
 }
 
+PortableServer::POA_ptr
+test_i::_default_POA (CORBA_Environment &)
+{
+  return PortableServer::POA::_duplicate (this->poa_.in ());
+}
+
 void
 test_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.h b/TAO/tests/RTCORBA/Thread_Pool/test_i.h
index 22810f419f4..c5d058eb758 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/test_i.h
+++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.h
@@ -10,11 +10,14 @@
 
 #include "testS.h"
 
-class test_i : public POA_test
+class test_i :
+  public POA_test,
+  public PortableServer::RefCountServantBase
 {
 public:
   /// Constructor.
   test_i (CORBA::ORB_ptr orb,
+          PortableServer::POA_ptr poa,
           long msec_sleep);
 
   /// Test method.
@@ -27,10 +30,16 @@ public:
   void shutdown (CORBA::Environment&)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
+  /// Our POA.
+  PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV);
+
 private:
   /// ORB.
   CORBA::ORB_var orb_;
 
+  /// Our POA.
+  PortableServer::POA_var poa_;
+
   /// Time spent in executing the upcall.
   ACE_Time_Value nap_time_;
 };
diff --git a/TAO/tests/RTCORBA/check_supported_priorities.cpp b/TAO/tests/RTCORBA/check_supported_priorities.cpp
new file mode 100644
index 00000000000..792b9a4e0c1
--- /dev/null
+++ b/TAO/tests/RTCORBA/check_supported_priorities.cpp
@@ -0,0 +1,22 @@
+// $Id$
+
+#include "ace/Sched_Params.h"
+
+void
+check_supported_priorities (void)
+{
+  // Check that we have sufficient priority range to run this
+  // test, i.e., more than 1 priority level.
+  int max_priority =
+    ACE_Sched_Params::priority_max (ACE_SCHED_OTHER);
+  int min_priority =
+    ACE_Sched_Params::priority_min (ACE_SCHED_OTHER);
+
+  if (max_priority == min_priority)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "Not enough priority levels on this platform"
+                  "to run the test, aborting\n"));
+      ACE_OS::exit (0);
+    }
+}
diff --git a/TAO/tests/TAO_Tests.dsw b/TAO/tests/TAO_Tests.dsw
index 6379f6c7424..baaf6d3d828 100644
--- a/TAO/tests/TAO_Tests.dsw
+++ b/TAO/tests/TAO_Tests.dsw
@@ -3,6 +3,270 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
+Project: "AMI Timeout Client"=.\AMI_Timeouts\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "AMI Timeout Server"=.\AMI_Timeouts\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "AMI_Buffering Admin"=.\AMI_Buffering\admin.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "AMI_Buffering Client"=.\AMI_Buffering\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "AMI_Buffering Server"=.\AMI_Buffering\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "AMI_Test_Client"=.\AMI\AMI_Test_Client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "AMI_Test_Server"=.\AMI\AMI_Test_Server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "AMI_Test_Simple_Client"=.\AMI\AMI_Test_Simple_Client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "BiDir Client"=.\BiDirectional\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "BiDir Server"=.\BiDirectional\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "BiDirectional_NestedUpcall Client"=.\BiDirectional_NestedUpcall\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "BiDirectional_NestedUpcall Server"=.\BiDirectional_NestedUpcall\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Big_Oneways Client"=.\Big_Oneways\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Big_Oneways Server"=.\Big_Oneways\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Big_Reply Client"=.\Big_Reply\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Big_Reply Server"=.\Big_Reply\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Big_Request_Muxing Client"=.\Big_Request_Muxing\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Big_Request_Muxing Server"=.\Big_Request_Muxing\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Big_Twoways Client"=.\Big_Twoways\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Big_Twoways Server"=.\Big_Twoways\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Blocking_Sync_None Client"=.\Blocking_Sync_None\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Blocking_Sync_None Server"=.\Blocking_Sync_None\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "CDR Basic Types"=.\CDR\basic_types.dsp - Package Owner=<4>
 
 Package=<5>
@@ -39,6 +303,258 @@ Package=<4>
 
 ###############################################################################
 
+Project: "Client_Leaks Child"=.\Client_Leaks\child.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Client_Leaks Client"=.\Client_Leaks\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Client_Leaks Server"=.\Client_Leaks\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Codec Client"=.\Codec\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Collocation_Test_Stubs DLL"=.\Collocation\Collocation_Test_Stubs.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Collocation"=.\Collocation\Collocation.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name Collocation Diamond DLL
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "Collocation Diamond DLL"=.\Collocation\Diamond.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name Collocation Test Stubs DLL
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "Connection Purging Client"=.\Connection_Purging\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Connection Purging Server"=.\Connection_Purging\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Crash_On_Write Client"=.\Crash_On_Write\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Crash_On_Write Server"=.\Crash_On_Write\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Crashed_Callback Client"=.\Crashed_Callback\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Crashed_Callback Server"=.\Crashed_Callback\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "DLL_ORB Test_Client_Module"=.\DLL_ORB\Test_Client_Module.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "DLL_ORB Test_Server_Module"=.\DLL_ORB\Test_Server_Module.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "DLL_ORB client"=.\DLL_ORB\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name Test_Client_Module
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "DLL_ORB server"=.\DLL_ORB\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name Test_Server_Module
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "DSI_Gateway_Client"=.\DSI_Gateway\DSI_Gateway_Client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "DSI_Gateway_Server"=.\DSI_Gateway\DSI_Gateway_Server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "DSI_Gateway_Service"=.\DSI_Gateway\DSI_Gateway_Service.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "DynAny Basics"=.\DynAny_Test\basic_test.dsp - Package Owner=<4>
 
 Package=<5>
@@ -51,7 +567,139 @@ Package=<4>
 
 ###############################################################################
 
-Project: "InterOp Naming Client"=".\InterOp-Naming\client.dsp" - Package Owner=<4>
+Project: "Explicit_Event_Loop Client"=.\Explicit_Event_Loop\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Explicit_Event_Loop Server"=.\Explicit_Event_Loop\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Faults Client"=.\Faults\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Faults Middle"=.\Faults\middle.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Faults Ping"=.\Faults\ping.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Faults Pong"=.\Faults\pong.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Faults Server"=.\Faults\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Forwarding client"=.\Forwarding\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Forwarding server"=.\Forwarding\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Hello Client"=.\Hello\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Hello Server"=.\Hello\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "IORTest"=.\IORManipulation\IORTest.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -75,6 +723,102 @@ Package=<4>
 
 ###############################################################################
 
+Project: "Leader_Followers client"=.\Leader_Followers\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Leader_Followers server"=.\Leader_Followers\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "LongUpcalls AMI_Client"=.\LongUpcalls\ami_client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "LongUpcalls AMI_Server"=.\LongUpcalls\ami_server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "LongUpcalls Blocking_Client"=.\LongUpcalls\blocking_client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "LongUpcalls Blocking_Server"=.\LongUpcalls\blocking_server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "MProfile client"=.\MProfile\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "MProfile server"=.\MProfile\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "MT_Client Client"=.\MT_Client\client.dsp - Package Owner=<4>
 
 Package=<5>
@@ -135,6 +879,54 @@ Package=<4>
 
 ###############################################################################
 
+Project: "MT Timeout Client"=.\MT_Timeout\MT_Timeout_Client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "MT Timeout Server"=.\MT_Timeout\MT_Timeout_Server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Multiple Client"=.\Multiple\Client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Multiple Server"=.\Multiple\Server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "Multiple Inheritance Client"=.\Multiple_Inheritance\client.dsp - Package Owner=<4>
 
 Package=<5>
@@ -159,7 +951,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Native Exceptions Client"=.\Native_Exceptions\client.dsp - Package Owner=<4>
+Project: "Muxing Client"=.\Muxing\client.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -171,7 +963,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Native Exceptions Server"=.\Native_Exceptions\server.dsp - Package Owner=<4>
+Project: "Muxing Server"=.\Muxing\server.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -183,7 +975,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Nested Event Loop Client"=.\Nested_Event_Loop\client.dsp - Package Owner=<4>
+Project: "Native Exceptions Client"=.\Native_Exceptions\client.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -195,7 +987,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Nested Event Loop Server"=.\Nested_Event_Loop\server.dsp - Package Owner=<4>
+Project: "Native Exceptions Server"=.\Native_Exceptions\server.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -291,6 +1083,30 @@ Package=<4>
 
 ###############################################################################
 
+Project: "Nested_Event_Loop Client"=.\Nested_Event_Loop\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Nested_Event_Loop Server"=.\Nested_Event_Loop\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "ORB_destroy"=.\ORB_destroy\ORB_destroy.dsp - Package Owner=<4>
 
 Package=<5>
@@ -315,6 +1131,30 @@ Package=<4>
 
 ###############################################################################
 
+Project: "Object_Loader Driver"=.\Object_Loader\driver.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Object_Loader Test_DLL"=.\Object_Loader\Test_DLL.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "OctetSeq"=.\OctetSeq\OctetSeq.dsp - Package Owner=<4>
 
 Package=<5>
@@ -351,7 +1191,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "POA Object_Reactivation"=.\POA\Object_Reactivation\Object_Reactivation.dsp - Package Owner=<4>
+Project: "Oneways_Invoking_Twoways Client"=.\Oneways_Invoking_Twoways\client.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -363,7 +1203,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "POA POA_Destruction"=.\POA\POA_Destruction\POA_Destruction.dsp - Package Owner=<4>
+Project: "Oneways_Invoking_Twoways Server"=.\Oneways_Invoking_Twoways\server.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -375,7 +1215,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "POA Excessive_Object_Deactivations"=.\POA\Excessive_Object_Deactivations\Excessive_Object_Deactivations.dsp - Package Owner=<4>
+Project: "POA Etherealization"=.\POA\Etherealization\Etherealization.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -387,7 +1227,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "POA Etherealization"=.\POA\Etherealization\Etherealization.dsp - Package Owner=<4>
+Project: "POA Excessive_Object_Deactivations"=.\POA\Excessive_Object_Deactivations\Excessive_Object_Deactivations.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -423,7 +1263,19 @@ Package=<4>
 
 ###############################################################################
 
-Project: "POA wait_for_completion"=.\POA\wait_for_completion\wait_for_completion.dsp - Package Owner=<4>
+Project: "POA Object_Reactivation"=.\POA\Object_Reactivation\Object_Reactivation.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "POA POA_Destruction"=.\POA\POA_Destruction\POA_Destruction.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -435,7 +1287,19 @@ Package=<4>
 
 ###############################################################################
 
-Project: "POA Single Threaded POA"=.\POA\Single_Threaded_POA\Single_Threaded_POA.dsp - Package Owner=<4>
+Project: "POA Single_Threaded_POA"=.\POA\Single_Threaded_POA\Single_Threaded_POA.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "POA wait_for_completion"=.\POA\wait_for_completion\wait_for_completion.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -471,6 +1335,114 @@ Package=<4>
 
 ###############################################################################
 
+Project: "Queued_Message_Test"=.\Queued_Message_Test\Queued_Message_Test.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Reliable_Oneways Client"=.\Reliable_Oneways\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Reliable_Oneways Server"=.\Reliable_Oneways\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Server_Leaks Client"=.\Server_Leaks\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Server_Leaks Server"=.\Server_Leaks\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Single_Read client"=.\Single_Read\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Single_Read server"=.\Single_Read\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Timed_Buffered_Oneways client"=.\Timed_Buffered_Oneways\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Timed_Buffered_Oneways server"=.\Timed_Buffered_Oneways\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "Timeout Client"=.\Timeout\client.dsp - Package Owner=<4>
 
 Package=<5>
@@ -495,7 +1467,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "idl_test"=.\IDL_Test\idl_test.dsp - Package Owner=<4>
+Project: "IDL_Test"=.\IDL_Test\idl_test.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
author	irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2001-09-18 00:06:07 +0000
committer	irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2001-09-18 00:06:07 +0000
commit	e12b5d4ffb96ffdce21884a491273fb82a65cab9 (patch)
tree	10e8af6827368c6ceb5e733627c5faf5e361b748 /TAO/tests
parent	b792311a6a68d2359ab17efcd36a899eff948baf (diff)
download	ATCD-e12b5d4ffb96ffdce21884a491273fb82a65cab9.tar.gz