Tue Feb 13 14:21:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

76 files changed, 90 insertions, 89 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b5967dfdaf3..281e3d3e839 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,84 @@
+Tue Feb 13 14:21:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/CodeSets/simple/CodeSets_simple.mpc:
+        * tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc:
+        * tests/Exposed_Policies/Exposed_Policies.mpc:
+        * tests/Faults/Faults.mpc:
+        * tests/File_IO/File_IO.mpc:
+        * tests/Forwarding/Forwarding.mpc:
+        * tests/InterOp-Naming/InterOp-Naming.mpc:
+        * tests/IPV6/IPV6_Hello.mpc:
+        * tests/Leader_Followers/Leader_Followers.mpc:
+        * tests/LongUpcalls/LongUpcalls.mpc:
+        * tests/MProfile/MProfile.mpc:
+        * tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc:
+        * tests/MProfile_Forwarding/MProfile_Forwarding.mpc:
+        * tests/MT_Client/MT_Client.mpc:
+        * tests/MT_Server/MT_Server.mpc:
+        * tests/MT_Timeout/MT_Timeout.mpc:
+        * tests/Multiple/Multiple.mpc:
+        * tests/Multiple_Inheritance/Multiple_Inheritance.mpc:
+        * tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc:
+        * tests/Muxing/Muxing.mpc:
+        * tests/Native_Exceptions/Native_Exceptions.mpc:
+        * tests/Nested_Event_Loop/Nested_Event_Loop.mpc:
+        * tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc:
+        * tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc:
+        * tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc:
+        * tests/OBV/Any/OBV_Any.mpc:
+        * tests/OBV/Factory/OBV_Factory.mpc:
+        * tests/OBV/Forward/OBV_Forward.mpc:
+        * tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc:
+        * tests/OBV/Truncatable/OBV_Truncatable.mpc:
+        * tests/OBV/ValueBox/valuebox.mpc:
+        * tests/Ondemand_Write/Ondemand_Write.mpc:
+        * tests/Oneway_Buffering/Oneway_Buffering.mpc:
+        * tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc:
+        * tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc:
+        * tests/POA/EndpointPolicy/EndpointPolicy.mpc:
+        * tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc:
+        * tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc:
+        * tests/Portable_Interceptors/Bug_2510_Regression/Bug_2510_Regression.mpc:
+        * tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc:
+        * tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc:
+        * tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc:
+        * tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc:
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc:
+        * tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc:
+        * tests/Reliable_Oneways/Reliable_Oneways.mpc:
+        * tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc:
+        * tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc:
+        * tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc:
+        * tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc:
+        * tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc:
+        * tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc:
+        * tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc:
+        * tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc:
+        * tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc:
+        * tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc:
+        * tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc:
+        * tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc:
+        * tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc:
+        * tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc:
+        * tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc:
+        * tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc:
+        * tests/Server_Connection_Purging/Server_Connection_Purging.mpc:
+        * tests/Server_Leaks/Server_Leaks.mpc:
+        * tests/Single_Read/Single_Read.mpc:
+        * tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc:
+        * tests/Smart_Proxies/dtor/dtor.mpc:
+        * tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc:
+        * tests/Smart_Proxies/Policy/SP_Policy.mpc:
+        * tests/Smart_Proxies/Smart_Proxies.mpc:
+        * tests/Stack_Recursion/Stack_Recursion.mpc:
+        * tests/Strategies/Strategies.mpc:
+        * tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc:
+        * tests/Two_Objects/Two_Objects.mpc:
+        * tests/Typedef_String_Array/typedef_string_array.mpc:
+          Simplified these mpc files, these all have a custom idl project
+          so the client and server can both have an after on this idl
+          project, the client doesn't need an after on the server
+
 Tue Feb 13 14:09:14 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp:
diff --git a/TAO/tests/CodeSets/simple/CodeSets_simple.mpc b/TAO/tests/CodeSets/simple/CodeSets_simple.mpc
index 6dac99613f4..41daa57f1be 100644
--- a/TAO/tests/CodeSets/simple/CodeSets_simple.mpc
+++ b/TAO/tests/CodeSets/simple/CodeSets_simple.mpc
@@ -10,7 +10,6 @@ project(*idl): taoidldefaults {
 
 project(*client) : taoclient, anytypecode {
   after += *idl
-  after += *server
 
   Source_Files {
     client.cpp
diff --git a/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc b/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc
index 3c94b1f5d10..6dd9084f5ad 100644
--- a/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc
+++ b/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc
@@ -23,7 +23,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Exposed_Policies/Exposed_Policies.mpc b/TAO/tests/Exposed_Policies/Exposed_Policies.mpc
index 343ee82c6ce..780cb0f5cb8 100644
--- a/TAO/tests/Exposed_Policies/Exposed_Policies.mpc
+++ b/TAO/tests/Exposed_Policies/Exposed_Policies.mpc
@@ -27,7 +27,6 @@ project(*Server): strategies, rt_server {
 project(*Client): strategies, rt_server {
   exename = client
   after += *idl
-  after += *Server
   Source_Files {
     Policy_Tester.cpp
     Policy_Verifier.cpp
diff --git a/TAO/tests/Faults/Faults.mpc b/TAO/tests/Faults/Faults.mpc
index 8c2ae1263cc..2009ee746b0 100644
--- a/TAO/tests/Faults/Faults.mpc
+++ b/TAO/tests/Faults/Faults.mpc
@@ -26,7 +26,6 @@ project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoid
 
 project(*Middle): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
-  after += *Server
 
   Source_Files {
     test_i.cpp
@@ -42,7 +41,6 @@ project(*Middle): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_c
 
 project(*Client): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
-  after += *Middle
 
   Source_Files {
     test_i.cpp
@@ -73,7 +71,6 @@ project(*Ping): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_com
 
 project(*Pong): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
-  after += *Ping
 
   Source_Files {
     ping_i.cpp
diff --git a/TAO/tests/File_IO/File_IO.mpc b/TAO/tests/File_IO/File_IO.mpc
index 4d98684d36e..3651047c5eb 100644
--- a/TAO/tests/File_IO/File_IO.mpc
+++ b/TAO/tests/File_IO/File_IO.mpc
@@ -22,7 +22,6 @@ project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoid
 
 project(*Client): taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
-  after += *Server
   Source_Files {
     FileC.cpp
     client.cpp
diff --git a/TAO/tests/Forwarding/Forwarding.mpc b/TAO/tests/Forwarding/Forwarding.mpc
index 869c1d241c4..ee705f01845 100644
--- a/TAO/tests/Forwarding/Forwarding.mpc
+++ b/TAO/tests/Forwarding/Forwarding.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver, iortable {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/IPV6/IPV6_Hello.mpc b/TAO/tests/IPV6/IPV6_Hello.mpc
index 02e2ddc1120..2e4131f6280 100644
--- a/TAO/tests/IPV6/IPV6_Hello.mpc
+++ b/TAO/tests/IPV6/IPV6_Hello.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/InterOp-Naming/InterOp-Naming.mpc b/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
index 47fba039d91..515a689a52b 100644
--- a/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
+++ b/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
@@ -27,7 +27,6 @@ project(*Server): taoserver, utils, iortable, avoids_corba_e_micro {
 project(*Client): taoclient, anytypecode {
   exename = INS_test_client
   after += *idl
-  after += *Server
   Source_Files {
     INS_test_client.cpp
   }
diff --git a/TAO/tests/Leader_Followers/Leader_Followers.mpc b/TAO/tests/Leader_Followers/Leader_Followers.mpc
index d9ff8a0f0df..53c406090c3 100644
--- a/TAO/tests/Leader_Followers/Leader_Followers.mpc
+++ b/TAO/tests/Leader_Followers/Leader_Followers.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver, strategies {
 
 project(*Client): taoclient, strategies {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/LongUpcalls/LongUpcalls.mpc b/TAO/tests/LongUpcalls/LongUpcalls.mpc
index 050e6e72952..cb18bd3ee52 100644
--- a/TAO/tests/LongUpcalls/LongUpcalls.mpc
+++ b/TAO/tests/LongUpcalls/LongUpcalls.mpc
@@ -25,7 +25,6 @@ project(*Server): taoserver, messaging, ami {
 
 project(*Client): messaging, taoexe, portableserver, ami {
   after += *idl
-  after += *Server
   Source_Files {
     Controller.cpp
     blocking_client.cpp
@@ -41,7 +40,6 @@ project(*Client): messaging, taoexe, portableserver, ami {
 project(*AMI_Server): taoserver, messaging, ami {
   exename = ami_server
   after += *idl
-  after += *Client
   Source_Files {
     AMI_Manager.cpp
     ami_server.cpp
@@ -56,7 +54,6 @@ project(*AMI_Server): taoserver, messaging, ami {
 
 project(*AMI_Client): messaging, taoexe, portableserver, ami {
   after += *idl
-  after += *AMI_Server
   Source_Files {
     Controller.cpp
     Manager_Handler.cpp
diff --git a/TAO/tests/MProfile/MProfile.mpc b/TAO/tests/MProfile/MProfile.mpc
index 6f0f5e0df59..7beef1c3cfa 100644
--- a/TAO/tests/MProfile/MProfile.mpc
+++ b/TAO/tests/MProfile/MProfile.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver, iormanip {
 
 project(*Client): taoclient, iormanip {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc b/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc
index 57409e95046..b8f58d81ffd 100644
--- a/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc
+++ b/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver, messaging, iormanip {
 
 project(*Client): taoclient, messaging, iormanip {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
index a8cd11740a7..5625f1183bf 100644
--- a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
+++ b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
@@ -25,7 +25,6 @@ project(*Server): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoid
 project(*Client): taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   exename = client
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
@@ -39,7 +38,6 @@ project(*Client): taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_c
 project(*Manager): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, iormanip {
   exename = manager
   after += *idl
-  after += *Client
   Source_Files {
     Servant_Locator.cpp
     Manager.cpp
diff --git a/TAO/tests/MT_Client/MT_Client.mpc b/TAO/tests/MT_Client/MT_Client.mpc
index 4c7c0e8f0a7..b221f62ce4b 100644
--- a/TAO/tests/MT_Client/MT_Client.mpc
+++ b/TAO/tests/MT_Client/MT_Client.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/MT_Server/MT_Server.mpc b/TAO/tests/MT_Server/MT_Server.mpc
index aa28b25107f..bbcbfa8e1b6 100644
--- a/TAO/tests/MT_Server/MT_Server.mpc
+++ b/TAO/tests/MT_Server/MT_Server.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/MT_Timeout/MT_Timeout.mpc b/TAO/tests/MT_Timeout/MT_Timeout.mpc
index dbf0552a387..93f6126de90 100644
--- a/TAO/tests/MT_Timeout/MT_Timeout.mpc
+++ b/TAO/tests/MT_Timeout/MT_Timeout.mpc
@@ -25,7 +25,6 @@ project(*Server): messaging, taoserver {
 
 project(*Client): messaging, taoexe, portableserver {
   after += *idl
-  after += *Server
   Source_Files {
     Client_Task.cpp
     client.cpp
diff --git a/TAO/tests/Multiple/Multiple.mpc b/TAO/tests/Multiple/Multiple.mpc
index fff5e12d1e2..830ac51f4ba 100644
--- a/TAO/tests/Multiple/Multiple.mpc
+++ b/TAO/tests/Multiple/Multiple.mpc
@@ -18,7 +18,7 @@ project(*Server): taoserver {
     server.cpp
   }
   Source_Files {
-     MultipleC.cpp    
+     MultipleC.cpp
      MultipleS.cpp
   }
   IDL_Files {
@@ -27,7 +27,6 @@ project(*Server): taoserver {
 
 project(*Client): taoexe, portableserver {
   after += *idl
-  after += *Server
 
   Source_Files {
     Multiple_Impl.cpp
@@ -35,7 +34,7 @@ project(*Client): taoexe, portableserver {
     client.cpp
   }
   Source_Files {
-     MultipleC.cpp    
+     MultipleC.cpp
      MultipleS.cpp
   }
   IDL_Files {
diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
index 7a02f54b12f..c57114e6146 100644
--- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
+++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
@@ -23,7 +23,6 @@ project(*Server): taoserver, utils, avoids_corba_e_micro {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc b/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
index 95c18b6becb..fa5851d93de 100644
--- a/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
+++ b/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Muxing/Muxing.mpc b/TAO/tests/Muxing/Muxing.mpc
index f920367a5b4..ed8d0a0daee 100644
--- a/TAO/tests/Muxing/Muxing.mpc
+++ b/TAO/tests/Muxing/Muxing.mpc
@@ -25,7 +25,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     Client_Task.cpp
     client.cpp
diff --git a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
index 98f1c7fa090..2bf43f81b15 100644
--- a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
+++ b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver, anytypecode {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc b/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc
index 73c8c902fc0..8e8d38cc1b6 100644
--- a/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc
+++ b/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc
@@ -24,7 +24,6 @@ project(*Server): strategies, taoexe, portableserver {
 
 project(*Client): strategies, taoexe, portableserver {
   after += *idl
-  after += *Server
   Source_Files {
     test_i.cpp
     client.cpp
diff --git a/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc b/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc
index a07b5d528e7..0327652d82d 100644
--- a/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc
+++ b/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc
@@ -30,7 +30,6 @@ project(*Server): taoserver, messaging {
 project(*Scavenger): taoserver, messaging {
   exename = scavenger
   after += *idl
-  after += *Server
   Source_Files {
     scavenger.cpp
   }
@@ -45,7 +44,6 @@ project(*Scavenger): taoserver, messaging {
 project(*Client): taoserver, messaging {
   exename = client
   after += *idl
-  after += *Scavenger
   Source_Files {
     Clock_Ticks.cpp
     Client_Peer.cpp
diff --git a/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc b/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc
index aa28b25107f..bbcbfa8e1b6 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc
+++ b/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/OBV/Any/OBV_Any.mpc b/TAO/tests/OBV/Any/OBV_Any.mpc
index 2abb441e87a..62c4c16ad8f 100644
--- a/TAO/tests/OBV/Any/OBV_Any.mpc
+++ b/TAO/tests/OBV/Any/OBV_Any.mpc
@@ -22,7 +22,6 @@ project(*Server): taoexe, portableserver, valuetype {
 
 project(*Client): taoexe, valuetype {
   after += *idl
-  after += *Server
   Source_Files {
     AnyC.cpp
     client.cpp
diff --git a/TAO/tests/OBV/Factory/OBV_Factory.mpc b/TAO/tests/OBV/Factory/OBV_Factory.mpc
index b12ca4f383f..9e3d394d840 100644
--- a/TAO/tests/OBV/Factory/OBV_Factory.mpc
+++ b/TAO/tests/OBV/Factory/OBV_Factory.mpc
@@ -25,7 +25,6 @@ project(*Server): taoserver, valuetype {
 
 project(*Client): taoclient, valuetype {
   after += *idl
-  after += *Server
   Source_Files {
     FactoryC_impl.cpp
     client.cpp
diff --git a/TAO/tests/OBV/Forward/OBV_Forward.mpc b/TAO/tests/OBV/Forward/OBV_Forward.mpc
index 5068a915e27..e59ee7d2022 100644
--- a/TAO/tests/OBV/Forward/OBV_Forward.mpc
+++ b/TAO/tests/OBV/Forward/OBV_Forward.mpc
@@ -30,7 +30,6 @@ project(*Server): taoserver, valuetype {
 
 project(*Client): taoclient, valuetype {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc b/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc
index 27e71e69ea6..075cfc0f63c 100644
--- a/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc
+++ b/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver, valuetype {
 
 project(*Client): taoclient, valuetype {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc b/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc
index 9d26a4b386b..a72132366a8 100644
--- a/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc
+++ b/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc
@@ -27,7 +27,6 @@ project(*Server): taoexe, portableserver, valuetype {
 
 project(*Client): taoexe, valuetype {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/OBV/ValueBox/valuebox.mpc b/TAO/tests/OBV/ValueBox/valuebox.mpc
index f776106f692..27a4e43e502 100644
--- a/TAO/tests/OBV/ValueBox/valuebox.mpc
+++ b/TAO/tests/OBV/ValueBox/valuebox.mpc
@@ -33,7 +33,6 @@ project(*Server): taoserver, valuetype {
 
 project(*Client): taoclient, valuetype {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc b/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
index dbd009c2f59..a7309ca3f19 100644
--- a/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
+++ b/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
@@ -23,7 +23,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Ondemand_Write/Ondemand_Write.mpc b/TAO/tests/Ondemand_Write/Ondemand_Write.mpc
index 066f4725953..533fb3def3b 100644
--- a/TAO/tests/Ondemand_Write/Ondemand_Write.mpc
+++ b/TAO/tests/Ondemand_Write/Ondemand_Write.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
index b2577e7317c..12baf67903d 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
@@ -13,7 +13,7 @@ project(*Server): messaging, taoexe, portableserver {
   Source_Files {
     Oneway_Buffering.cpp
     server.cpp
-  }  
+  }
   Source_Files {
     TestC.cpp
     TestS.cpp
@@ -25,11 +25,10 @@ project(*Server): messaging, taoexe, portableserver {
 project(*Client): messaging, taoexe, portableserver {
   requires += corba_messaging
   after += *idl
-  after += *Server
 
   Source_Files {
     client.cpp
-  }  
+  }
   Source_Files {
     TestC.cpp
   }
@@ -39,11 +38,10 @@ project(*Client): messaging, taoexe, portableserver {
 
 project(*Admin): messaging, taoexe, portableserver {
   after += *idl
-  after += *Client
   Source_Files {
     Oneway_Buffering_Admin.cpp
     admin.cpp
-  }  
+  }
   Source_Files {
     TestC.cpp
     TestS.cpp
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc b/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
index 2f2b3a6e1c7..08a9bf7fa30 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
+++ b/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
@@ -25,7 +25,6 @@ project(*Server): taoserver {
 
 project(*Client): taoexe, portableserver {
   after += *idl
-  after += *Server
   Source_Files {
     Client_Task.cpp
     Server_Task.cpp
diff --git a/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc b/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc
index a3db1635f9c..37d0a5378af 100644
--- a/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc
+++ b/TAO/tests/POA/EndpointPolicy/EndpointPolicy.mpc
@@ -25,7 +25,6 @@ project(*Server): taoserver, endpointpolicy, pi_server, avoids_minimum_corba, av
 
 project(*Client): taoclient {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc b/TAO/tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc
index c81746d1e47..6b71b6b4c45 100644
--- a/TAO/tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc
+++ b/TAO/tests/Parallel_Connect_Strategy/Parallel_Connect_Strategy.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver, iortable {
 
 project(*Client): taoclient {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc b/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc
index 0604ee09b21..8c21f40315e 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc
+++ b/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc
@@ -30,7 +30,6 @@ project(*Server): taoserver, pi_server, interceptors {
 
 project(*Client): taoclient, pi, interceptors {
   after += *idl
-  after += *Server
   Source_Files {
     client_interceptors.cpp
     marker.cpp
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc b/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc
index e631e5a425a..395e526a9f0 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc
@@ -26,7 +26,6 @@ project(*Server): taoserver, pi_server, interceptors {
 
 project(*Client): taoclient, pi, interceptors {
   after += *idl
-  after += *Server
   Source_Files {
     Client_ORBInitializer.cpp
     client_interceptor.cpp
diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Bug_2510_Regression.mpc b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Bug_2510_Regression.mpc
index f1de1f0c531..3063d6f4817 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Bug_2510_Regression.mpc
+++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Bug_2510_Regression.mpc
@@ -26,7 +26,6 @@ project(*Server): taoserver, pi_server, interceptors {
 
 project(*Client): taoclient, pi, interceptors {
   after += *idl
-  after += *Server
   Source_Files {
     Client_ORBInitializer.cpp
     client_interceptor.cpp
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc b/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc
index 05a373172fb..8ea24af1d2a 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc
+++ b/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc
@@ -28,7 +28,6 @@ project(*Server): taoserver, pi_server, interceptors {
 
 project(*Client): taoclient, pi, interceptors {
   after += *idl
-  after += *Server
   Source_Files {
     client_interceptor.cpp
     Echo_Client_ORBInitializer.cpp
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc b/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc
index 4c941060cd3..d4237b06ce8 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc
@@ -27,8 +27,7 @@ project(*Server): taoserver, valuetype, pi, pi_server, interceptors {
 
 project(*Client): taoclient, valuetype, pi, pi_server, interceptors {
   after += *idl
-  after += *Server
-  
+
   Source_Files {
     Client_ORBInitializer.cpp
     Client_Request_Interceptor.cpp
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc b/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
index 260a73794bd..cd6f166d8e8 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
@@ -26,7 +26,6 @@ project(*Server): taoserver, iorinterceptor, interceptors {
 
 project(*Client): taoclient, pi, interceptors {
   after += *idl
-  after += *Server
   Source_Files {
     FOO_Client_ORBInitializer.cpp
     FOO_ClientRequestInterceptor.cpp
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc b/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc
index c638d946a1a..b2eda2bb410 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc
+++ b/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc
@@ -27,7 +27,6 @@ project(*Server): taoserver, pi_server, interceptors {
 
 project(*Client): taoclient, pi, interceptors {
   after += *idl
-  after += *Server
   Source_Files {
     ClientORBInitializer.cpp
     ClientRequestInterceptor.cpp
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc
index a93b7879472..f9487f30468 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc
@@ -28,7 +28,6 @@ project(*Server): taoserver, pi_server, interceptors {
 
 project(*Client): taoclient, pi, interceptors {
   after += *idl
-  after += *Server
   Source_Files {
     Client_ORBInitializer.cpp
     Client_Request_Interceptor.cpp
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
index 495f722563e..395e526a9f0 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
@@ -25,7 +25,7 @@ project(*Server): taoserver, pi_server, interceptors {
 }
 
 project(*Client): taoclient, pi, interceptors {
-  after += *Server
+  after += *idl
   Source_Files {
     Client_ORBInitializer.cpp
     client_interceptor.cpp
diff --git a/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc b/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc
index b0b7fbf765a..4c00f78eff3 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc
+++ b/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc
@@ -23,7 +23,6 @@ project(*Server): rt_server {
 
 project(*Client): rt_client {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc
index 92db4d3ae99..42e9f95661a 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc
+++ b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc
@@ -20,7 +20,7 @@ project(*Server): rt_server {
 }
 
 project(*Client): rt_client, interceptors {
-  after += *Server
+  after += *idl
   Source_Files {
     testC.cpp
     interceptors.cpp
diff --git a/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc b/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc
index 768b49acf2f..2a58e30e83f 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc
+++ b/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc
@@ -23,7 +23,6 @@ project(*Server): strategies, rt_server {
 
 project(*Client): strategies, rt_client {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc
index b5e0ed23f6d..c08dbc630cd 100644
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc
+++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc
@@ -24,7 +24,6 @@ project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_co
 
 project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc
index 9cd33a6af63..9f222f50a1e 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc
+++ b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc
@@ -23,7 +23,6 @@ project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_co
 
 project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
index 1aa4e9117dd..dad4a066bc3 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
+++ b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
@@ -23,7 +23,6 @@ project(*Server): rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoid
 
 project(*Client): rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc
index 7c92380ae57..7fe1672ae73 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc
@@ -23,7 +23,6 @@ project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_co
 
 project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
index 1aa4e9117dd..dad4a066bc3 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
+++ b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
@@ -23,7 +23,6 @@ project(*Server): rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoid
 
 project(*Client): rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
index 4ac469e8021..5040de044de 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
+++ b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
@@ -23,7 +23,6 @@ project(*Server): rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoid
 
 project(*Client): rt_client {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc
index b5e0ed23f6d..c08dbc630cd 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc
@@ -24,7 +24,6 @@ project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_co
 
 project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
index 21db1ec8e87..6b2f5be9e36 100644
--- a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
+++ b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
@@ -23,7 +23,6 @@ project(*Server): rt_server, avoids_minimum_corba, avoids_corba_e_compact, avoid
 
 project(*Client): rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc
index d467c773e74..45c49c24cf6 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc
@@ -21,7 +21,6 @@ project(*Server): rt_server, strategies, portableserver, avoids_minimum_corba, a
 
 project(*Client): rt_client, strategies, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc b/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc
index b0b7fbf765a..4c00f78eff3 100644
--- a/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc
+++ b/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc
@@ -23,7 +23,6 @@ project(*Server): rt_server {
 
 project(*Client): rt_client {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
index 276def8a366..2d81c7c0606 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
+++ b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
@@ -23,7 +23,6 @@ project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_co
 
 project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
index b5e0ed23f6d..c08dbc630cd 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
+++ b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
@@ -24,7 +24,6 @@ project(*Server): strategies, rt_server, avoids_minimum_corba, avoids_corba_e_co
 
 project(*Client): strategies, rt_client, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc b/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc
index 63e7ef77111..8b23bb0292a 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc
@@ -25,7 +25,6 @@ project(*Server): rtscheduling_server {
 
 project(*Client) : rtscheduling_client {
   after += *idl
-  after += *Server
   Source_Files {
     ../Scheduler.cpp
     test_client.cpp
@@ -36,5 +35,5 @@ project(*Client) : rtscheduling_client {
   IDL_Files {
   }
 
-  exename = Scheduler_Interceptor_Client 
+  exename = Scheduler_Interceptor_Client
 }
diff --git a/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc b/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc
index ddd2850b59d..6442a2c5b15 100644
--- a/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc
+++ b/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc
@@ -29,7 +29,6 @@ project(*Server): taoserver, messaging {
 
 project(*Client): messaging, taoexe, portableserver {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc b/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc
index ccd43fa8b3a..0062f6026ca 100644
--- a/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc
+++ b/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Server_Leaks/Server_Leaks.mpc b/TAO/tests/Server_Leaks/Server_Leaks.mpc
index 53fb1e76d71..464133475b6 100644
--- a/TAO/tests/Server_Leaks/Server_Leaks.mpc
+++ b/TAO/tests/Server_Leaks/Server_Leaks.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Single_Read/Single_Read.mpc b/TAO/tests/Single_Read/Single_Read.mpc
index 574cb13c894..f685a64e73e 100644
--- a/TAO/tests/Single_Read/Single_Read.mpc
+++ b/TAO/tests/Single_Read/Single_Read.mpc
@@ -24,7 +24,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc b/TAO/tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc
index 99fe5efed3b..920c81e7db3 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc
+++ b/TAO/tests/Smart_Proxies/Benchmark/SP_Benchmark.mpc
@@ -23,7 +23,6 @@ project(*Server): taoserver, smart_proxies {
 
 project(*Client): taoclient, smart_proxies {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
     Smart_Proxy_Impl.cpp
diff --git a/TAO/tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc b/TAO/tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc
index dfa4bfcc30c..d9f66a381ff 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc
+++ b/TAO/tests/Smart_Proxies/On_Demand/SP_On_Demand.mpc
@@ -23,7 +23,6 @@ project(*Server): taoserver, smart_proxies {
 
 project(*Client): taoclient, smart_proxies {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
     Smart_Proxy_Impl.cpp
diff --git a/TAO/tests/Smart_Proxies/Policy/SP_Policy.mpc b/TAO/tests/Smart_Proxies/Policy/SP_Policy.mpc
index 99fe5efed3b..920c81e7db3 100644
--- a/TAO/tests/Smart_Proxies/Policy/SP_Policy.mpc
+++ b/TAO/tests/Smart_Proxies/Policy/SP_Policy.mpc
@@ -23,7 +23,6 @@ project(*Server): taoserver, smart_proxies {
 
 project(*Client): taoclient, smart_proxies {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
     Smart_Proxy_Impl.cpp
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxies.mpc b/TAO/tests/Smart_Proxies/Smart_Proxies.mpc
index bc4e7c42743..2529b667c8d 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxies.mpc
+++ b/TAO/tests/Smart_Proxies/Smart_Proxies.mpc
@@ -23,7 +23,6 @@ project(*Server): taoserver, smart_proxies {
 
 project(*Client): taoclient, smart_proxies {
   after += *idl
-  after += *Server
   Source_Files {
     Smart_Proxy_Impl.cpp
     client.cpp
diff --git a/TAO/tests/Smart_Proxies/dtor/dtor.mpc b/TAO/tests/Smart_Proxies/dtor/dtor.mpc
index 9feea5cd714..c672d6d72fd 100644
--- a/TAO/tests/Smart_Proxies/dtor/dtor.mpc
+++ b/TAO/tests/Smart_Proxies/dtor/dtor.mpc
@@ -22,7 +22,6 @@ project(*Server): taoserver, smart_proxies {
 
 project(*Client): taoclient, anytypecode, smart_proxies {
   after += *idl
-  after += *Server
   Source_Files {
     Smart_Proxy_Impl.cpp
     client.cpp
diff --git a/TAO/tests/Stack_Recursion/Stack_Recursion.mpc b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
index 960ceb8a921..e9da8b404fa 100644
--- a/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
+++ b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
@@ -25,7 +25,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
     Client_Task.cpp
diff --git a/TAO/tests/Strategies/Strategies.mpc b/TAO/tests/Strategies/Strategies.mpc
index 86d4366c856..761fbd75754 100644
--- a/TAO/tests/Strategies/Strategies.mpc
+++ b/TAO/tests/Strategies/Strategies.mpc
@@ -24,7 +24,6 @@ project(*Server): strategies, messaging, taoserver {
 
 project(*Client): strategies, messaging, taoexe, portableserver {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc b/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc
index 7dbf0e839ef..2d77d46c332 100644
--- a/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc
+++ b/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc
@@ -24,7 +24,6 @@ project(*Server): messaging, taoexe, portableserver {
 
 project(*Client): messaging, taoexe, portableserver {
   after += *idl
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Two_Objects/Two_Objects.mpc b/TAO/tests/Two_Objects/Two_Objects.mpc
index 3f4af7ac7b9..6739a263ca4 100644
--- a/TAO/tests/Two_Objects/Two_Objects.mpc
+++ b/TAO/tests/Two_Objects/Two_Objects.mpc
@@ -25,7 +25,6 @@ project(*Server): taoserver {
 
 project(*Client): taoclient, anytypecode {
   after += *idl
-  after += *Server
   Source_Files {
     Two_ObjectsC.cpp
     client.cpp
diff --git a/TAO/tests/Typedef_String_Array/typedef_string_array.mpc b/TAO/tests/Typedef_String_Array/typedef_string_array.mpc
index c01bab7197e..fbd82f97a5f 100644
--- a/TAO/tests/Typedef_String_Array/typedef_string_array.mpc
+++ b/TAO/tests/Typedef_String_Array/typedef_string_array.mpc
@@ -24,7 +24,6 @@ project(*server): taoserver {
 
 project(*client): taoclient, anytypecode {
   after += *idl
-  after += *server
   Source_Files {
     client.cpp
   }