Fixed a bunch of VC++ makefiles.

28 files changed, 1130 insertions, 244 deletions

diff --git a/TAO/tests/Collocation/Collocation.bor b/TAO/tests/Collocation/Collocation.bor
index 80c6bde0aac..cd286f49379 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,7 +21,7 @@ LIBFILES = \
 	$(TAO_PORTABLESERVER_LIB) \
 	$(TAO_STRATEGIES_LIB) \
 	$(BINDIR)\Diamond$(LIB_DECORATOR).lib \
-	$(BINDIR)\Coll_Test_Stubs$(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 b632cc87ebe..f0005dfe3be 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..2595b769a8b 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,7 +44,7 @@ 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 \
+.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 \
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/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/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/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>

 {{{