ChangeLogTag: Fri Jan 7 18:58:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

24 files changed, 43 insertions, 46 deletions

diff --git a/TAO/tests/Abstract_Interface/Abstract_Interface.mpc b/TAO/tests/Abstract_Interface/Abstract_Interface.mpc
index 3844d79fd15..4eeadb14767 100644
--- a/TAO/tests/Abstract_Interface/Abstract_Interface.mpc
+++ b/TAO/tests/Abstract_Interface/Abstract_Interface.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*client) : taoexe, valuetype {
+project(*client) : taoclient, valuetype {
   idlflags += -Sc
 
   IDL_Files {
@@ -18,7 +18,7 @@ project(*client) : taoexe, valuetype {
   }
 }
 
-project(*server) : taoexe, portableserver, valuetype {
+project(*server) : taoserver, valuetype {
   idlflags += -Sc
 
   IDL_Files {
diff --git a/TAO/tests/Bug_1627_Regression/test.mpc b/TAO/tests/Bug_1627_Regression/test.mpc
index 83187aafa6b..76b61adbf38 100644
--- a/TAO/tests/Bug_1627_Regression/test.mpc
+++ b/TAO/tests/Bug_1627_Regression/test.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(Bug_1627_Server): server, iortable {
+project(Bug_1627_Server): taoserver, iortable {
   Source_Files {
     Test_i.cpp
     server.cpp
   }
 }
 
-project(Bug_1627_Client): taoexe {
+project(Bug_1627_Client): taoclient {
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc b/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc
index 52da9feb86c..4f7f1f0064d 100644
--- a/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc
+++ b/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     Hello.cpp
     server.cpp
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc b/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc
index 52da9feb86c..4f7f1f0064d 100644
--- a/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc
+++ b/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     Hello.cpp
     server.cpp
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Connection_Failure/Connection_Failure.mpc b/TAO/tests/Connection_Failure/Connection_Failure.mpc
index 03b90e84370..2e1ace5ef7a 100644
--- a/TAO/tests/Connection_Failure/Connection_Failure.mpc
+++ b/TAO/tests/Connection_Failure/Connection_Failure.mpc
@@ -2,8 +2,6 @@
 // $Id$
 
 project(*client): taoclient {
-  exename  = client
-
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Connection_Purging/Connection_Purging.mpc b/TAO/tests/Connection_Purging/Connection_Purging.mpc
index 799fb514183..ad230187aa7 100644
--- a/TAO/tests/Connection_Purging/Connection_Purging.mpc
+++ b/TAO/tests/Connection_Purging/Connection_Purging.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): strategies, taoexe, portableserver {
+project(*Server): strategies, taoserver {
   Source_Files {
     test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): strategies, taoexe {
+project(*Client): strategies, taoclient {
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Crash_On_Write/Crash_On_Write.mpc b/TAO/tests/Crash_On_Write/Crash_On_Write.mpc
index 460e756b383..0fc5399e880 100644
--- a/TAO/tests/Crash_On_Write/Crash_On_Write.mpc
+++ b/TAO/tests/Crash_On_Write/Crash_On_Write.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     Oneway_Receiver.cpp
     Crash_Task.cpp
@@ -9,7 +9,7 @@ project(*Server): taoexe, portableserver {
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   Source_Files {
     TestC.cpp
     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 2dce3887a98..8857a176fa1 100644
--- a/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc
+++ b/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc
@@ -1,13 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     server.cpp
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   Source_Files {
     timeC.cpp
     client.cpp
diff --git a/TAO/tests/Forwarding/Forwarding.mpc b/TAO/tests/Forwarding/Forwarding.mpc
index c6ee9361ee3..39a1709e261 100644
--- a/TAO/tests/Forwarding/Forwarding.mpc
+++ b/TAO/tests/Forwarding/Forwarding.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, iortable {
+project(*Server): taoserver, iortable {
   Source_Files {
     test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/MT_Timeout/MT_Timeout.mpc b/TAO/tests/MT_Timeout/MT_Timeout.mpc
index 587484ef5c0..71d75c1743c 100644
--- a/TAO/tests/MT_Timeout/MT_Timeout.mpc
+++ b/TAO/tests/MT_Timeout/MT_Timeout.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): messaging, taoexe, portableserver {
+project(*Server): messaging, taoserver {
   Source_Files {
     Sleep_Service.cpp
     Server_Task.cpp
diff --git a/TAO/tests/Multiple/Multiple.mpc b/TAO/tests/Multiple/Multiple.mpc
index 1aa0bb6c352..2584e88308f 100644
--- a/TAO/tests/Multiple/Multiple.mpc
+++ b/TAO/tests/Multiple/Multiple.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   idlflags += -Gd
 
   Source_Files {
diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
index 640bef08880..e0ef7310b31 100644
--- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
+++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
@@ -1,13 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     server.cpp
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   Source_Files {
     Multiple_InheritanceC.cpp
     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 6307a6f623a..a585f7ec595 100644
--- a/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
+++ b/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
index a1a5c4adc6f..361f727f0e8 100644
--- a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
+++ b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   idlflags  = -Ge 0 -Sc
   requires += exceptions
 
@@ -11,7 +11,7 @@ project(*Server): taoexe, portableserver {
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   idlflags  = -Ge 0 -Sc
   requires += exceptions
 
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 6307a6f623a..a585f7ec595 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
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/ORB_shutdown/Foo_Bar.mpc b/TAO/tests/ORB_shutdown/Foo_Bar.mpc
index 8a0676872af..6cbfa60be64 100644
--- a/TAO/tests/ORB_shutdown/Foo_Bar.mpc
+++ b/TAO/tests/ORB_shutdown/Foo_Bar.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(ORB Shutdown Server): taoexe, portableserver {
+project(ORB Shutdown Server): taoserver {
   Source_Files {
     Foo_Bar.cpp
     server.cpp
diff --git a/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc b/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
index 086d31aaa06..4a4d62a720b 100644
--- a/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
+++ b/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
@@ -1,13 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     server.cpp
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/OctetSeq/OctetSeq.mpc b/TAO/tests/OctetSeq/OctetSeq.mpc
index e4193153e55..7df36753283 100644
--- a/TAO/tests/OctetSeq/OctetSeq.mpc
+++ b/TAO/tests/OctetSeq/OctetSeq.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc b/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
index 549b721fe4b..7aef588b5f2 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
+++ b/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     Server_Task.cpp
     Sender_i.cpp
diff --git a/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc b/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc
index 862babe5909..953c3c4b526 100644
--- a/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc
+++ b/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc
@@ -1,15 +1,16 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     Test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): taoexe, portableserver {
+project(*Client): taoclient {
   Source_Files {
+    TestC.cpp
     client.cpp
   }
 }
diff --git a/TAO/tests/Server_Leaks/Server_Leaks.mpc b/TAO/tests/Server_Leaks/Server_Leaks.mpc
index 614e3469e45..db616ea3e82 100644
--- a/TAO/tests/Server_Leaks/Server_Leaks.mpc
+++ b/TAO/tests/Server_Leaks/Server_Leaks.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     Ping_Service.cpp
     server.cpp
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Single_Read/Single_Read.mpc b/TAO/tests/Single_Read/Single_Read.mpc
index 6307a6f623a..a585f7ec595 100644
--- a/TAO/tests/Single_Read/Single_Read.mpc
+++ b/TAO/tests/Single_Read/Single_Read.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Timeout/Timeout.mpc b/TAO/tests/Timeout/Timeout.mpc
index 7dc75345874..926002380e8 100644
--- a/TAO/tests/Timeout/Timeout.mpc
+++ b/TAO/tests/Timeout/Timeout.mpc
@@ -1,16 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): messaging, taoexe, portableserver {
-  requires += corba_messaging
-
+project(*Client): taoclient, messaging {
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Two_Objects/Two_Objects.mpc b/TAO/tests/Two_Objects/Two_Objects.mpc
index b6a8d2ef9fa..1570ccd0f66 100644
--- a/TAO/tests/Two_Objects/Two_Objects.mpc
+++ b/TAO/tests/Two_Objects/Two_Objects.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     worker.cpp
     First_i.cpp
@@ -11,7 +11,7 @@ project(*Server): taoexe, portableserver {
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   Source_Files {
     Two_ObjectsC.cpp
     client.cpp