Wed Nov 12 16:55:00 2003 Justin Michel <michel_j@ociweb.com>

13 files changed, 23 insertions, 25 deletions

diff --git a/TAO/tests/POA/Current/Current.mpc b/TAO/tests/POA/Current/Current.mpc
index 5a360da82df..462f32a40ae 100644
--- a/TAO/tests/POA/Current/Current.mpc
+++ b/TAO/tests/POA/Current/Current.mpc
@@ -1,3 +1,2 @@
-project(POA Current): taoserver {
-  exename = Current
+project(POA*): taoexe, portableserver {
 }
diff --git a/TAO/tests/POA/Etherealization/Etherealization.mpc b/TAO/tests/POA/Etherealization/Etherealization.mpc
index ab5fa6d562e..64db1d3e919 100644
--- a/TAO/tests/POA/Etherealization/Etherealization.mpc
+++ b/TAO/tests/POA/Etherealization/Etherealization.mpc
@@ -1,3 +1,2 @@
-project(POA Etherealization): taoserver, minimum_corba {
-  exename = Etherealization
+project(POA*): taoexe, portableserver, minimum_corba {
 }
diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc
index 005c4729836..462f32a40ae 100644
--- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc
+++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.mpc
@@ -1,3 +1,2 @@
-project(POA Excessive Object Deactivations): taoserver {
-  exename = Excessive_Object_Deactivations
+project(POA*): taoexe, portableserver {
 }
diff --git a/TAO/tests/POA/Identity/Identity.mpc b/TAO/tests/POA/Identity/Identity.mpc
index cc20a8ce1c2..462f32a40ae 100644
--- a/TAO/tests/POA/Identity/Identity.mpc
+++ b/TAO/tests/POA/Identity/Identity.mpc
@@ -1,3 +1,2 @@
-project(POA Identity): taoserver {
-  exename = Identity
+project(POA*): taoexe, portableserver {
 }
diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc
index e1fab62dea6..462f32a40ae 100644
--- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc
+++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc
@@ -1,4 +1,2 @@
-project(POA MT Servant Locator): taoserver {
-  exename = MT_Servant_Locator
-  avoids += minimum_corba
+project(POA*): taoexe, portableserver {
 }
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 d5c56e620c6..64db1d3e919 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,3 +1,2 @@
-project(Nested Non Servant Upcalls): server, minimum_corba {
-  exename = Nested_Non_Servant_Upcalls
+project(POA*): taoexe, portableserver, minimum_corba {
 }
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 f07dc96ddb7..462f32a40ae 100644
--- a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc
+++ b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.mpc
@@ -1,3 +1,2 @@
-project(POA Non Servant Upcalls): taoserver {
-  exename = Non_Servant_Upcalls
+project(POA*): taoexe, portableserver {
 }
diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc
index fafe1e95a4d..462f32a40ae 100644
--- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc
+++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.mpc
@@ -1,3 +1,2 @@
-project(POA Object Reactivation): taoserver {
-  exename = Object_Reactivation
+project(POA*): taoexe, portableserver {
 }
diff --git a/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc b/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc
index c0b69b2d352..462f32a40ae 100644
--- a/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc
+++ b/TAO/tests/POA/POA_Destruction/POA_Destruction.mpc
@@ -1,3 +1,2 @@
-project(POA Destruction): taoserver {
-  exename = POA_Destruction
+project(POA*): taoexe, portableserver {
 }
diff --git a/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc b/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc
new file mode 100644
index 00000000000..5750a6ef70e
--- /dev/null
+++ b/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc
@@ -0,0 +1,11 @@
+project(POA_server*): taoexe, portableserver {
+  Source_Files {
+    server.cpp
+  }
+}
+
+project(POA_client*): taoexe, portableserver {
+  Source_Files {
+    client.cpp
+  }
+}
diff --git a/TAO/tests/POA/Policies/Policies.mpc b/TAO/tests/POA/Policies/Policies.mpc
index 6f40c6c3bf5..462f32a40ae 100644
--- a/TAO/tests/POA/Policies/Policies.mpc
+++ b/TAO/tests/POA/Policies/Policies.mpc
@@ -1,3 +1,2 @@
-project(POA Policies): taoserver {
-  exename = Policies
+project(POA*): taoexe, portableserver {
 }
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 1ad01c3e08a..64db1d3e919 100644
--- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc
+++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.mpc
@@ -1,3 +1,2 @@
-project(POA Single Threaded POA): taoserver, minimum_corba {
-  exename = Single_Threaded_POA
+project(POA*): taoexe, portableserver, minimum_corba {
 }
diff --git a/TAO/tests/POA/wait_for_completion/wait_for_completion.mpc b/TAO/tests/POA/wait_for_completion/wait_for_completion.mpc
index 2dbe599e6c5..462f32a40ae 100644
--- a/TAO/tests/POA/wait_for_completion/wait_for_completion.mpc
+++ b/TAO/tests/POA/wait_for_completion/wait_for_completion.mpc
@@ -1,3 +1,2 @@
-project(POA Wait For Completion): taoserver {
-  exename = wait_for_completion
+project(POA*): taoexe, portableserver {
 }