Tue Jul 3 18:25:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

29 files changed, 51 insertions, 45 deletions

diff --git a/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc b/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc
index fadcb8f6726..e14b0303f42 100644
--- a/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc
+++ b/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc
@@ -33,7 +33,8 @@ project(*Client): taoclient, messaging {
   }
 }
 
-project(*Shutdown): taoexe, messaging {
+project(*Shutdown): taoclient, messaging {
+  exename = shutdown
   after += *idl
   Source_Files {
     TestC.cpp
diff --git a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc
index 466c1faab7c..e2c4e4f5bb7 100644
--- a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc
+++ b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc
@@ -35,7 +35,8 @@ project(*Client): taoclient, messaging {
   }
 }
 
-project(*Shutdown): taoexe, messaging {
+project(*Shutdown): taoclient, messaging {
+  exename = shutdown
   after += *idl
   Source_Files {
     TestC.cpp
diff --git a/TAO/tests/Bug_2702_Regression/CloseConnection.mpc b/TAO/tests/Bug_2702_Regression/CloseConnection.mpc
index 9ec64bd7118..4c6a2195e37 100644
--- a/TAO/tests/Bug_2702_Regression/CloseConnection.mpc
+++ b/TAO/tests/Bug_2702_Regression/CloseConnection.mpc
@@ -1,8 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Client): taoexe {
-  exename = client
+project(*Client): taoclient {
   idlflags += -GA
 
   Source_Files {
diff --git a/TAO/tests/Bug_2791_Regression/Bug_2791_Regression.mpc b/TAO/tests/Bug_2791_Regression/Bug_2791_Regression.mpc
index 7668149f4dd..17202f8c259 100755
--- a/TAO/tests/Bug_2791_Regression/Bug_2791_Regression.mpc
+++ b/TAO/tests/Bug_2791_Regression/Bug_2791_Regression.mpc
@@ -1,15 +1,14 @@
 // -*- MPC -*-
-// $Id:$
+// $Id$
 
 
-project (*client) : taoexe, valuetype {
-   exename    = client
+project (*client) : taoclient, valuetype {
    libpaths   += $(ACE_ROOT)/ace $(TAO_ROOT)/tao/PortableServer $(TAO_ROOT)/tao/IORInterceptor $(TAO_ROOT)/tao/ObjRefTemplate $(TAO_ROOT)/tao/Valuetype $(TAO_ROOT)/tao/IORTable $(TAO_ROOT)/tao $(TAO_ROOT)/lib
 
    IDL_Files {
       Message.idl
    }
-   
+
    Source_Files {
       MessageC.cpp
       Message_i.cpp
diff --git a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc
index 241810bc49d..f59b20036bd 100644
--- a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc
+++ b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc
@@ -34,7 +34,8 @@ project(*Client): taoclient, messaging, avoids_minimum_corba, avoids_corba_e_com
   }
 }
 
-project(*Gateway): taoexe, portableserver, messaging, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, dynamicinterface {
+project(*Gateway): taoserver, messaging, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, dynamicinterface {
+  exename = gateway
   after += *idl
   Source_Files {
     test_dsi.cpp
diff --git a/TAO/tests/Faults/Faults.mpc b/TAO/tests/Faults/Faults.mpc
index 076630d50cc..4ede4b6893f 100644
--- a/TAO/tests/Faults/Faults.mpc
+++ b/TAO/tests/Faults/Faults.mpc
@@ -56,7 +56,8 @@ project(*Client): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoid
   }
 }
 
-project(*Ping): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*Ping): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+  exename = ping
   after += *idl
 
   Source_Files {
@@ -71,7 +72,8 @@ 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 {
+project(*Pong): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+  exename = pong
   after += *idl
 
   Source_Files {
diff --git a/TAO/tests/IDL_Test/IDL_Test.mpc b/TAO/tests/IDL_Test/IDL_Test.mpc
index 0d0a79df438..b9c3c2561d4 100644
--- a/TAO/tests/IDL_Test/IDL_Test.mpc
+++ b/TAO/tests/IDL_Test/IDL_Test.mpc
@@ -30,7 +30,7 @@ project(*Main): taoserver, messaging, gen_ostream {
     reopen_include2.idl
     typeprefix.idl
   }
-  
+
   // We leave the hard-coded -Gos (hard-coded for
   // the other IDL files) off the command line for
   // this file, since it references a basic type IDL
diff --git a/TAO/tests/IORManipulation/filter/IORManip_Filter_Test.mpc b/TAO/tests/IORManipulation/filter/IORManip_Filter_Test.mpc
index 8be787dc40c..93ca0316852 100644
--- a/TAO/tests/IORManipulation/filter/IORManip_Filter_Test.mpc
+++ b/TAO/tests/IORManipulation/filter/IORManip_Filter_Test.mpc
@@ -1,6 +1,5 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, iormanip {
-  exename = server
+project(*Server): taoserver, iormanip {
 }
diff --git a/TAO/tests/LongDouble/LongDoubleTest.mpc b/TAO/tests/LongDouble/LongDoubleTest.mpc
index 6a0e1879a52..fd1a8ea4dfc 100644
--- a/TAO/tests/LongDouble/LongDoubleTest.mpc
+++ b/TAO/tests/LongDouble/LongDoubleTest.mpc
@@ -6,8 +6,7 @@ project(*idl): taoidldefaults {
 }
 
 
-project(*Server): taoexe, portableserver {
-  exename = server
+project(*Server): taoserver {
   after  += *idl
 
   IDL_Files {
@@ -22,8 +21,7 @@ project(*Server): taoexe, portableserver {
   }
 }
 
-project(*Client): taoexe {
-  exename = client
+project(*Client): taoclient {
   after  += *idl
 
   IDL_Files {
diff --git a/TAO/tests/MT_BiDir/MT_BiDir.mpc b/TAO/tests/MT_BiDir/MT_BiDir.mpc
index f04bbed84ce..17ede79e2ba 100644
--- a/TAO/tests/MT_BiDir/MT_BiDir.mpc
+++ b/TAO/tests/MT_BiDir/MT_BiDir.mpc
@@ -9,7 +9,7 @@ project(*idl): taoidldefaults {
   custom_only = 1
 }
 
-project(*Server): taoexe, portableserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro {
+project(*Server): taoserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro {
   after += *idl
   Source_Files {
     Sender_i.cpp
@@ -25,7 +25,8 @@ project(*Server): taoexe, portableserver, avoids_minimum_corba, bidir_giop, avoi
   }
 }
 
-project(*Client): taoexe, portableserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro {
+project(*Client): taoclient, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro {
+  exename = client
   after += *idl
   Source_Files {
     Client_Task.cpp
diff --git a/TAO/tests/Multiple/Multiple.mpc b/TAO/tests/Multiple/Multiple.mpc
index 830ac51f4ba..9e190d77bc5 100644
--- a/TAO/tests/Multiple/Multiple.mpc
+++ b/TAO/tests/Multiple/Multiple.mpc
@@ -25,7 +25,8 @@ project(*Server): taoserver {
   }
 }
 
-project(*Client): taoexe, portableserver {
+project(*Client): taoserver {
+  exename = client
   after += *idl
 
   Source_Files {
diff --git a/TAO/tests/NestedUpcall/Simple/Simple.mpc b/TAO/tests/NestedUpcall/Simple/Simple.mpc
index fa21574183c..ec285b86e6b 100644
--- a/TAO/tests/NestedUpcall/Simple/Simple.mpc
+++ b/TAO/tests/NestedUpcall/Simple/Simple.mpc
@@ -8,7 +8,7 @@ project(*Nested_Upcall_Idl): taoidldefaults {
   custom_only = 1
 }
 
-project(*Nested_Upcall_Server): taoexe, portableserver {
+project(*Nested_Upcall_Server): taoserver {
   after += *Nested_Upcall_Idl
   Source_Files {
     testC.cpp
@@ -20,9 +20,9 @@ project(*Nested_Upcall_Server): taoexe, portableserver {
   }
 }
 
-project(*Nested_Upcall_Client): taoexe, portableserver {
+project(*Nested_Upcall_Client): taoserver {
+  exename = client
   after += *Nested_Upcall_Idl
-  after += *Nested_Upcall_Server
   Source_Files {
     testC.cpp
     testS.cpp
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc b/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc
index f84ff97433a..7d62074dd0d 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc
+++ b/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc
@@ -38,7 +38,8 @@ project(*Nested_Upcall_Server_B): taoserver, utils, avoids_corba_e_micro {
   }
 }
 
-project(*Nested_Upcall_Initiator): taoexe, utils, portableserver, avoids_corba_e_micro {
+project(*Nested_Upcall_Initiator): taoserver, utils, avoids_corba_e_micro {
+  exename = initiator
   after += *Nested_Upcall_Server_Idl
   Source_Files {
     Initiator_i.cpp
diff --git a/TAO/tests/OBV/Any/OBV_Any.mpc b/TAO/tests/OBV/Any/OBV_Any.mpc
index 62c4c16ad8f..cb7c8c9ef6c 100644
--- a/TAO/tests/OBV/Any/OBV_Any.mpc
+++ b/TAO/tests/OBV/Any/OBV_Any.mpc
@@ -8,7 +8,7 @@ project(*idl): taoidldefaults, valuetype {
   custom_only = 1
 }
 
-project(*Server): taoexe, portableserver, valuetype {
+project(*Server): taoserver, valuetype {
   after += *idl
   Source_Files {
     AnyC.cpp
@@ -20,7 +20,7 @@ project(*Server): taoexe, portableserver, valuetype {
   }
 }
 
-project(*Client): taoexe, valuetype {
+project(*Client): taoclient, valuetype {
   after += *idl
   Source_Files {
     AnyC.cpp
diff --git a/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc b/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc
index a72132366a8..d6b4c90da6e 100644
--- a/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc
+++ b/TAO/tests/OBV/Truncatable/OBV_Truncatable.mpc
@@ -9,7 +9,7 @@ project(*idl): taoidldefaults, valuetype {
   custom_only = 1
 }
 
-project(*Server): taoexe, portableserver, valuetype {
+project(*Server): taoserver, valuetype {
   after += *idl
   Source_Files {
     TruncatableS_impl.cpp
@@ -25,7 +25,7 @@ project(*Server): taoexe, portableserver, valuetype {
   }
 }
 
-project(*Client): taoexe, valuetype {
+project(*Client): taoclient, valuetype {
   after += *idl
   Source_Files {
     client.cpp
diff --git a/TAO/tests/ORB_destroy/ORB_destroy.mpc b/TAO/tests/ORB_destroy/ORB_destroy.mpc
index bcd635980b8..4665ebfdacc 100644
--- a/TAO/tests/ORB_destroy/ORB_destroy.mpc
+++ b/TAO/tests/ORB_destroy/ORB_destroy.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoexe, portableserver {
+project: taoserver {
   exename = ORB_destroy
 }
 
diff --git a/TAO/tests/ORB_init/Portspan/ORB_Init_Portspan.mpc b/TAO/tests/ORB_init/Portspan/ORB_Init_Portspan.mpc
index ad9590d0dc2..2454cd6de7a 100644
--- a/TAO/tests/ORB_init/Portspan/ORB_Init_Portspan.mpc
+++ b/TAO/tests/ORB_init/Portspan/ORB_Init_Portspan.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
 }
 
diff --git a/TAO/tests/Object_Loader/Object_Loader.mpc b/TAO/tests/Object_Loader/Object_Loader.mpc
index a008ebf89a3..326dbb62346 100644
--- a/TAO/tests/Object_Loader/Object_Loader.mpc
+++ b/TAO/tests/Object_Loader/Object_Loader.mpc
@@ -11,7 +11,8 @@ project(*Test): taolib_with_idl, portableserver {
   }
 }
 
-project(*Driver): taoexe, portableserver {
+project(*Driver): taoserver {
+  exename = driver
   after += *Test
   Source_Files {
     TestC.cpp
diff --git a/TAO/tests/Oneway_Timeouts/test.mpc b/TAO/tests/Oneway_Timeouts/test.mpc
index 7563dc9d021..cf7dcc95795 100644
--- a/TAO/tests/Oneway_Timeouts/test.mpc
+++ b/TAO/tests/Oneway_Timeouts/test.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project (*client) : taoexe, messaging, portableserver, strategies {
+project (*client) : taoserver, messaging, strategies {
   exename = client
   after = *server
   source_files {
diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc
index fa91d48fdd2..9d66d52ba76 100644
--- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc
+++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA*): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(POA*): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   exename = Nested_Non_Servant_Upcalls
 }
diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc
index bf60d1bc2a9..5c7c5dfdef0 100644
--- a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc
+++ b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA*): taoexe, portableserver {
+project(POA*): taoserver {
   exename = Non_Servant_Upcalls
 }
diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc
index df60a5a9e5b..6906d0d5e2c 100644
--- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc
+++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA*): taoexe, portableserver, avoids_corba_e_micro {
+project(POA*): taoserver, avoids_corba_e_micro {
   exename = Object_Reactivation
 }
diff --git a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc
index 80938f19cb2..eda1c8db7aa 100644
--- a/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc
+++ b/TAO/tests/POA/POAManagerFactory/POAManagerFactory.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA*): taoexe, portableserver, pi_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(POA*): taoserver, pi_server, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   exename = POAManagerFactory
 }
diff --git a/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc b/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc
index 60afe95116e..8c38573927a 100644
--- a/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc
+++ b/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA*): taoexe, portableserver {
+project(POA*): taoserver {
   exename = POA_Destruction
 }
diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc
index 63bb144e5a8..558e66bb88e 100644
--- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc
+++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA*): taoexe, portableserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(POA*): taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   exename = Single_Threaded_POA
 }
diff --git a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/AO_Multiple_ORBs.mpc b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/AO_Multiple_ORBs.mpc
index a72a8358a99..85905a99a88 100644
--- a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/AO_Multiple_ORBs.mpc
+++ b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/AO_Multiple_ORBs.mpc
@@ -1,5 +1,5 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoexe, rtportableserver {
+project: taoserver {
 }
diff --git a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc
index c511c917983..7a279703240 100644
--- a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc
+++ b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc
@@ -8,7 +8,8 @@ project(*idl): taoidldefaults {
   custom_only = 1
 }
 
-project(*client) : taoexe, portableserver, rtcorba, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*client) : taoserver, rtcorba, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+  exename = client
   after += *idl
   source_files {
     client.cpp
@@ -21,7 +22,7 @@ project(*client) : taoexe, portableserver, rtcorba, avoids_minimum_corba, avoids
   }
 }
 
-project(*server) : taoexe, rtportableserver, rtcorba, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
+project(*server) : taoserver, rtcorba, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
   after += *idl
   source_files {
     server.cpp
diff --git a/TAO/tests/Strategies/Strategies.mpc b/TAO/tests/Strategies/Strategies.mpc
index 761fbd75754..df4ff8ecdf3 100644
--- a/TAO/tests/Strategies/Strategies.mpc
+++ b/TAO/tests/Strategies/Strategies.mpc
@@ -22,7 +22,8 @@ project(*Server): strategies, messaging, taoserver {
   }
 }
 
-project(*Client): strategies, messaging, taoexe, portableserver {
+project(*Client): strategies, messaging, taoserver {
+  exename = client
   after += *idl
   Source_Files {
     client.cpp
diff --git a/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc b/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc
index cbfa1580e94..5d3847ad5f6 100644
--- a/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc
+++ b/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, tao_xtresource, ace_motif {
+project(*Server): taoserver, tao_xtresource, ace_motif {
   Source_Files {
     test_i.cpp
     Stopwatch_display.cpp
@@ -10,7 +10,7 @@ project(*Server): taoexe, portableserver, tao_xtresource, ace_motif {
   }
 }
 
-project(*Client): taoexe, tao_xtresource, ace_motif {
+project(*Client): taoclient, tao_xtresource, ace_motif {
   after += *Server
   Source_Files {
     testC.cpp