ChangeLogTag:Sat Sep 02 16:47:29 2000 Carlos O'Ryan <coryan@uci.edu>

author: coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2000-09-02 23:58:42 +0000
committer: coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2000-09-02 23:58:42 +0000
commit: e2e97c4315cc2546800c16555b425948df99c140 (patch)
tree: 0bd33017bca4cea7352f43948aa65226e4a51230
parent: 2790836340e669f66a480b31e13853e421c3bbae (diff)
download: ATCD-e2e97c4315cc2546800c16555b425948df99c140.tar.gz
85 files changed, 1180 insertions, 523 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 79e095f1a8d..cd2b4828b0c 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,99 @@
+Sat Sep 02 16:47:29 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tao/DomainC.cpp:
+          Fixed problems when compiling with smart proxies enabled.
+
+        * tests/Portable_Interceptors/Benchmark/client.cpp:
+        * tests/Portable_Interceptors/Benchmark/interceptors.h:
+        * tests/Portable_Interceptors/Benchmark/marker.h:
+        * tests/Portable_Interceptors/Benchmark/server.cpp:
+          These examples did not compile under NT because some identifiers
+          were already used by the MSVC libraries.
+
+        * TAOACE.dsw:
+        * tests/TAO_Tests.dsw:
+        * examples/TAO_Examples.dsw:
+        * orbsvcs/tests/tests.dsw:
+        * performance-tests/TAO_Perf_Tests.dsw:
+        * tests/Portable_Interceptors/Benchmark/Benchmark.dsw:
+          Add several missing projects to these workspaces.
+
+        * docs/tutorials/Quoter/Naming_Service/client.dsp:
+        * docs/tutorials/Quoter/Naming_Service/server.dsp:
+        * docs/tutorials/Quoter/Simple/Client/client.dsp:
+        * docs/tutorials/Quoter/Simple/Impl-Repo/server.dsp:
+        * docs/tutorials/Quoter/Simple/ImprovedServer/improvedserver.dsp:
+        * docs/tutorials/Quoter/Simple/Persistent/server.dsp:
+        * docs/tutorials/Quoter/Simple/Server/server.dsp:
+        * examples/AMI/FL_Callback/AMI_Peer.dsp:
+        * examples/AMI/FL_Callback/AMI_Progress.dsp:
+        * examples/Buffered_AMI/client.dsp:
+        * examples/Buffered_AMI/server.dsp:
+        * examples/Content_Server/AMI_Iterator/client.dsp:
+        * examples/Content_Server/AMI_Iterator/server.dsp:
+        * examples/Content_Server/AMI_Observer/client.dsp:
+        * examples/Content_Server/AMI_Observer/server.dsp:
+        * examples/Content_Server/SMI_Iterator/server.dsp:
+        * examples/Load_Balancing/client.dsp:
+        * examples/Load_Balancing/server.dsp:
+        * examples/Load_Balancing/service.dsp:
+        * examples/Load_Balancing_persistent/client.dsp:
+        * examples/Load_Balancing_persistent/server.dsp:
+        * examples/Load_Balancing_persistent/service.dsp:
+        * examples/Simulator/Event_Supplier/DualEC_Sup.dsp:
+        * examples/Simulator/Event_Supplier/Event_Sup.dsp:
+        * examples/Simulator/Event_Supplier/Logging_Sup.dsp:
+        * orbsvcs/CosEvent_Service/CosEvent_Service_Native.dsp:
+        * orbsvcs/LoadBalancer/LoadBalancer_Service.dsp:
+        * orbsvcs/Time_Service/Time_Service_Clerk.dsp:
+        * orbsvcs/Time_Service/Time_Service_Server.dsp:
+        * orbsvcs/examples/CosEC/Factory/FactoryClient.dsp:
+        * orbsvcs/examples/CosEC/Factory/FactoryServer.dsp:
+        * orbsvcs/examples/Security/Send_File/Send_File_Server.dsp:
+        * orbsvcs/orbsvcs/Security.dsp:
+        * orbsvcs/tests/AVStreams/benchmark/av_benchmark_child.dsp:
+        * orbsvcs/tests/AVStreams/benchmark/av_benchmark_client.dsp:
+        * orbsvcs/tests/AVStreams/benchmark/av_benchmark_server.dsp:
+        * orbsvcs/tests/Concurrency/CC_client.dsp:
+        * orbsvcs/tests/EC_Basic/EC_Basic.dsp:
+        * orbsvcs/tests/EC_Custom_Marshal/ECCM_Consumer.dsp:
+        * orbsvcs/tests/EC_Custom_Marshal/ECCM_Supplier.dsp:
+        * orbsvcs/tests/EC_Mcast/EC_Mcast.dsp:
+        * orbsvcs/tests/EC_Multiple/EC_Multiple.dsp:
+        * orbsvcs/tests/EC_Throughput/ECT_Consumer.dsp:
+        * orbsvcs/tests/EC_Throughput/ECT_Supplier.dsp:
+        * orbsvcs/tests/EC_Throughput/ECT_Throughput.dsp:
+        * orbsvcs/tests/Event_Latency/Event_Latency.dsp:
+        * orbsvcs/tests/Interoperable_Naming/client.dsp:
+        * orbsvcs/tests/LoadBalancing/client.dsp:
+        * orbsvcs/tests/LoadBalancing/server.dsp:
+        * orbsvcs/tests/Property/client.dsp:
+        * orbsvcs/tests/Property/server.dsp:
+        * orbsvcs/tests/Sched_Conf/Sched_Conf.dsp:
+        * orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.dsp:
+        * orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.dsp:
+        * orbsvcs/tests/Simple_Naming/client.dsp:
+        * orbsvcs/tests/Time/Time_Service_Test.dsp:
+        * orbsvcs/tests/Trading/Colocated_Test.dsp:
+        * orbsvcs/tests/Trading/Export_Test.dsp:
+        * orbsvcs/tests/Trading/Import_Test.dsp:
+        * performance-tests/Latency/st_server.dsp:
+        * performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Client.dsp:
+        * performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Server.dsp:
+        * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Client.dsp:
+        * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Server.dsp:
+        * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Client.dsp:
+        * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Server.dsp:
+        * tests/Portable_Interceptors/Benchmark/client.dsp:
+        * tests/Portable_Interceptors/Benchmark/server.dsp:
+        * tests/Smart_Proxies/client.dsp:
+        * tests/Smart_Proxies/server.dsp:
+        * tests/Smart_Proxies/Collocation/Coll_Test_Stubs.dsp:
+        * tests/Smart_Proxies/Collocation/Collocation.dsp:
+        * tests/Smart_Proxies/Collocation/Diamond.dsp:
+          More DSP files updates to compile with the new PortableServer
+          library.
+
 Sat Sep  2 12:26:40 2000  Carlos O'Ryan  <coryan@uci.edu>
 
         * tao/DynamicAny/DynAny_i.cpp:
diff --git a/TAO/TAOACE.dsw b/TAO/TAOACE.dsw
index 8313c10cdc9..6fbad32c059 100644
--- a/TAO/TAOACE.dsw
+++ b/TAO/TAOACE.dsw
@@ -126,6 +126,21 @@ Package=<4>
 
 ###############################################################################
 
+Project: "CosEvent_Service_Native"=.\orbsvcs\CosEvent_Service\CosEvent_Service_Native.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name CosEvent
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "CosLifeCycle"=.\orbsvcs\orbsvcs\CosLifeCycle.dsp - Package Owner=<4>
 
 Package=<5>
@@ -200,6 +215,12 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name TAO_IDL Compiler
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name gperf
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name PortableServer
+    End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/client.dsp b/TAO/docs/tutorials/Quoter/Naming_Service/client.dsp
index a313ea71e81..5c7ddcbbd95 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/client.dsp
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/client.dsp
@@ -95,10 +95,6 @@ SOURCE=.\client.cpp
 
 SOURCE=.\QuoterC.cpp
 # End Source File
-# Begin Source File
-
-SOURCE=.\QuoterS.cpp
-# End Source File
 # End Group
 # Begin Group "Header Files"
 
@@ -199,10 +195,6 @@ BuildCmds= \
 
 SOURCE=.\QuoterC.i
 # End Source File
-# Begin Source File
-
-SOURCE=.\QuoterS.i
-# End Source File
 # End Group
 # End Target
 # End Project
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/server.dsp b/TAO/docs/tutorials/Quoter/Naming_Service/server.dsp
index 2b209396fe1..d2946b882a8 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/server.dsp
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/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 TAO_CosNaming.lib TAO_Svc_Utils.lib tao.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\orbsvcs\orbsvcs"
+# ADD LINK32 TAO_CosNaming.lib TAO_Svc_Utils.lib TAO_PortableServer.lib tao.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\orbsvcs\orbsvcs"
 
 !ELSEIF  "$(CFG)" == "Quoter Naming Service 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 TAO_CosNamingd.lib TAO_Svc_Utilsd.lib taod.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\orbsvcs\orbsvcs"
+# ADD LINK32 TAO_CosNamingd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib taod.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\orbsvcs\orbsvcs"
 
 !ENDIF 
 
diff --git a/TAO/docs/tutorials/Quoter/Simple/Client/client.dsp b/TAO/docs/tutorials/Quoter/Simple/Client/client.dsp
index f15a36bb739..d8cc5c6b40b 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Client/client.dsp
+++ b/TAO/docs/tutorials/Quoter/Simple/Client/client.dsp
@@ -95,10 +95,6 @@ SOURCE=.\client.cpp
 
 SOURCE=.\QuoterC.cpp
 # End Source File
-# Begin Source File
-
-SOURCE=.\QuoterS.cpp
-# End Source File
 # End Group
 # Begin Group "Header Files"
 
@@ -199,10 +195,6 @@ BuildCmds= \
 
 SOURCE=.\QuoterC.i
 # End Source File
-# Begin Source File
-
-SOURCE=.\QuoterS.i
-# End Source File
 # End Group
 # End Target
 # End Project
diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.dsp b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.dsp
index d0fd2aee20b..20656b30204 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.dsp
+++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/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 tao.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\..\ace" /libpath:"..\..\..\..\..\tao"
+# ADD LINK32 TAO_PortableServer.lib tao.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\..\ace" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\tao\PortableServer"
 
 !ELSEIF  "$(CFG)" == "Quoter Simple ImplRepo - 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 TAO_PortableServerd.lib taod.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\..\ace" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\tao\PortableServer"
 
 !ENDIF 
 
diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/improvedserver.dsp b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/improvedserver.dsp
index ec2194a8ff9..61da0b34b79 100644
--- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/improvedserver.dsp
+++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/improvedserver.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_PortableServer.lib tao.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\..\ace" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\tao\PortableServer"
 
 !ELSEIF  "$(CFG)" == "Quoter Simple ImprovedServer - 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 TAO_PortableServerd.lib taod.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\..\ace" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\tao\PortableServer"
 
 !ENDIF 
 
diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/server.dsp b/TAO/docs/tutorials/Quoter/Simple/Persistent/server.dsp
index 354ed14078e..09b590c61cd 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Persistent/server.dsp
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/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 tao.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\..\ace" /libpath:"..\..\..\..\..\tao"
+# ADD LINK32 TAO_PortableServer.lib tao.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\..\ace" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\tao\PortableServer"
 
 !ELSEIF  "$(CFG)" == "Quoter Simple Persistent - 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 TAO_PortableServerd.lib taod.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\..\ace" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\tao\PortableServer"
 
 !ENDIF 
 
diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/server.dsp b/TAO/docs/tutorials/Quoter/Simple/Server/server.dsp
index aaa9bab077e..c5f4172c4b7 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Server/server.dsp
+++ b/TAO/docs/tutorials/Quoter/Simple/Server/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 tao.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\..\ace" /libpath:"..\..\..\..\..\tao"
+# ADD LINK32 TAO_PortableServer.lib tao.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\..\ace" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\tao\PortableServer"
 
 !ELSEIF  "$(CFG)" == "Quoter Simple 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 taod.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\..\ace" /libpath:"..\..\..\..\..\tao"
+# ADD LINK32 TAO_PortableServerd.lib taod.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\..\ace" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\tao\PortableServer"
 
 !ENDIF 
 
diff --git a/TAO/examples/AMI/FL_Callback/AMI_Peer.dsp b/TAO/examples/AMI/FL_Callback/AMI_Peer.dsp
index 72dbeab1b76..98dfc78fae6 100644
--- a/TAO/examples/AMI/FL_Callback/AMI_Peer.dsp
+++ b/TAO/examples/AMI/FL_Callback/AMI_Peer.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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "AMI Peer - 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 /nologo /subsystem:console /debug /machine:I386 /out:"peer.exe" /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /out:"peer.exe" /pdbtype:sept /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/examples/AMI/FL_Callback/AMI_Progress.dsp b/TAO/examples/AMI/FL_Callback/AMI_Progress.dsp
index 48ee20d3795..a8ab274d494 100644
--- a/TAO/examples/AMI/FL_Callback/AMI_Progress.dsp
+++ b/TAO/examples/AMI/FL_Callback/AMI_Progress.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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "AMI Progress - 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 /nologo /subsystem:console /debug /machine:I386 /out:"progress.exe" /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /out:"progress.exe" /pdbtype:sept /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/examples/Buffered_AMI/client.dsp b/TAO/examples/Buffered_AMI/client.dsp
index 07689dc6898..8ebc25f02a0 100644
--- a/TAO/examples/Buffered_AMI/client.dsp
+++ b/TAO/examples/Buffered_AMI/client.dsp
@@ -7,19 +7,19 @@
 CFG=Buffered_AMI 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
+!MESSAGE 
 !MESSAGE NMAKE /f "client.mak".
-!MESSAGE
+!MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE 
 !MESSAGE NMAKE /f "client.mak" CFG="Buffered_AMI Client - Win32 Debug"
-!MESSAGE
+!MESSAGE 
 !MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE 
 !MESSAGE "Buffered_AMI Client - Win32 Release" (based on "Win32 (x86) Console Application")
 !MESSAGE "Buffered_AMI Client - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE 
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
@@ -50,7 +50,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao\PortableServer" /libpath:"..\..\..\ace" /libpath:"..\..\tao"
 
 !ELSEIF  "$(CFG)" == "Buffered_AMI Client - Win32 Debug"
 
@@ -65,8 +65,8 @@ LINK32=link.exe
 # 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" /YX /FD  /c
+# 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" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -74,9 +74,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 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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"
 
-!ENDIF
+!ENDIF 
 
 # Begin Target
 
@@ -91,11 +91,11 @@ SOURCE=.\client.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\testS.cpp
+SOURCE=.\testC.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\testC.cpp
+SOURCE=.\testS.cpp
 # End Source File
 # End Group
 # Begin Group "Header Files"
@@ -119,7 +119,7 @@ SOURCE=.\test.idl
 
 !IF  "$(CFG)" == "Buffered_AMI Client - Win32 Release"
 
-USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"
+USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"	
 # Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)
 InputPath=.\test.idl
 InputName=test
@@ -157,7 +157,7 @@ BuildCmds= \
 
 !ELSEIF  "$(CFG)" == "Buffered_AMI Client - Win32 Debug"
 
-USERDEP__TEST_="..\..\..\bin\tao_idl.exe"
+USERDEP__TEST_="..\..\..\bin\tao_idl.exe"	
 # Begin Custom Build - Invoking TAO's IDL Compiler on $(InputPath)
 InputPath=.\test.idl
 InputName=test
@@ -193,7 +193,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ENDIF
+!ENDIF 
 
 # End Source File
 # End Group
diff --git a/TAO/examples/Buffered_AMI/server.dsp b/TAO/examples/Buffered_AMI/server.dsp
index 3f9455d530c..6bfb63a958d 100644
--- a/TAO/examples/Buffered_AMI/server.dsp
+++ b/TAO/examples/Buffered_AMI/server.dsp
@@ -50,7 +50,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\lib" /libpath:"..\..\..\ace" /libpath:"..\..\tao"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\lib" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\..\ace" /libpath:"..\..\tao"
 
 !ELSEIF  "$(CFG)" == "Buffered_AMI Server - Win32 Debug"
 
@@ -74,7 +74,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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\lib" /libpath:"..\..\..\ace" /libpath:"..\..\tao"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\lib" /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"
 
 !ENDIF 
 
diff --git a/TAO/examples/Content_Server/AMI_Iterator/client.dsp b/TAO/examples/Content_Server/AMI_Iterator/client.dsp
index 12c3e8c9111..0c9993d8d5a 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/client.dsp
+++ b/TAO/examples/Content_Server/AMI_Iterator/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 ace.lib TAO.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "AMI_Iterator 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 aced.lib TAOd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/examples/Content_Server/AMI_Iterator/server.dsp b/TAO/examples/Content_Server/AMI_Iterator/server.dsp
index ba57f38ad01..ef8f08d2dca 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/server.dsp
+++ b/TAO/examples/Content_Server/AMI_Iterator/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_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"
 
 !ELSEIF  "$(CFG)" == "AMI_Iterator 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_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/examples/Content_Server/AMI_Observer/client.dsp b/TAO/examples/Content_Server/AMI_Observer/client.dsp
index 5c83597b6b9..9f92cd9943d 100644
--- a/TAO/examples/Content_Server/AMI_Observer/client.dsp
+++ b/TAO/examples/Content_Server/AMI_Observer/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 ace.lib TAO.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "AMI_Observer 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 aced.lib TAOd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/examples/Content_Server/AMI_Observer/server.dsp b/TAO/examples/Content_Server/AMI_Observer/server.dsp
index 6234a051bdf..a03417bf6c3 100644
--- a/TAO/examples/Content_Server/AMI_Observer/server.dsp
+++ b/TAO/examples/Content_Server/AMI_Observer/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_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "AMI_Observer 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_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/examples/Content_Server/SMI_Iterator/server.dsp b/TAO/examples/Content_Server/SMI_Iterator/server.dsp
index 64897ceb4e5..aed4dc8937c 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/server.dsp
+++ b/TAO/examples/Content_Server/SMI_Iterator/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_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "SMI_Iterator 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_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\ACE_wrappers\ace" /libpath:"..\..\..\ACE_wrappers\TAO\tao" /libpath:"..\..\..\ACE_wrappers\TAO\orbsvcs\orbsvcs"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/examples/Load_Balancing/client.dsp b/TAO/examples/Load_Balancing/client.dsp
index 61038e89e4c..a4a7fd130fe 100644
--- a/TAO/examples/Load_Balancing/client.dsp
+++ b/TAO/examples/Load_Balancing/client.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="Load_Balancing 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=Load_Balancing 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="Load_Balancing 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 "Load_Balancing client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Load_Balancing 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)" == "Load_Balancing client - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -51,9 +51,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 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 /out:"client.exe" /libpath:"../../../ace" /libpath:"../../tao"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /out:"client.exe" /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"
 
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Load_Balancing client - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -76,14 +76,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 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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../ace" /libpath:"../../tao"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "client - Win32 Release"
-# Name "client - Win32 Debug"
+# Name "Load_Balancing client - Win32 Release"
+# Name "Load_Balancing client - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -135,7 +135,7 @@ SOURCE=.\Load_BalancerC.i
 
 SOURCE=.\Identity.idl
 
-!IF  "$(CFG)" == "client - Win32 Release"
+!IF  "$(CFG)" == "Load_Balancing client - Win32 Release"
 
 USERDEP__IDENT="..\..\..\bin\Release\tao_idl.exe"	
 # Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
@@ -173,7 +173,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Load_Balancing client - Win32 Debug"
 
 USERDEP__IDENT="..\..\..\bin\tao_idl.exe"	
 # Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
@@ -218,7 +218,7 @@ BuildCmds= \
 
 SOURCE=.\Load_Balancer.idl
 
-!IF  "$(CFG)" == "client - Win32 Release"
+!IF  "$(CFG)" == "Load_Balancing client - Win32 Release"
 
 USERDEP__LOAD_="..\..\..\bin\Release\tao_idl.exe"	
 # Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
@@ -256,7 +256,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Load_Balancing client - Win32 Debug"
 
 USERDEP__LOAD_="..\..\..\bin\tao_idl.exe"	
 # Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
diff --git a/TAO/examples/Load_Balancing/server.dsp b/TAO/examples/Load_Balancing/server.dsp
index a4d76bf2ff1..bbff4ad3e3b 100644
--- a/TAO/examples/Load_Balancing/server.dsp
+++ b/TAO/examples/Load_Balancing/server.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="Load_Balancing 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=Load_Balancing 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="Load_Balancing 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 "Load_Balancing server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Load_Balancing 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)" == "Load_Balancing server - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -51,9 +51,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 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 /out:"server.exe" /libpath:"../../../ace" /libpath:"../../tao"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"
 
-!ELSEIF  "$(CFG)" == "server - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Load_Balancing server - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -76,14 +76,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 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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../ace" /libpath:"../../tao"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "server - Win32 Release"
-# Name "server - Win32 Debug"
+# Name "Load_Balancing server - Win32 Release"
+# Name "Load_Balancing server - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -155,7 +155,7 @@ SOURCE=.\Load_BalancerC.i
 
 SOURCE=.\Identity.idl
 
-!IF  "$(CFG)" == "server - Win32 Release"
+!IF  "$(CFG)" == "Load_Balancing server - Win32 Release"
 
 USERDEP__IDENT="..\..\..\bin\Release\tao_idl.exe"	
 # Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
@@ -193,7 +193,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "server - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Load_Balancing server - Win32 Debug"
 
 USERDEP__IDENT="..\..\..\bin\tao_idl.exe"	
 # Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
@@ -238,7 +238,7 @@ BuildCmds= \
 
 SOURCE=.\Load_Balancer.idl
 
-!IF  "$(CFG)" == "server - Win32 Release"
+!IF  "$(CFG)" == "Load_Balancing server - Win32 Release"
 
 USERDEP__LOAD_="..\..\..\bin\Release\tao_idl.exe"	
 # Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
@@ -276,7 +276,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "server - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Load_Balancing server - Win32 Debug"
 
 USERDEP__LOAD_="..\..\..\bin\tao_idl.exe"	
 # Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
diff --git a/TAO/examples/Load_Balancing/service.dsp b/TAO/examples/Load_Balancing/service.dsp
index 56eefc47f69..18a5d69f596 100644
--- a/TAO/examples/Load_Balancing/service.dsp
+++ b/TAO/examples/Load_Balancing/service.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="service" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="Load_Balancing service" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=service - Win32 Debug
+CFG=Load_Balancing service - 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=service - 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 "service.mak" CFG="service - Win32 Debug"
+!MESSAGE NMAKE /f "service.mak" CFG="Load_Balancing service - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "service - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "service - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Load_Balancing service - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Load_Balancing service - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=service - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "service - Win32 Release"
+!IF  "$(CFG)" == "Load_Balancing service - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -51,9 +51,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 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 /out:"service.exe" /libpath:"../../../ace" /libpath:"../../tao"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /out:"service.exe" /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"
 
-!ELSEIF  "$(CFG)" == "service - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Load_Balancing service - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -76,14 +76,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 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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../ace" /libpath:"../../tao"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "service - Win32 Release"
-# Name "service - Win32 Debug"
+# Name "Load_Balancing service - Win32 Release"
+# Name "Load_Balancing service - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -143,7 +143,7 @@ SOURCE=.\IdentityS.i
 
 SOURCE=.\Load_Balancer.idl
 
-!IF  "$(CFG)" == "service - Win32 Release"
+!IF  "$(CFG)" == "Load_Balancing service - Win32 Release"
 
 USERDEP__LOAD_="..\..\..\bin\Release\tao_idl.exe"	
 # Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
@@ -181,7 +181,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "service - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Load_Balancing service - Win32 Debug"
 
 USERDEP__LOAD_="..\..\..\bin\tao_idl.exe"	
 # Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
diff --git a/TAO/examples/Load_Balancing_persistent/client.dsp b/TAO/examples/Load_Balancing_persistent/client.dsp
index 0a9e0d0d9a1..8b5154d68c2 100644
--- a/TAO/examples/Load_Balancing_persistent/client.dsp
+++ b/TAO/examples/Load_Balancing_persistent/client.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="Load_Balancing_persistent 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=Load_Balancing_persistent 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="Load_Balancing_persistent 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 "Load_Balancing_persistent client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Load_Balancing_persistent 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)" == "Load_Balancing_persistent client - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -50,9 +50,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 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 /out:"client.exe" /libpath:"../../../ace" /libpath:"../../tao"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /out:"client.exe" /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"
 
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Load_Balancing_persistent client - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -74,14 +74,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 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 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../ace" /libpath:"../../tao"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "client - Win32 Release"
-# Name "client - Win32 Debug"
+# Name "Load_Balancing_persistent client - Win32 Release"
+# Name "Load_Balancing_persistent client - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -133,7 +133,7 @@ SOURCE=.\Load_BalancerC.i
 
 SOURCE=.\Identity.idl
 
-!IF  "$(CFG)" == "client - Win32 Release"
+!IF  "$(CFG)" == "Load_Balancing_persistent client - Win32 Release"
 
 USERDEP__IDENT="..\..\..\bin\Release\tao_idl.exe"	
 # Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
@@ -171,7 +171,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Load_Balancing_persistent client - Win32 Debug"
 
 USERDEP__IDENT="..\..\..\bin\tao_idl.exe"	
 # Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
@@ -216,7 +216,7 @@ BuildCmds= \
 
 SOURCE=.\Load_Balancer.idl
 
-!IF  "$(CFG)" == "client - Win32 Release"
+!IF  "$(CFG)" == "Load_Balancing_persistent client - Win32 Release"
 
 USERDEP__LOAD_="..\..\..\bin\Release\tao_idl.exe"	
 # Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
@@ -254,7 +254,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Load_Balancing_persistent client - Win32 Debug"
 
 USERDEP__LOAD_="..\..\..\bin\tao_idl.exe"	
 # Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
diff --git a/TAO/examples/Load_Balancing_persistent/server.dsp b/TAO/examples/Load_Balancing_persistent/server.dsp
index 5702a51246d..7ec2e59d41a 100644
--- a/TAO/examples/Load_Balancing_persistent/server.dsp
+++ b/TAO/examples/Load_Balancing_persistent/server.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="Load_Balancing_persistent 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=Load_Balancing_persistent 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="Load_Balancing_persistent 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 "Load_Balancing_persistent server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Load_Balancing_persistent 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)" == "Load_Balancing_persistent server - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -50,9 +50,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 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 /out:"server.exe" /libpath:"../../../ace" /libpath:"../../tao"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"
 
-!ELSEIF  "$(CFG)" == "server - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Load_Balancing_persistent server - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -74,14 +74,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 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 /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"../../../ace" /libpath:"../../tao"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "server - Win32 Release"
-# Name "server - Win32 Debug"
+# Name "Load_Balancing_persistent server - Win32 Release"
+# Name "Load_Balancing_persistent server - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -153,7 +153,7 @@ SOURCE=.\Load_BalancerC.i
 
 SOURCE=.\Identity.idl
 
-!IF  "$(CFG)" == "server - Win32 Release"
+!IF  "$(CFG)" == "Load_Balancing_persistent server - Win32 Release"
 
 USERDEP__IDENT="..\..\..\bin\Release\tao_idl.exe"	
 # Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
@@ -191,7 +191,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "server - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Load_Balancing_persistent server - Win32 Debug"
 
 USERDEP__IDENT="..\..\..\bin\tao_idl.exe"	
 # Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
@@ -236,7 +236,7 @@ BuildCmds= \
 
 SOURCE=.\Load_Balancer.idl
 
-!IF  "$(CFG)" == "server - Win32 Release"
+!IF  "$(CFG)" == "Load_Balancing_persistent server - Win32 Release"
 
 USERDEP__LOAD_="..\..\..\bin\Release\tao_idl.exe"	
 # Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
@@ -274,7 +274,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "server - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Load_Balancing_persistent server - Win32 Debug"
 
 USERDEP__LOAD_="..\..\..\bin\tao_idl.exe"	
 # Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
diff --git a/TAO/examples/Load_Balancing_persistent/service.dsp b/TAO/examples/Load_Balancing_persistent/service.dsp
index f7651e176eb..ccc7dbe2c52 100644
--- a/TAO/examples/Load_Balancing_persistent/service.dsp
+++ b/TAO/examples/Load_Balancing_persistent/service.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="service" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="Load_Balancing_persistent service" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=service - Win32 Debug
+CFG=Load_Balancing_persistent service - 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=service - 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 "service.mak" CFG="service - Win32 Debug"
+!MESSAGE NMAKE /f "service.mak" CFG="Load_Balancing_persistent service - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "service - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "service - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Load_Balancing_persistent service - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Load_Balancing_persistent service - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
@@ -28,7 +28,7 @@ CFG=service - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "service - Win32 Release"
+!IF  "$(CFG)" == "Load_Balancing_persistent service - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -50,9 +50,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 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 /out:"service.exe" /libpath:"../../../ace" /libpath:"../../tao"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /out:"service.exe" /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"
 
-!ELSEIF  "$(CFG)" == "service - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Load_Balancing_persistent service - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -74,14 +74,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 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 /nologo /subsystem:console /debug /machine:I386 /out:"service.exe" /pdbtype:sept /libpath:"../../../ace" /libpath:"../../tao"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /out:"service.exe" /pdbtype:sept /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "service - Win32 Release"
-# Name "service - Win32 Debug"
+# Name "Load_Balancing_persistent service - Win32 Release"
+# Name "Load_Balancing_persistent service - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -141,7 +141,7 @@ SOURCE=.\IdentityS.i
 
 SOURCE=.\Load_Balancer.idl
 
-!IF  "$(CFG)" == "service - Win32 Release"
+!IF  "$(CFG)" == "Load_Balancing_persistent service - Win32 Release"
 
 USERDEP__LOAD_="..\..\..\bin\Release\tao_idl.exe"	
 # Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
@@ -179,7 +179,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "service - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Load_Balancing_persistent service - Win32 Debug"
 
 USERDEP__LOAD_="..\..\..\bin\tao_idl.exe"	
 # Begin Custom Build - Invoking TAO IDL Compiler on $(InputName).idl
diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.dsp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.dsp
index 302bc5542d5..badc5b2e3ce 100644
--- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.dsp
+++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.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_CosNaming.lib TAO_RTOLDEvent.lib TAO_RTEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib TAO_RTOLDEvent.lib TAO_RTEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\orbsvcs\orbsvcs"
 
 !ELSEIF  "$(CFG)" == "DualEC_Sup - 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_CosNamingd.lib TAO_RTOLDEventd.lib TAO_RTEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib TAO_RTOLDEventd.lib TAO_RTEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\orbsvcs\orbsvcs"
 
 !ENDIF 
 
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.dsp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.dsp
index d44ba004a37..47c2ce19347 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.dsp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.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_CosNaming.lib TAO_RTOLDEvent.lib TAO_RTEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib TAO_RTOLDEvent.lib TAO_RTEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\orbsvcs\orbsvcs"
 
 !ELSEIF  "$(CFG)" == "Event_Sup - 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_CosNamingd.lib TAO_RTOLDEventd.lib TAO_RTEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib TAO_RTOLDEventd.lib TAO_RTEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\orbsvcs\orbsvcs"
 
 !ENDIF 
 
diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.dsp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.dsp
index 324422e10f4..8683c8c3f87 100644
--- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.dsp
+++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.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_CosNaming.lib TAO_RTOLDEvent.lib TAO_RTEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib TAO_RTOLDEvent.lib TAO_RTEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\orbsvcs\orbsvcs"
 
 !ELSEIF  "$(CFG)" == "Logging_Sup - 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_CosNamingd.lib TAO_RTOLDEventd.lib TAO_RTEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib TAO_RTOLDEventd.lib TAO_RTEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\orbsvcs\orbsvcs"
 
 !ENDIF 
 
diff --git a/TAO/examples/TAO_Examples.dsw b/TAO/examples/TAO_Examples.dsw
index cf4a5b7996b..ca6888d15c7 100644
--- a/TAO/examples/TAO_Examples.dsw
+++ b/TAO/examples/TAO_Examples.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
-Project: "Callback Quoter Consumer"=.\Callback_Quoter\Consumer.dsp - Package Owner=<4>
+Project: "AMI Peer"=.\AMI\FL_Callback\AMI_Peer.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -15,7 +15,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Callback Quoter Notifier"=.\Callback_Quoter\Notifier.dsp - Package Owner=<4>
+Project: "AMI Progress"=.\AMI\FL_Callback\AMI_Progress.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -27,7 +27,43 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Callback Quoter Supplier"=.\Callback_Quoter\Supplier.dsp - Package Owner=<4>
+Project: "AMI_Iterator Client"=.\Content_Server\AMI_Iterator\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "AMI_Iterator Server"=.\Content_Server\AMI_Iterator\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "AMI_Observer Client"=.\Content_Server\AMI_Observer\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "AMI_Observer Server"=.\Content_Server\AMI_Observer\server.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -63,6 +99,54 @@ Package=<4>
 
 ###############################################################################
 
+Project: "Callback Quoter Consumer"=.\Callback_Quoter\Consumer.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Callback Quoter Notifier"=.\Callback_Quoter\Notifier.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Callback Quoter Supplier"=.\Callback_Quoter\Supplier.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "DualEC_Sup"=.\Simulator\Event_Supplier\DualEC_Sup.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "Event_Comm Consumer"=.\Event_Comm\Consumer.dsp - Package Owner=<4>
 
 Package=<5>
@@ -99,6 +183,102 @@ Package=<4>
 
 ###############################################################################
 
+Project: "Event_Sup"=.\Simulator\Event_Supplier\Event_Sup.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Load_Balancing client"=.\Load_Balancing\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Load_Balancing server"=.\Load_Balancing\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Load_Balancing service"=.\Load_Balancing\service.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Load_Balancing_persistent client"=.\Load_Balancing_persistent\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Load_Balancing_persistent server"=.\Load_Balancing_persistent\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Load_Balancing_persistent service"=.\Load_Balancing_persistent\service.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Logging_Sup"=.\Simulator\Event_Supplier\Logging_Sup.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "OBV Typed Events Client"=.\OBV\Typed_Events\client.dsp - Package Owner=<4>
 
 Package=<5>
@@ -369,7 +549,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Persistent Grid Client Files"=".\Persistent_Grid\Persistent_Grid_Client_Files.dsp" - Package Owner=<4>
+Project: "Persistent Grid Client"=.\Persistent_Grid\Persistent_Grid_Client_Files.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -381,7 +561,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Persistent Grid Second Client FIles"=".\Persistent_Grid\Persistent_Grid_Second_Client_Files.dsp" - Package Owner=<4>
+Project: "Persistent Grid Second Client"=.\Persistent_Grid\Persistent_Grid_Second_Client_Files.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -393,7 +573,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Persistent Grid Server FIles"=".\Persistent_Grid\Persistent_Grid_Server_Files.dsp" - Package Owner=<4>
+Project: "Persistent Grid Server"=.\Persistent_Grid\Persistent_Grid_Server_Files.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -453,6 +633,30 @@ Package=<4>
 
 ###############################################################################
 
+Project: "SMI_Iterator Client"=.\Content_Server\SMI_Iterator\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "SMI_Iterator Server"=.\Content_Server\SMI_Iterator\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "Simple Bank Client"=.\Simple\bank\client.dsp - Package Owner=<4>
 
 Package=<5>
@@ -626,3 +830,4 @@ Package=<3>
 }}}
 
 ###############################################################################
+
diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service_Native.dsp b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service_Native.dsp
index 4d15ed1432d..2685d8818b9 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service_Native.dsp
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service_Native.dsp
@@ -50,7 +50,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_CosEvent.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\orbsvcs"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosEvent.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"..\orbsvcs"
 
 !ELSEIF  "$(CFG)" == "CosEvent_Service_Native - Win32 Debug"
 
@@ -74,7 +74,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_CosEventd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\orbsvcs"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosEventd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"..\orbsvcs"
 
 !ENDIF 
 
diff --git a/TAO/orbsvcs/LoadBalancer/LoadBalancer_Service.dsp b/TAO/orbsvcs/LoadBalancer/LoadBalancer_Service.dsp
index 700672db7df..f526b695e16 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadBalancer_Service.dsp
+++ b/TAO/orbsvcs/LoadBalancer/LoadBalancer_Service.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 TAO_LoadBalancing.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 TAO.lib TAO_PortableServer.lib TAO_LoadBalancing.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "LoadBalancer_Service - 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 TAO_LoadBalancingd.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 TAOd.lib TAO_PortableServerd.lib aced.lib TAO_LoadBalancingd.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.dsp b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.dsp
index a21c7fd69cc..4cf34dce290 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.dsp
+++ b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.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_CosNaming.lib TAO_CosTime.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\orbsvcs" /libpath:"..\..\..\ace"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib TAO_CosTime.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\orbsvcs" /libpath:"..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "Time_Service_Clerk - 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_CosNamingd.lib TAO_CosTimed.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\orbsvcs" /libpath:"..\..\..\ace"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib TAO_CosTimed.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\orbsvcs" /libpath:"..\..\..\ace"
 # SUBTRACT LINK32 /pdb:none
 
 !ENDIF 
diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Server.dsp b/TAO/orbsvcs/Time_Service/Time_Service_Server.dsp
index b09e129df9d..6452515b00d 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Server.dsp
+++ b/TAO/orbsvcs/Time_Service/Time_Service_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_CosNaming.lib TAO_CosTime.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\orbsvcs" /libpath:"..\..\..\ace"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib TAO_CosTime.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\orbsvcs" /libpath:"..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "Time_Service_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_CosNamingd.lib TAO_CosTimed.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\orbsvcs" /libpath:"..\..\..\ace"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib TAO_CosTimed.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\orbsvcs" /libpath:"..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.dsp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.dsp
index 46afe5d7752..02f317f0df7 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.dsp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.dsp
@@ -182,10 +182,6 @@ SOURCE=.\CosEventChannelFactoryC.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\CosEventChannelFactoryS.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\FactoryClient.cpp
 # End Source File
 # End Group
@@ -196,10 +192,6 @@ SOURCE=.\FactoryClient.cpp
 
 SOURCE=.\CosEventChannelFactoryC.h
 # End Source File
-# Begin Source File
-
-SOURCE=.\CosEventChannelFactoryS.h
-# End Source File
 # End Group
 # Begin Group "Inline Files"
 
@@ -208,10 +200,6 @@ SOURCE=.\CosEventChannelFactoryS.h
 
 SOURCE=.\CosEventChannelFactoryC.i
 # End Source File
-# Begin Source File
-
-SOURCE=.\CosEventChannelFactoryS.i
-# End Source File
 # End Group
 # End Target
 # End Project
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryServer.dsp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryServer.dsp
index fa194907eb9..bc6acc375fb 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryServer.dsp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryServer.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 TAO_CosNaming.lib TAO_CosEvent.lib TAO_RTEvent.lib TAO_RTSched.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAO.lib ace.lib TAO_PortableServer.lib TAO_CosNaming.lib TAO_CosEvent.lib TAO_RTEvent.lib TAO_RTSched.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "FactoryServer - 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 TAO_CosEventd.lib TAO_CosNamingd.lib TAO_RTEventd.lib TAO_RTSchedd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAOd.lib aced.lib TAO_PortableServerd.lib TAO_CosEventd.lib TAO_CosNamingd.lib TAO_RTEventd.lib TAO_RTSchedd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/orbsvcs/examples/Security/Send_File/Send_File_Server.dsp b/TAO/orbsvcs/examples/Security/Send_File/Send_File_Server.dsp
index 29640cca91f..68b377cf629 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/Send_File_Server.dsp
+++ b/TAO/orbsvcs/examples/Security/Send_File/Send_File_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 /nologo /subsystem:console /machine:I386 /out:"Send_File_Server.exe" /libpath:"../../../../../ace" /libpath:"../../../../tao"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /out:"Send_File_Server.exe" /libpath:"../../../../../ace" /libpath:"../../../../tao" /libpath:"../../../../tao/PortableServer"
 
 !ELSEIF  "$(CFG)" == "Send_File_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 taod.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"Send_File_Server.exe" /pdbtype:sept /libpath:"../../../../../ace" /libpath:"../../../../tao"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Send_File_Server.exe" /pdbtype:sept /libpath:"../../../../../ace" /libpath:"../../../../tao" /libpath:"../../../../tao/PortableServer"
 
 !ENDIF 
 
diff --git a/TAO/orbsvcs/orbsvcs/Security.dsp b/TAO/orbsvcs/orbsvcs/Security.dsp
index 40ec07b3bde..305d80e3729 100644
--- a/TAO/orbsvcs/orbsvcs/Security.dsp
+++ b/TAO/orbsvcs/orbsvcs/Security.dsp
@@ -54,7 +54,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 /dll /machine:I386
-# ADD LINK32 ace.lib TAO.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_Security.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_Security.dll" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "Security - Win32 Debug"
 
@@ -81,7 +81,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 /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 TAOd.lib aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_Securityd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_Securityd.dll" /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
 # SUBTRACT LINK32 /profile
 
 !ENDIF 
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/av_benchmark_child.dsp b/TAO/orbsvcs/tests/AVStreams/benchmark/av_benchmark_child.dsp
index 0891ecfc215..faec2083e29 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/av_benchmark_child.dsp
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/av_benchmark_child.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_AV.lib TAO_CosNaming.lib TAO_CosProperty.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_AV.lib TAO_CosNaming.lib TAO_CosProperty.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "av_benchmark_child - 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 TAO_AVd.lib TAO_CosNamingd.lib TAO_CosPropertyd.lib /nologo /subsystem:console /debug /machine:I386 /out:"child.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAOd.lib TAO_PortableServerd.lib aced.lib TAO_AVd.lib TAO_CosNamingd.lib TAO_CosPropertyd.lib /nologo /subsystem:console /debug /machine:I386 /out:"child.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/av_benchmark_client.dsp b/TAO/orbsvcs/tests/AVStreams/benchmark/av_benchmark_client.dsp
index b06ae19ce19..bd9064f5d86 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/av_benchmark_client.dsp
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/av_benchmark_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 ace.lib TAO.lib TAO_AV.lib TAO_CosNaming.lib TAO_CosProperty.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_AV.lib TAO_CosNaming.lib TAO_CosProperty.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "av_benchmark_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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib TAOd.lib aced.lib TAO_AVd.lib TAO_CosNamingd.lib TAO_CosPropertyd.lib /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"
+# ADD 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 TAOd.lib TAO_PortableServerd.lib aced.lib TAO_AVd.lib TAO_CosNamingd.lib TAO_CosPropertyd.lib /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/av_benchmark_server.dsp b/TAO/orbsvcs/tests/AVStreams/benchmark/av_benchmark_server.dsp
index 8d1af326797..ddf161de33a 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/av_benchmark_server.dsp
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/av_benchmark_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_AV.lib TAO_CosNaming.lib TAO_CosProperty.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_AV.lib TAO_CosNaming.lib TAO_CosProperty.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "av_benchmark_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 TAOd.lib aced.lib TAO_AVd.lib TAO_CosNamingd.lib TAO_CosPropertyd.lib /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"
+# ADD LINK32 TAOd.lib TAO_PortableServerd.lib aced.lib TAO_AVd.lib TAO_CosNamingd.lib TAO_CosPropertyd.lib /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.dsp b/TAO/orbsvcs/tests/Concurrency/CC_client.dsp
index 657a7b48b52..426b592a97a 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_client.dsp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_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 ace.lib TAO.lib TAO_CosNaming.lib TAO_CosConcurrency.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib TAO_CosConcurrency.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "CC_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 aced.lib TAOd.lib TAO_CosNamingd.lib TAO_CosConcurrencyd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib TAO_CosConcurrencyd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.dsp b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.dsp
index d7c9805543c..54bb00d62e2 100644
--- a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.dsp
+++ b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.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 TAO_CosNaming.lib TAO_RTOLDEvent.lib TAO_RTEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 TAO.lib ace.lib TAO_PortableServer.lib TAO_CosNaming.lib TAO_RTOLDEvent.lib TAO_RTEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "EC_Basic - 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 TAO_CosNamingd.lib TAO_RTEventd.lib TAO_RTOLDEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 TAOd.lib aced.lib TAO_PortableServerd.lib TAO_CosNamingd.lib TAO_RTEventd.lib TAO_RTOLDEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Consumer.dsp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Consumer.dsp
index 43c0f670b57..02e4de9f800 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Consumer.dsp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Consumer.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_CosNaming.lib TAO_RTEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\TAO" /libpath:"..\..\..\..\ace"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib TAO_RTEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "ECCM_Consumer - 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_CosNamingd.lib TAO_RTEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\TAO" /libpath:"..\..\..\..\ace"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib TAO_RTEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Supplier.dsp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Supplier.dsp
index 459c6a85cd9..fb4ad6d6204 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Supplier.dsp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Supplier.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_CosNaming.lib TAO_RTEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\TAO" /libpath:"..\..\..\..\ace"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib TAO_RTEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "ECCM_Supplier - 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_CosNamingd.lib TAO_RTEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\TAO" /libpath:"..\..\..\..\ace"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib TAO_RTEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.dsp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.dsp
index a267af92cbf..03171cb6e0b 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.dsp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.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_CosNaming.lib TAO_RTEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"
+# ADD LINK32 TAO_CosNaming.lib TAO_RTEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "EC_Mcast - 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 TAO_CosNamingd.lib TAO_RTEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"
+# ADD LINK32 TAO_CosNamingd.lib TAO_RTEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.dsp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.dsp
index 777614fc4aa..a4d1485f84c 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.dsp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.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_CosNaming.lib TAO_RTEvent.lib TAO_RTOLDEvent.lib TAO_RTSchedEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"
+# ADD LINK32 TAO_CosNaming.lib TAO_RTEvent.lib TAO_RTOLDEvent.lib TAO_RTSchedEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "EC_Multiple - 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 TAO_CosNamingd.lib TAO_RTEventd.lib TAO_RTOLDEventd.lib TAO_RTSchedEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 TAO_CosNamingd.lib TAO_RTEventd.lib TAO_RTOLDEventd.lib TAO_RTSchedEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.dsp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.dsp
index 5e13b6e5fcf..7ab2dadc257 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.dsp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.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 TAO_CosNaming.lib TAO_RTEvent.lib TAO_RTOLDEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 TAO_CosNaming.lib TAO_RTEvent.lib TAO_RTOLDEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "ECT_Consumer - 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 TAO_CosNamingd.lib TAO_RTEventd.lib TAO_RTOLDEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 TAO_CosNamingd.lib TAO_RTEventd.lib TAO_RTOLDEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.dsp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.dsp
index 19a35f10b2f..a82c3790159 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.dsp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.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 TAO_CosNaming.lib TAO_RTEvent.lib TAO_RTOLDEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 TAO_CosNaming.lib TAO_RTEvent.lib TAO_RTOLDEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "ECT_Supplier - 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 TAO_CosNamingd.lib TAO_RTEventd.lib TAO_RTOLDEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 TAO_CosNamingd.lib TAO_RTEventd.lib TAO_RTOLDEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.dsp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.dsp
index ae1ad06d983..20191c9a2f0 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.dsp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.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 TAO_CosNaming.lib TAO_RTEvent.lib TAO_RTOLDEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 TAO_CosNaming.lib TAO_RTEvent.lib TAO_RTOLDEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "ECT_Throughput - 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 TAO_CosNamingd.lib TAO_RTEventd.lib TAO_RTOLDEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 TAO_CosNamingd.lib TAO_RTEventd.lib TAO_RTOLDEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.dsp b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.dsp
index 9ce441d8b34..62e14500bb8 100644
--- a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.dsp
+++ b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.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 TAO_CosNaming.lib TAO_RTEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"
+# ADD LINK32 TAO_CosNaming.lib TAO_RTEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "Event_Latency - 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 TAO_CosNamingd.lib TAO_RTEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 TAO_CosNamingd.lib TAO_RTEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/client.dsp b/TAO/orbsvcs/tests/Interoperable_Naming/client.dsp
index 8fc799e79fe..235c71addd6 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/client.dsp
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/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 ace.lib TAO.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "Interoperable Naming 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 aced.lib TAOd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/client.dsp b/TAO/orbsvcs/tests/LoadBalancing/client.dsp
index 4065b42db83..b5781059918 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/client.dsp
+++ b/TAO/orbsvcs/tests/LoadBalancing/client.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="LoadBalancing 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=LoadBalancing 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="LoadBalancing 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 "LoadBalancing client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "LoadBalancing 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)" == "LoadBalancing client - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -50,9 +50,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 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_LoadBalancing.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 TAO_LoadBalancing.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
+!ELSEIF  "$(CFG)" == "LoadBalancing client - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -74,14 +74,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 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_LoadBalancingd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 TAO_LoadBalancingd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "client - Win32 Release"
-# Name "client - Win32 Debug"
+# Name "LoadBalancing client - Win32 Release"
+# Name "LoadBalancing client - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -133,7 +133,7 @@ SOURCE=.\Hash_ReplicaS.h
 
 SOURCE=.\Hash_Replica.idl
 
-!IF  "$(CFG)" == "client - Win32 Release"
+!IF  "$(CFG)" == "LoadBalancing client - Win32 Release"
 
 # Begin Custom Build
 InputPath=.\Hash_Replica.idl
@@ -170,7 +170,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
+!ELSEIF  "$(CFG)" == "LoadBalancing client - Win32 Debug"
 
 # Begin Custom Build
 InputPath=.\Hash_Replica.idl
diff --git a/TAO/orbsvcs/tests/LoadBalancing/server.dsp b/TAO/orbsvcs/tests/LoadBalancing/server.dsp
index f95d3f10576..c6daf7bf2e1 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/server.dsp
+++ b/TAO/orbsvcs/tests/LoadBalancing/server.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="LoadBalancing 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=LoadBalancing 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="LoadBalancing 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 "LoadBalancing server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "LoadBalancing 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)" == "LoadBalancing server - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -50,9 +50,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 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_LoadBalancing.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 TAO_LoadBalancing.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
-!ELSEIF  "$(CFG)" == "server - Win32 Debug"
+!ELSEIF  "$(CFG)" == "LoadBalancing server - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -74,14 +74,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 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_LoadBalancingd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 TAO_LoadBalancingd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "server - Win32 Release"
-# Name "server - Win32 Debug"
+# Name "LoadBalancing server - Win32 Release"
+# Name "LoadBalancing server - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -133,7 +133,7 @@ SOURCE=.\Hash_ReplicaS.h
 
 SOURCE=.\Hash_Replica.idl
 
-!IF  "$(CFG)" == "server - Win32 Release"
+!IF  "$(CFG)" == "LoadBalancing server - Win32 Release"
 
 # Begin Custom Build
 InputPath=.\Hash_Replica.idl
@@ -170,7 +170,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "server - Win32 Debug"
+!ELSEIF  "$(CFG)" == "LoadBalancing server - Win32 Debug"
 
 # Begin Custom Build
 InputPath=.\Hash_Replica.idl
diff --git a/TAO/orbsvcs/tests/Property/client.dsp b/TAO/orbsvcs/tests/Property/client.dsp
index 546e15bcdad..d321b4facaf 100644
--- a/TAO/orbsvcs/tests/Property/client.dsp
+++ b/TAO/orbsvcs/tests/Property/client.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="Property 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=Property 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="Property 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 "Property client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Property 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)" == "Property client - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -51,9 +51,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 /subsystem:console /machine:I386
-# ADD LINK32 ace.lib TAO.lib TAO_CosNaming.lib TAO_CosProperty.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib TAO_CosProperty.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Property client - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -76,14 +76,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 /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 aced.lib TAOd.lib TAO_CosNamingd.lib TAO_CosPropertyd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib TAO_CosPropertyd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "client - Win32 Release"
-# Name "client - Win32 Debug"
+# Name "Property client - Win32 Release"
+# Name "Property client - Win32 Debug"
 # Begin Source File
 
 SOURCE=.\client.cpp
diff --git a/TAO/orbsvcs/tests/Property/server.dsp b/TAO/orbsvcs/tests/Property/server.dsp
index a7a0b7d6e5f..89f1ca34053 100644
--- a/TAO/orbsvcs/tests/Property/server.dsp
+++ b/TAO/orbsvcs/tests/Property/server.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="Property 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=Property 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="Property 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 "Property server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Property 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)" == "Property server - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -51,9 +51,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 /subsystem:console /machine:I386
-# ADD LINK32 ace.lib TAO.lib TAO_CosNaming.lib TAO_CosProperty.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib TAO_CosProperty.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
-!ELSEIF  "$(CFG)" == "server - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Property server - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -76,14 +76,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 /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 aced.lib TAOd.lib TAO_CosNamingd.lib TAO_CosPropertyd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib TAO_CosPropertyd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "server - Win32 Release"
-# Name "server - Win32 Debug"
+# Name "Property server - Win32 Release"
+# Name "Property server - Win32 Debug"
 # Begin Source File
 
 SOURCE=.\server.cpp
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.dsp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.dsp
index b1adc4fe07c..566b2a3225b 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.dsp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.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 TAO_CosNaming.lib TAO_RTSched.lib /nologo /subsystem:console /machine:I386 /out:"Sched_Conf.exe" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"
+# ADD LINK32 TAO_PortableServer.lib TAO.lib ace.lib TAO_RTSched.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /out:"Sched_Conf.exe" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "Sched_Conf - 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 TAO_CosNamingd.lib TAO_RTSchedd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 TAO_PortableServerd.lib TAOd.lib aced.lib TAO_CosNamingd.lib TAO_RTSchedd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.dsp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.dsp
index a3909402c04..c6cb3b10932 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.dsp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.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.lib ace.lib TAO_CosNaming.lib TAO_RTSched.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"
+# ADD LINK32 TAO_PortableServer.lib TAO.lib ace.lib TAO_RTSched.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "Sched_Conf_Anomalies - Win32 Debug"
 
@@ -66,8 +66,8 @@ LINK32=link.exe
 # 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 "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /FD  /c
+# 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 "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_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 TAOd.lib aced.lib TAO_CosNamingd.lib TAO_RTSchedd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 TAO_PortableServerd.lib TAOd.lib aced.lib TAO_CosNamingd.lib TAO_RTSchedd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.dsp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.dsp
index 55e72bb908e..d09fe6e3ae4 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.dsp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.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 TAO_RTSched.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"
+# ADD LINK32 TAO_PortableServer.lib TAO.lib ace.lib TAO_RTSched.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "Sched_Conf_Runtime - 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 TAO_CosNamingd.lib TAO_RTSchedd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 TAO_PortableServerd.lib TAOd.lib aced.lib TAO_CosNamingd.lib TAO_RTSchedd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.dsp b/TAO/orbsvcs/tests/Simple_Naming/client.dsp
index 7c773617906..6644a4004e0 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.dsp
+++ b/TAO/orbsvcs/tests/Simple_Naming/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 ace.lib TAO.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"
+# ADD LINK32 TAO_CosNaming.lib ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "Simple Naming 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 aced.lib TAOd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 TAO_CosNamingd.lib aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/orbsvcs/tests/Time/Time_Service_Test.dsp b/TAO/orbsvcs/tests/Time/Time_Service_Test.dsp
index 172144b4d88..e2b51d122d5 100644
--- a/TAO/orbsvcs/tests/Time/Time_Service_Test.dsp
+++ b/TAO/orbsvcs/tests/Time/Time_Service_Test.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_CosNaming.lib TAO_CosTime.lib /nologo /subsystem:console /machine:I386 /out:"Release/client.exe" /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib TAO_CosTime.lib /nologo /subsystem:console /machine:I386 /out:"Release/client.exe" /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "Time_Service_Test - 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_CosNamingd.lib TAO_CosTimed.lib /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib TAO_CosTimed.lib /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/orbsvcs/tests/Trading/Colocated_Test.dsp b/TAO/orbsvcs/tests/Trading/Colocated_Test.dsp
index 1236123b312..27afea15f35 100644
--- a/TAO/orbsvcs/tests/Trading/Colocated_Test.dsp
+++ b/TAO/orbsvcs/tests/Trading/Colocated_Test.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_DynamicAny.lib TradingLib.lib TAO_CosTrading.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\DynamicAny" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"
+# ADD LINK32 TAO_DynamicAny.lib TradingLib.lib TAO_CosTrading.lib ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\DynamicAny" /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "Colocated_Test - 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_DynamicAnyd.lib TradingLibd.lib TAO_CosTradingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\DynamicAny" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"
+# ADD LINK32 TAO_DynamicAnyd.lib TradingLibd.lib TAO_CosTradingd.lib aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\DynamicAny" /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/orbsvcs/tests/Trading/Export_Test.dsp b/TAO/orbsvcs/tests/Trading/Export_Test.dsp
index 6cd695c3e0a..eb5550928ca 100644
--- a/TAO/orbsvcs/tests/Trading/Export_Test.dsp
+++ b/TAO/orbsvcs/tests/Trading/Export_Test.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_DynamicAny.lib TradingLib.lib TAO_CosTrading.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\DynamicAny" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"
+# ADD LINK32 TAO_DynamicAny.lib TradingLib.lib TAO_CosTrading.lib ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\DynamicAny" /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "Export_Test - 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_DynamicAnyd.lib TradingLibd.lib TAO_CosTradingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\DynamicAny" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"
+# ADD LINK32 TAO_DynamicAnyd.lib TradingLibd.lib TAO_CosTradingd.lib aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\DynamicAny" /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/orbsvcs/tests/Trading/Import_Test.dsp b/TAO/orbsvcs/tests/Trading/Import_Test.dsp
index c816b193049..2b13596987a 100644
--- a/TAO/orbsvcs/tests/Trading/Import_Test.dsp
+++ b/TAO/orbsvcs/tests/Trading/Import_Test.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_DynamicAny.lib TradingLib.lib TAO_CosTrading.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\DynamicAny" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"
+# ADD LINK32 TAO_DynamicAny.lib TradingLib.lib TAO_CosTrading.lib ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\DynamicAny" /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "Import_Test - 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_DynamicAnyd.lib TradingLibd.lib TAO_CosTradingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\DynamicAny" /libpath:"..\..\..\..\ace" /libpath:"..\..\orbsvcs"
+# ADD LINK32 TAO_DynamicAnyd.lib TradingLibd.lib TAO_CosTradingd.lib aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\DynamicAny" /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/orbsvcs/tests/tests.dsw b/TAO/orbsvcs/tests/tests.dsw
index b70d19c5520..2681e35ddf8 100644
--- a/TAO/orbsvcs/tests/tests.dsw
+++ b/TAO/orbsvcs/tests/tests.dsw
@@ -3,6 +3,18 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
+Project: "CC_client"=.\Concurrency\CC_client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "Colocated_Test"=.\Trading\Colocated_Test.dsp - Package Owner=<4>
 
 Package=<5>
@@ -18,6 +30,30 @@ Package=<4>
 
 ###############################################################################
 
+Project: "ECCM_Consumer"=.\EC_Custom_Marshal\ECCM_Consumer.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "ECCM_Supplier"=.\EC_Custom_Marshal\ECCM_Supplier.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "ECT_Consumer"=.\EC_Throughput\ECT_Consumer.dsp - Package Owner=<4>
 
 Package=<5>
@@ -54,6 +90,18 @@ Package=<4>
 
 ###############################################################################
 
+Project: "EC_Basic"=.\EC_Basic\EC_Basic.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "EC_Mcast"=.\EC_Mcast\EC_Mcast.dsp - Package Owner=<4>
 
 Package=<5>
@@ -120,6 +168,66 @@ Package=<4>
 
 ###############################################################################
 
+Project: "Interoperable Naming Client"=.\Interoperable_Naming\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "LoadBalancing client"=.\LoadBalancing\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "LoadBalancing server"=.\LoadBalancing\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Property client"=.\Property\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Property server"=.\Property\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "Sched_Conf"=.\Sched_Conf\Sched_Conf.dsp - Package Owner=<4>
 
 Package=<5>
@@ -132,6 +240,30 @@ Package=<4>
 
 ###############################################################################
 
+Project: "Sched_Conf_Anomalies"=.\Sched_Conf\Sched_Conf_Anomalies.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Sched_Conf_Runtime"=.\Sched_Conf\Sched_Conf_Runtime.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "Simple Naming Client"=.\Simple_Naming\client.dsp - Package Owner=<4>
 
 Package=<5>
@@ -144,7 +276,55 @@ Package=<4>
 
 ###############################################################################
 
-Project: "TradingLib"=.\Trading\TradingLib.dsp - Package Owner=<4>
+Project: "Time_Service_Test"=.\Time\Time_Service_Test.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Trading Test Library"=.\Trading\TradingLib.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "av_benchmark_child"=.\AVStreams\benchmark\av_benchmark_child.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "av_benchmark_client"=.\AVStreams\benchmark\av_benchmark_client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "av_benchmark_server"=.\AVStreams\benchmark\av_benchmark_server.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -167,3 +347,4 @@ Package=<3>
 }}}
 
 ###############################################################################
+
diff --git a/TAO/performance-tests/Latency/st_server.dsp b/TAO/performance-tests/Latency/st_server.dsp
index cc5d088b86d..4ac82e61bd6 100644
--- a/TAO/performance-tests/Latency/st_server.dsp
+++ b/TAO/performance-tests/Latency/st_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 /nologo /subsystem:console /machine:I386 /libpath:"../../../ace" /libpath:"../../tao"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"
 
 !ELSEIF  "$(CFG)" == "Latency Tests ST 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 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../ace" /libpath:"../../tao"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"
 
 !ENDIF 
 
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Client.dsp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Client.dsp
index dde7893dc55..d1a93d437c9 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Client.dsp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Client.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="Client" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="Endpoint_per_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=Client - Win32 Debug
+CFG=Endpoint_per_Priority 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="Endpoint_per_Priority 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 "Endpoint_per_Priority Client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Endpoint_per_Priority 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)" == "Endpoint_per_Priority 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 RTCORBA_Common.lib ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\Common" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao"
 
-!ELSEIF  "$(CFG)" == "Client - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Endpoint_per_Priority 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 "Endpoint_per_Priority Client - Win32 Release"
+# Name "Endpoint_per_Priority Client - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Server.dsp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Server.dsp
index d34c8cad8b6..cab64ea3608 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Server.dsp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Server.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="Server" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="Endpoint_per_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=Server - Win32 Debug
+CFG=Endpoint_per_Priority 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="Endpoint_per_Priority 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 "Endpoint_per_Priority Server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Endpoint_per_Priority 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)" == "Endpoint_per_Priority Server - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -51,9 +51,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 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 RTCORBA_Common.lib /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\Common"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib RTCORBA_Common.lib /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\Common"
 
-!ELSEIF  "$(CFG)" == "Server - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Endpoint_per_Priority Server - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -76,14 +76,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 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 RTCORBA_Commond.lib /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\Common"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib RTCORBA_Commond.lib /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\Common"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "Server - Win32 Release"
-# Name "Server - Win32 Debug"
+# Name "Endpoint_per_Priority Server - Win32 Release"
+# Name "Endpoint_per_Priority Server - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Client.dsp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Client.dsp
index 4f83aba1900..e1bff30e19d 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Client.dsp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Client.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="Client" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="Orb_Per_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=Client - Win32 Debug
+CFG=Orb_Per_Priority 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="Orb_Per_Priority 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 "Orb_Per_Priority Client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Orb_Per_Priority 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)" == "Orb_Per_Priority 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 RTCORBA_Common.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\Common"
 
-!ELSEIF  "$(CFG)" == "Client - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Orb_Per_Priority 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 "Orb_Per_Priority Client - Win32 Release"
+# Name "Orb_Per_Priority Client - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Server.dsp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Server.dsp
index 92ca1db29b9..66d80158c3f 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Server.dsp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Server.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="Server" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="Orb_Per_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=Server - Win32 Debug
+CFG=Orb_Per_Priority 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="Orb_Per_Priority 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 "Orb_Per_Priority Server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Orb_Per_Priority 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)" == "Orb_Per_Priority Server - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -51,9 +51,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 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 RTCORBA_Common.lib /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\Common"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib RTCORBA_Common.lib /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\Common"
 
-!ELSEIF  "$(CFG)" == "Server - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Orb_Per_Priority Server - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -76,14 +76,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 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 RTCORBA_Commond.lib /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\Common"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib RTCORBA_Commond.lib /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\Common"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "Server - Win32 Release"
-# Name "Server - Win32 Debug"
+# Name "Orb_Per_Priority Server - Win32 Release"
+# Name "Orb_Per_Priority Server - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Client.dsp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Client.dsp
index 4f83aba1900..8107b74ac2b 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Client.dsp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Client.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="Client" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="Single_Endpoint 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=Single_Endpoint 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="Single_Endpoint 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 "Single_Endpoint Client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Single_Endpoint 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)" == "Single_Endpoint 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 RTCORBA_Common.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\Common"
 
-!ELSEIF  "$(CFG)" == "Client - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Single_Endpoint 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 "Single_Endpoint Client - Win32 Release"
+# Name "Single_Endpoint Client - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Server.dsp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Server.dsp
index 92ca1db29b9..e6864b9a68c 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Server.dsp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Server.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="Server" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="Single_Endpoint 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=Single_Endpoint 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="Single_Endpoint 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 "Single_Endpoint Server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Single_Endpoint 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)" == "Single_Endpoint Server - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -51,9 +51,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 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 RTCORBA_Common.lib /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\Common"
+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib RTCORBA_Common.lib /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\Common"
 
-!ELSEIF  "$(CFG)" == "Server - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Single_Endpoint Server - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -76,14 +76,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 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 RTCORBA_Commond.lib /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\Common"
+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib RTCORBA_Commond.lib /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\Common"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "Server - Win32 Release"
-# Name "Server - Win32 Debug"
+# Name "Single_Endpoint Server - Win32 Release"
+# Name "Single_Endpoint Server - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
diff --git a/TAO/performance-tests/TAO_Perf_Tests.dsw b/TAO/performance-tests/TAO_Perf_Tests.dsw
index a1212ca47fd..8787851d126 100644
--- a/TAO/performance-tests/TAO_Perf_Tests.dsw
+++ b/TAO/performance-tests/TAO_Perf_Tests.dsw
@@ -18,6 +18,36 @@ Package=<4>
 
 ###############################################################################
 
+Project: "Endpoint_per_Priority Client"=".\RTCorba\Multiple_Endpoints\Endpoint_Per_Priority\Client.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name RTCORBA Test Common DLL
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "Endpoint_per_Priority Server"=".\RTCorba\Multiple_Endpoints\Endpoint_Per_Priority\Server.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name RTCORBA Test Common DLL
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "IDL_Cubit Client"=".\Cubit\TAO\IDL_Cubit\client.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -66,6 +96,42 @@ Package=<4>
 
 ###############################################################################
 
+Project: "Latency Tests Deferred Synch Client"=".\Latency\deferred_synch_client.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Latency Tests ST Client"=".\Latency\st_client.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Latency Tests ST Server"=".\Latency\st_server.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "Latency Tests Server"=".\Latency\server.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -102,6 +168,36 @@ Package=<4>
 
 ###############################################################################
 
+Project: "Orb_Per_Priority Client"=".\RTCorba\Multiple_Endpoints\Orb_Per_Priority\Client.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name RTCORBA Test Common DLL
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "Orb_Per_Priority Server"=".\RTCorba\Multiple_Endpoints\Orb_Per_Priority\Server.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name RTCORBA Test Common DLL
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "POA Registration"=".\POA\Object_Creation_And_Registration\registration.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -138,6 +234,18 @@ Package=<4>
 
 ###############################################################################
 
+Project: "RTCORBA Test Common DLL"=".\RTCorba\Multiple_Endpoints\Common\RTCORBA_Common.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "Reliable Oneways Client"=".\RTCorba\Oneways\Reliable\client.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -162,6 +270,36 @@ Package=<4>
 
 ###############################################################################
 
+Project: "Single_Endpoint Client"=".\RTCorba\Multiple_Endpoints\Single_Endpoint\Client.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name RTCORBA Test Common DLL
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "Single_Endpoint Server"=".\RTCorba\Multiple_Endpoints\Single_Endpoint\Server.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name RTCORBA Test Common DLL
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Global:
 
 Package=<5>
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index 12b08823ab7..0767d46dcff 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -69,11 +69,7 @@ CORBA_DomainManager_ptr CORBA_DomainManager::_unchecked_narrow (
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_DomainManager (stub), CORBA_DomainManager::_nil ());
-      #if (TAO_HAS_SMART_PROXIES == 1)
-        return TAO_CORBA_DomainManager_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-      #else
-        return default_proxy;
-      #endif /*TAO_HAS_SMART_PROXIES == 1*/
+      return default_proxy;
     }
   else
     return
@@ -350,11 +346,7 @@ CORBA_ConstructionPolicy_ptr CORBA_ConstructionPolicy::_unchecked_narrow (
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::CORBA_ConstructionPolicy (stub), CORBA_ConstructionPolicy::_nil ());
-      #if (TAO_HAS_SMART_PROXIES == 1)
-        return TAO_CORBA_ConstructionPolicy_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-      #else
-        return default_proxy;
-      #endif /*TAO_HAS_SMART_PROXIES == 1*/
+      return default_proxy;
     }
   else
     return
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Benchmark.dsw b/TAO/tests/Portable_Interceptors/Benchmark/Benchmark.dsw
index fe8ee6e4761..2661bfb77e3 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Benchmark.dsw
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Benchmark.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
-Project: "Benchmark Client"=".\Benchmark Client.dsp" - Package Owner=<4>
+Project: "Benchmark Client"=.\client.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -15,7 +15,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Benchmark Server"=".\Benchmark Server.dsp" - Package Owner=<4>
+Project: "Benchmark Server"=.\server.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
index 4b3e839f156..eb3856b0723 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
@@ -1,15 +1,11 @@
 // $Id$
-#include "ace/OS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Get_Opt.h"
+#include "ace/OS.h"
 #include "testC.h"
 #include "interceptors.h"
 #include "marker.h"
 #include "ace/Get_Opt.h"
+
 ACE_RCSID (Benchmark, client, "$Id$")
 
 const char *ior = "file://test.ior";
@@ -19,23 +15,23 @@ int register_interceptor = 1;
 // to perform.
 // NOOP: does nothing on all interception points
 // CONTEXT: does service context manipulation
-// DYNAMIC: call upon dynamic interface methods and does extraction 
+// DYNAMIC: call upon dynamic interface methods and does extraction
 // from anys.
 enum Interceptor_Type
 {
-  NONE,
-  NOOP,
-  CONTEXT,
-  DYNAMIC
+  IT_NONE,
+  IT_NOOP,
+  IT_CONTEXT,
+  IT_DYNAMIC
 };
-static Interceptor_Type interceptor_type = NONE;
+static Interceptor_Type interceptor_type = IT_NONE;
 
 int
 parse_args (int argc, char *argv[])
 {
   ACE_Get_Opt get_opts (argc, argv, "ef:n:r:");
   int c;
-  
+
   while ((c = get_opts ()) != -1)
     switch (c)
       {
@@ -48,15 +44,15 @@ parse_args (int argc, char *argv[])
         niterations = ACE_OS::atoi (get_opts.optarg);
         break;
       case 'r':
-        { 
+        {
           if (ACE_OS::strcmp (get_opts.optarg, ACE_TEXT ("none")) == 0)
-            interceptor_type = NONE;
+            interceptor_type = IT_NONE;
           if (ACE_OS::strcmp (get_opts.optarg, ACE_TEXT ("noop")) == 0)
-            interceptor_type = NOOP;
+            interceptor_type = IT_NOOP;
           if (ACE_OS::strcmp (get_opts.optarg, ACE_TEXT ("context")) == 0)
-            interceptor_type = CONTEXT;
+            interceptor_type = IT_CONTEXT;
           if (ACE_OS::strcmp (get_opts.optarg, ACE_TEXT ("dynamic")) == 0)
-            interceptor_type = DYNAMIC;
+            interceptor_type = IT_DYNAMIC;
 
           break;
         }
@@ -79,14 +75,14 @@ run_test (Test_Interceptors::Secure_Vault_ptr server,
           CORBA::Environment &ACE_TRY_ENV)
 {
   int i=0;
-  const char user [BUFSIZ] = "root";  
+  const char user [BUFSIZ] = "root";
   Marker marker;
   ACE_Throughput_Stats throughput;
 
   ACE_DEBUG ((LM_DEBUG, "High res. timer calibration...."));
   ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
-  
+
   marker.accumulate_into (throughput, 1);
   ACE_hrtime_t throughput_base = ACE_OS::gethrtime ();
   for (i = 0; i < niterations ; ++i)
@@ -97,7 +93,7 @@ run_test (Test_Interceptors::Secure_Vault_ptr server,
       server->ready (ACE_TRY_ENV);
 
       // Grab timestamp again.
-      ACE_hrtime_t now = ACE_OS::gethrtime ();      
+      ACE_hrtime_t now = ACE_OS::gethrtime ();
 
       // Record statistics.
       marker.sample (now - throughput_base,
@@ -110,34 +106,34 @@ run_test (Test_Interceptors::Secure_Vault_ptr server,
     }
 
   marker.dump_stats ("Ready method  ", gsf, 1);
-      
+
   ACE_TRY
         {
           marker.accumulate_into (throughput, 2);
           throughput_base = ACE_OS::gethrtime ();
-          
+
           for (i = 0; i < niterations ; ++i)
             {
               // Record current time.
               ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
-              
+
               server->authenticate (user, ACE_TRY_ENV);
-              
+
               // Grab timestamp again.
-              ACE_hrtime_t now = ACE_OS::gethrtime ();      
-              
+              ACE_hrtime_t now = ACE_OS::gethrtime ();
+
               // Record statistics.
               marker.sample (now - throughput_base,
                              now - latency_base,
                              2);
-              
+
               ACE_CHECK;
               if (TAO_debug_level > 0 && i % 100 == 0)
                 ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i));
-                          
+
             }
           marker.dump_stats ("Authenticate method  ", gsf, 2);
-              
+
           ACE_CHECK;
 
         }
@@ -148,41 +144,41 @@ run_test (Test_Interceptors::Secure_Vault_ptr server,
   ACE_ENDTRY;
   ACE_CHECK;
 
-     
+
   Test_Interceptors::Secure_Vault::Record record;
   record.check_num = 1;
   record.amount = 1000;
   CORBA::Long id = 1;
-  
+
   marker.accumulate_into (throughput, 3);
   throughput_base = ACE_OS::gethrtime ();
-  
+
   for (i = 0; i < niterations ; ++i)
     {
       // Record current time.
       ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
-  
-      CORBA::Long result = server->update_records (id, 
-                                                   record, 
+
+      CORBA::Long result = server->update_records (id,
+                                                   record,
                                                    ACE_TRY_ENV);
-     
-      
+
+
       // Grab timestamp again.
-      ACE_hrtime_t now = ACE_OS::gethrtime ();      
-      
+      ACE_hrtime_t now = ACE_OS::gethrtime ();
+
       // Record statistics.
       marker.sample (now - throughput_base,
                      now - latency_base,
                      3);
-              
+
       ACE_CHECK;
       if (TAO_debug_level > 0 && i % 100 == 0)
         ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i));
-      
+
     }
       marker.dump_stats ("update records  method  ", gsf, 3);
       ACE_CHECK;
-              
+
 }
 
 
@@ -211,7 +207,7 @@ main (int argc, char *argv[])
 
   ACE_TRY_NEW_ENV
     {
-      
+
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -238,9 +234,9 @@ main (int argc, char *argv[])
 #if (TAO_HAS_INTERCEPTORS == 1)
       switch (interceptor_type)
         {
-        case NONE:
+        case IT_NONE:
           break;
-        case NOOP:
+        case IT_NOOP:
           {
             PortableInterceptor::ClientRequestInterceptor_ptr interceptor = 0;
             // Installing the Vault interceptor
@@ -250,7 +246,7 @@ main (int argc, char *argv[])
             orb->_register_client_interceptor (interceptor);
             break;
           }
-        case CONTEXT:
+        case IT_CONTEXT:
           {
             PortableInterceptor::ClientRequestInterceptor_ptr interceptor = 0;
             // Installing the Vault interceptor
@@ -260,7 +256,7 @@ main (int argc, char *argv[])
             orb->_register_client_interceptor (interceptor);
             break;
           }
-        case DYNAMIC:
+        case IT_DYNAMIC:
           {
             PortableInterceptor::ClientRequestInterceptor_ptr interceptor = 0;
             // Installing the Vault interceptor
@@ -270,13 +266,13 @@ main (int argc, char *argv[])
             orb->_register_client_interceptor (interceptor);
             break;
           }
-         
+
         }
 #endif /* (TAO_HAS_INTERCEPTORS == 1) */
-      
+
       ACE_DEBUG ((LM_DEBUG, "\nFunctionality test begins now...\n"));
 
-      // This test is useful for  benchmarking the differences when 
+      // This test is useful for  benchmarking the differences when
       // the same method is intercepted by different interceptors
       // wanting to achieve different functionality.
       run_test (server.in (), ACE_TRY_ENV);
@@ -288,7 +284,7 @@ main (int argc, char *argv[])
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:"); 
+                           "Catched exception:");
      return 1;
     }
   ACE_ENDTRY;
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.dsp b/TAO/tests/Portable_Interceptors/Benchmark/client.dsp
index 81f83ea717e..3e7d931e09b 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client.dsp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client.dsp
@@ -8,12 +8,12 @@ CFG=Benchmark 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 
-!MESSAGE NMAKE /f "Benchmark Client.mak".
+!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 "Benchmark Client.mak" CFG="Benchmark Client - Win32 Debug"
+!MESSAGE NMAKE /f "client.mak" CFG="Benchmark Client - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
@@ -50,8 +50,8 @@ 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 /nologo /subsystem:console /machine:I386 /out:"client.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 /out:"client.exe" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "Benchmark Client - Win32 Debug"
 
@@ -66,8 +66,8 @@ LINK32=link.exe
 # 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
+# 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"
@@ -75,8 +75,8 @@ 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 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept
+# 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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\PortableServer"
 
 !ENDIF 
 
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.h
index ec8fc6b8354..ccf94fa8b90 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.h
@@ -3,8 +3,8 @@
 #ifndef TAO_INTERCEPTORS_H
 #define TAO_INTERCEPTORS_H
 
-//#include "tao/corba.h"
 #include "testC.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
@@ -43,29 +43,29 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Canonical name of the interceptor.
-  
+
   virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri,
-                             CORBA::Environment &ACE_TRY_ENVV = 
+                             CORBA::Environment &ACE_TRY_ENVV =
                              TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri,
-                              CORBA::Environment &ACE_TRY_ENV = 
+                              CORBA::Environment &ACE_TRY_ENV =
                               TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri,
-                                  CORBA::Environment &ACE_TRY_ENV = 
+                                  CORBA::Environment &ACE_TRY_ENV =
                                   TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException, 
+    ACE_THROW_SPEC ((CORBA::SystemException,
                     PortableInterceptor::ForwardRequest));
 
 private:
   const char *myname_;
 
   CORBA::ORB_var orb_;
-  
+
 };
 
 class Vault_Server_Request_Interceptor
@@ -88,21 +88,21 @@ public:
   virtual char * name (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Canonical name of the interceptor.
-  
+
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
-                                CORBA::Environment &ACE_TRY_ENV = 
+                                CORBA::Environment &ACE_TRY_ENV =
                                 TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri,
-                           CORBA::Environment &ACE_TRY_ENV = 
+                           CORBA::Environment &ACE_TRY_ENV =
                            TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri,
-                                CORBA::Environment &ACE_TRY_ENV = 
+                                CORBA::Environment &ACE_TRY_ENV =
                                 TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
@@ -134,29 +134,29 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Canonical name of the interceptor.
-  
+
   virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri,
-                             CORBA::Environment &ACE_TRY_ENVV = 
+                             CORBA::Environment &ACE_TRY_ENVV =
                              TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri,
-                              CORBA::Environment &ACE_TRY_ENV = 
+                              CORBA::Environment &ACE_TRY_ENV =
                               TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri,
-                                  CORBA::Environment &ACE_TRY_ENV = 
+                                  CORBA::Environment &ACE_TRY_ENV =
                                   TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException, 
+    ACE_THROW_SPEC ((CORBA::SystemException,
                     PortableInterceptor::ForwardRequest));
 
 private:
   const char *myname_;
 
   CORBA::ORB_var orb_;
-  
+
 };
 
 class Vault_Server_Request_Context_Interceptor
@@ -179,21 +179,21 @@ public:
   virtual char * name (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Canonical name of the interceptor.
-  
+
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
-                                CORBA::Environment &ACE_TRY_ENV = 
+                                CORBA::Environment &ACE_TRY_ENV =
                                 TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri,
-                           CORBA::Environment &ACE_TRY_ENV = 
+                           CORBA::Environment &ACE_TRY_ENV =
                            TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri,
-                                CORBA::Environment &ACE_TRY_ENV = 
+                                CORBA::Environment &ACE_TRY_ENV =
                                 TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
@@ -226,29 +226,29 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Canonical name of the interceptor.
-  
+
   virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri,
-                             CORBA::Environment &ACE_TRY_ENVV = 
+                             CORBA::Environment &ACE_TRY_ENVV =
                              TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri,
-                              CORBA::Environment &ACE_TRY_ENV = 
+                              CORBA::Environment &ACE_TRY_ENV =
                               TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri,
-                                  CORBA::Environment &ACE_TRY_ENV = 
+                                  CORBA::Environment &ACE_TRY_ENV =
                                   TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException, 
+    ACE_THROW_SPEC ((CORBA::SystemException,
                     PortableInterceptor::ForwardRequest));
 
 private:
   const char *myname_;
 
   CORBA::ORB_var orb_;
-  
+
 };
 
 class Vault_Server_Request_Dynamic_Interceptor
@@ -271,21 +271,21 @@ public:
   virtual char * name (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Canonical name of the interceptor.
-  
+
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
-                                CORBA::Environment &ACE_TRY_ENV = 
+                                CORBA::Environment &ACE_TRY_ENV =
                                 TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri,
-                           CORBA::Environment &ACE_TRY_ENV = 
+                           CORBA::Environment &ACE_TRY_ENV =
                            TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri,
-                                CORBA::Environment &ACE_TRY_ENV = 
+                                CORBA::Environment &ACE_TRY_ENV =
                                 TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
@@ -318,29 +318,29 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Canonical name of the interceptor.
-  
+
   virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri,
-                             CORBA::Environment &ACE_TRY_ENVV = 
+                             CORBA::Environment &ACE_TRY_ENVV =
                              TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri,
-                              CORBA::Environment &ACE_TRY_ENV = 
+                              CORBA::Environment &ACE_TRY_ENV =
                               TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri,
-                                  CORBA::Environment &ACE_TRY_ENV = 
+                                  CORBA::Environment &ACE_TRY_ENV =
                                   TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException, 
+    ACE_THROW_SPEC ((CORBA::SystemException,
                     PortableInterceptor::ForwardRequest));
 
 private:
   const char *myname_;
 
   CORBA::ORB_var orb_;
-  
+
 };
 
 class Vault_Server_Request_NOOP_Interceptor
@@ -363,21 +363,21 @@ public:
   virtual char * name (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Canonical name of the interceptor.
-  
+
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
-                                CORBA::Environment &ACE_TRY_ENV = 
+                                CORBA::Environment &ACE_TRY_ENV =
                                 TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri,
-                           CORBA::Environment &ACE_TRY_ENV = 
+                           CORBA::Environment &ACE_TRY_ENV =
                            TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
 
   virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri,
-                                CORBA::Environment &ACE_TRY_ENV = 
+                                CORBA::Environment &ACE_TRY_ENV =
                                 TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/marker.h b/TAO/tests/Portable_Interceptors/Benchmark/marker.h
index f0edba12041..8afb698337e 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/marker.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/marker.h
@@ -7,13 +7,13 @@
 class Marker
 {
  public:
-  
-  void accumulate_into (ACE_Throughput_Stats &throughput, 
+
+  void accumulate_into (ACE_Throughput_Stats &throughput,
                         int which_method) const;
   // Accumulate the throughput statistics into <throughput>
 
-  void dump_stats (const char* msg, 
-                   ACE_UINT32 gsf, 
+  void dump_stats (const char* msg,
+                   ACE_UINT32 gsf,
                    int which_method);
   // Print stats
 
@@ -22,7 +22,7 @@ class Marker
                int which_method);
   // get the sample.
 
- private:  
+ private:
   ACE_Throughput_Stats throughput_method_ready_;
   // Keep throughput statistics on a per-thread basis
   ACE_Throughput_Stats throughput_method_authenticate_;
@@ -30,4 +30,3 @@ class Marker
   ACE_Throughput_Stats throughput_method_update_records_;
   // Keep throughput statistics on a per-thread basis
 };
-
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
index 6d9e57b9516..fd44d330649 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
@@ -12,16 +12,16 @@ int register_interceptor = 1;
 // to perform.
 // NOOP: does nothing on all interception points
 // CONTEXT: does service context manipulation
-// DYNAMIC: call upon dynamic interface methods and does extraction 
+// DYNAMIC: call upon dynamic interface methods and does extraction
 // from anys.
 enum Interceptor_Type
 {
-  NONE,
-  NOOP,
-  CONTEXT,
-  DYNAMIC
+  IT_NONE,
+  IT_NOOP,
+  IT_CONTEXT,
+  IT_DYNAMIC
 };
-static Interceptor_Type interceptor_type = NONE;
+static Interceptor_Type interceptor_type = IT_NONE;
 
 int
 parse_args (int argc, char *argv[])
@@ -36,15 +36,15 @@ parse_args (int argc, char *argv[])
         ior_output_file = get_opts.optarg;
         break;
       case 'r':
-        { 
+        {
           if (ACE_OS::strcmp (get_opts.optarg, ACE_TEXT ("none")) == 0)
-            interceptor_type = NONE;
+            interceptor_type = IT_NONE;
           if (ACE_OS::strcmp (get_opts.optarg, ACE_TEXT ("noop")) == 0)
-            interceptor_type = NOOP;
+            interceptor_type = IT_NOOP;
           if (ACE_OS::strcmp (get_opts.optarg, ACE_TEXT ("context")) == 0)
-            interceptor_type = CONTEXT;
+            interceptor_type = IT_CONTEXT;
           if (ACE_OS::strcmp (get_opts.optarg, ACE_TEXT ("dynamic")) == 0)
-            interceptor_type = DYNAMIC;
+            interceptor_type = IT_DYNAMIC;
 
           break;
         }
@@ -76,9 +76,9 @@ main (int argc, char *argv[])
 #if (TAO_HAS_INTERCEPTORS == 1)
       switch (interceptor_type)
         {
-        case NONE:
+        case IT_NONE:
           break;
-        case NOOP:
+        case IT_NOOP:
           {
             PortableInterceptor::ServerRequestInterceptor_ptr interceptor = 0;
             // Installing the Vault interceptor
@@ -88,7 +88,7 @@ main (int argc, char *argv[])
             orb->_register_server_interceptor (interceptor);
             break;
           }
-        case CONTEXT:
+        case IT_CONTEXT:
           {
             PortableInterceptor::ServerRequestInterceptor_ptr interceptor = 0;
             // Installing the Vault interceptor
@@ -98,7 +98,7 @@ main (int argc, char *argv[])
             orb->_register_server_interceptor (interceptor);
             break;
           }
-        case DYNAMIC:
+        case IT_DYNAMIC:
           {
             PortableInterceptor::ServerRequestInterceptor_ptr interceptor = 0;
             // Installing the Vault interceptor
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server.dsp b/TAO/tests/Portable_Interceptors/Benchmark/server.dsp
index 00664792d1d..52f4dac8378 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/server.dsp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/server.dsp
@@ -8,12 +8,12 @@ CFG=Benchmark 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 
-!MESSAGE NMAKE /f "Benchmark Server.mak".
+!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 "Benchmark Server.mak" CFG="Benchmark Server - Win32 Debug"
+!MESSAGE NMAKE /f "server.mak" CFG="Benchmark Server - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
@@ -50,8 +50,8 @@ 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 /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# 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:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\PortableServer"
 
 !ELSEIF  "$(CFG)" == "Benchmark Server - Win32 Debug"
 
@@ -66,8 +66,8 @@ LINK32=link.exe
 # 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
+# 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"
@@ -75,8 +75,8 @@ 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 /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
+# 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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\PortableServer"
 
 !ENDIF 
 
@@ -105,6 +105,10 @@ SOURCE=.\test_i.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\testC.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\testS.cpp
 # End Source File
 # End Group
@@ -125,6 +129,10 @@ SOURCE=.\test_i.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\testC.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\testS.h
 # End Source File
 # End Group
diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Test_Stubs.dsp b/TAO/tests/Smart_Proxies/Collocation/Coll_Test_Stubs.dsp
index ea519e2ccbc..e6b25cc4de7 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Coll_Test_Stubs.dsp
+++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Test_Stubs.dsp
@@ -54,7 +54,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 /dll /machine:I386
-# ADD LINK32 ace.lib tao.lib /nologo /dll /machine:I386 /libpath:"../../../../ace" /libpath:"../../../tao"
+# ADD LINK32 ace.lib TAO.lib /nologo /dll /machine:I386 /libpath:"../../../../ace" /libpath:"../../../tao"
 
 !ELSEIF  "$(CFG)" == "Coll_Test_Stubs Library - Win32 Debug"
 
@@ -81,7 +81,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 /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:"Coll_Test_Stubsd.dll" /pdbtype:sept /libpath:"../../../../ace" /libpath:"../../../tao"
 
 !ENDIF 
 
diff --git a/TAO/tests/Smart_Proxies/Collocation/Collocation.dsp b/TAO/tests/Smart_Proxies/Collocation/Collocation.dsp
index 38e71aea561..6966c075366 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Collocation.dsp
+++ b/TAO/tests/Smart_Proxies/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 Diamond.lib coll_test_stubs.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../../ace" /libpath:"../../../tao"
+# ADD LINK32 Diamond.lib ace.lib TAO.lib TAO_PortableServer.lib coll_test_stubs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\PortableServer" /libpath:"../../../../ace" /libpath:"../../../tao"
 
 !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 Diamondd.lib coll_test_stubsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../../ace" /libpath:"../../../tao"
+# ADD LINK32 TAOd.lib Diamondd.lib aced.lib TAO_PortableServerd.lib coll_test_stubsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../../ace" /libpath:"../../../tao" /libpath:"..\..\..\tao\PortableServer"
 
 !ENDIF 
 
diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond.dsp b/TAO/tests/Smart_Proxies/Collocation/Diamond.dsp
index 8b22de461c2..035ce3e6746 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Diamond.dsp
+++ b/TAO/tests/Smart_Proxies/Collocation/Diamond.dsp
@@ -54,7 +54,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 /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 TAO_PortableServer.lib ace.lib TAO.lib coll_test_stubs.lib /nologo /dll /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer"
 
 !ELSEIF  "$(CFG)" == "Diamond Library - Win32 Debug"
 
@@ -81,7 +81,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 /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 TAOd.lib TAO_PortableServerd.lib aced.lib coll_test_stubsd.lib /nologo /dll /debug /machine:I386 /out:"Diamondd.dll" /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer"
 
 !ENDIF 
 
diff --git a/TAO/tests/Smart_Proxies/client.dsp b/TAO/tests/Smart_Proxies/client.dsp
index 09f0dc4dbd1..7da8deef3a4 100644
--- a/TAO/tests/Smart_Proxies/client.dsp
+++ b/TAO/tests/Smart_Proxies/client.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="Smart_Proxies 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=Smart_Proxies 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="Smart_Proxies 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 "Smart_Proxies client - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Smart_Proxies 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)" == "Smart_Proxies 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 /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)" == "Smart_Proxies 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 "Smart_Proxies client - Win32 Release"
+# Name "Smart_Proxies client - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter ""
@@ -119,7 +119,7 @@ SOURCE=.\testC.h
 
 SOURCE=.\test.idl
 
-!IF  "$(CFG)" == "client - Win32 Release"
+!IF  "$(CFG)" == "Smart_Proxies client - Win32 Release"
 
 # PROP Ignore_Default_Tool 1
 USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"	
@@ -158,7 +158,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Smart_Proxies client - Win32 Debug"
 
 # PROP Ignore_Default_Tool 1
 USERDEP__TEST_="..\..\..\bin\tao_idl.exe"	
diff --git a/TAO/tests/Smart_Proxies/server.dsp b/TAO/tests/Smart_Proxies/server.dsp
index 60afa3b73f2..171e357153a 100644
--- a/TAO/tests/Smart_Proxies/server.dsp
+++ b/TAO/tests/Smart_Proxies/server.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="Smart_Proxies 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=Smart_Proxies 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="Smart_Proxies 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 "Smart_Proxies server - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Smart_Proxies 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)" == "Smart_Proxies server - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -51,9 +51,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 /subsystem:console /machine:I386
-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 ace.lib tao.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
 
-!ELSEIF  "$(CFG)" == "server - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Smart_Proxies server - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -76,14 +76,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 /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 aced.lib taod.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 aced.lib taod.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "server - Win32 Release"
-# Name "server - Win32 Debug"
+# Name "Smart_Proxies server - Win32 Release"
+# Name "Smart_Proxies server - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter ""
@@ -115,7 +115,7 @@ SOURCE=.\testS.h
 
 SOURCE=.\test.idl
 
-!IF  "$(CFG)" == "server - Win32 Release"
+!IF  "$(CFG)" == "Smart_Proxies server - Win32 Release"
 
 # PROP Ignore_Default_Tool 1
 USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"	
@@ -154,7 +154,7 @@ BuildCmds= \
    $(BuildCmds)
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "server - Win32 Debug"
+!ELSEIF  "$(CFG)" == "Smart_Proxies server - Win32 Debug"
 
 # PROP Ignore_Default_Tool 1
 USERDEP__TEST_="..\..\..\bin\tao_idl.exe"	
diff --git a/TAO/tests/TAO_Tests.dsw b/TAO/tests/TAO_Tests.dsw
index 51fc1bc42b4..93b6fc2f9c2 100644
--- a/TAO/tests/TAO_Tests.dsw
+++ b/TAO/tests/TAO_Tests.dsw
@@ -75,7 +75,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "ORB_init"=.\ORB_init\ORB_init.dsp - Package Owner=<4>
+Project: "MT_Client Client"=.\MT_Client\client.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -87,7 +87,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "ORB_destroy"=.\ORB_destroy\ORB_destroy.dsp - Package Owner=<4>
+Project: "MT_Client ORB Creation"=.\MT_Client\orb_creation.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -99,7 +99,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "MT_Client Client"=.\MT_Client\client.dsp - Package Owner=<4>
+Project: "MT_Client Server"=.\MT_Client\server.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -111,7 +111,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "MT_Client ORB Creation"=.\MT_Client\orb_creation.dsp - Package Owner=<4>
+Project: "MT_Server Client"=.\MT_Server\client.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -123,7 +123,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "MT_Client Server"=.\MT_Client\server.dsp - Package Owner=<4>
+Project: "MT_Server Server"=.\MT_Server\server.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -135,7 +135,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "MT_Server Client"=.\MT_Server\client.dsp - Package Owner=<4>
+Project: "Multiple Inheritance Client"=.\Multiple_Inheritance\client.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -147,7 +147,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "MT_Server Server"=.\MT_Server\server.dsp - Package Owner=<4>
+Project: "Multiple Inheritance Server"=.\Multiple_Inheritance\server.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -159,7 +159,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Multiple Inheritance Client"=.\Multiple_Inheritance\client.dsp - Package Owner=<4>
+Project: "Native Exceptions Client"=.\Native_Exceptions\client.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -171,7 +171,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Multiple Inheritance Server"=.\Multiple_Inheritance\server.dsp - Package Owner=<4>
+Project: "Native Exceptions Server"=.\Native_Exceptions\server.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -267,6 +267,30 @@ Package=<4>
 
 ###############################################################################
 
+Project: "ORB_destroy"=.\ORB_destroy\ORB_destroy.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "ORB_init"=.\ORB_init\ORB_init.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "OctetSeq"=.\OctetSeq\OctetSeq.dsp - Package Owner=<4>
 
 Package=<5>
@@ -315,7 +339,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "POA Non_Servant_Upcalls"=.\POA\Non_Servant_Upcalls\Non_Servant_Upcalls.dsp - Package Owner=<4>
+Project: "POA Destruction"=.\POA\Destruction\Destruction.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -327,7 +351,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "POA Destruction"=.\POA\Destruction\Destruction.dsp - Package Owner=<4>
+Project: "POA Identity"=.\POA\Identity\Identity.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -339,7 +363,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "POA Identity"=.\POA\Identity\Identity.dsp - Package Owner=<4>
+Project: "POA Non_Servant_Upcalls"=.\POA\Non_Servant_Upcalls\Non_Servant_Upcalls.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -375,6 +399,30 @@ Package=<4>
 
 ###############################################################################
 
+Project: "Smart_Proxies client"=.\Smart_Proxies\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Smart_Proxies server"=.\Smart_Proxies\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "Timeout Client"=.\Timeout\client.dsp - Package Owner=<4>
 
 Package=<5>
@@ -422,3 +470,4 @@ Package=<3>
 }}}
 
 ###############################################################################
+
author	coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2000-09-02 23:58:42 +0000
committer	coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2000-09-02 23:58:42 +0000
commit	e2e97c4315cc2546800c16555b425948df99c140 (patch)
tree	0bd33017bca4cea7352f43948aa65226e4a51230
parent	2790836340e669f66a480b31e13853e421c3bbae (diff)
download	ATCD-e2e97c4315cc2546800c16555b425948df99c140.tar.gz