ChangeLogTag:Thu Dec 8 06:45:36 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

8 files changed, 27 insertions, 6 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 3cb81fb837f..6f1df5d8568 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,15 @@
+Thu Dec  8 06:45:36 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+	* tests/OctetSeq/OctetSeq.mpc:
+	* performance-tests/Anyop/Anyop.mpc:
+	* performance-tests/POA/Create_Reference/Create_Reference.mpc:
+	* performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc:
+	* performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc:
+	* performance-tests/Protocols/Protocols.mpc:
+	* performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc:
+
+	  Disable these projects when "ace_for_tao" is enabled.
+
 Wed Dec  7 19:19:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp:
diff --git a/TAO/performance-tests/Anyop/Anyop.mpc b/TAO/performance-tests/Anyop/Anyop.mpc
index 9a936c24fcc..bbf480e5258 100644
--- a/TAO/performance-tests/Anyop/Anyop.mpc
+++ b/TAO/performance-tests/Anyop/Anyop.mpc
@@ -1,5 +1,6 @@
 // $Id$
 project: taoexe, anytypecode {
+  avoids += ace_for_tao
   Source_Files {
     testC.cpp
     anyop.cpp
diff --git a/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc b/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc
index ef17b715328..e0d5963b3d2 100644
--- a/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc
+++ b/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc
@@ -2,5 +2,6 @@
 // $Id$
 
 project: taoserver {
+  avoids += ace_for_tao
   exename = create_reference
 }
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc b/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
index bafe46cd208..b95d547dc66 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
+++ b/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
@@ -27,7 +27,8 @@ project(*server): taoserver {
 }
 
 project(*client): taoclient {
-  after += *idl
+  avoids += ace_for_tao
+  after  += *idl
 
   Source_Files {
     TestC.cpp
@@ -39,8 +40,8 @@ project(*client): taoclient {
 }
 
 project(*collocated): taoserver {
-  after += *idl
-
+  avoids += ace_for_tao
+  after  += *idl
   exename = collocated
   Source_Files {
     Simple.cpp
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc b/TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc
index c0302e86220..3ebd5ff6be4 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/Object_Creation_And_Registration.mpc
@@ -2,5 +2,6 @@
 // $Id$
 
 project(registration): taoexe, portableserver {
+  avoids += ace_for_tao
   exename = registration
 }
diff --git a/TAO/performance-tests/Protocols/Protocols.mpc b/TAO/performance-tests/Protocols/Protocols.mpc
index 4e0c3ec233b..553e3da3634 100644
--- a/TAO/performance-tests/Protocols/Protocols.mpc
+++ b/TAO/performance-tests/Protocols/Protocols.mpc
@@ -9,7 +9,8 @@ project(*IDL): taoidldefaults {
 }
 
 project(*Receiver): taoserver {
-  after += *IDL
+  avoids += ace_for_tao
+  after  += *IDL
   exename = receiver
   Source_Files {
     receiver.cpp
@@ -33,7 +34,8 @@ project(*Distributor): rt_server {
 }
 
 project(*Sender): rt_client {
-  after += *IDL
+  avoids   += ace_for_tao
+  after    += *IDL
   includes += ../../tests/RTCORBA/Diffserv
   Source_Files {
     sender.cpp
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc b/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc
index 851d718f732..2049c723a97 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc
@@ -20,7 +20,8 @@ project(*RTCorba server): rt_server, minimum_corba {
 }
 
 project(*RTCorba client): rt_client, minimum_corba {
-  after += *RTCorba_idl
+  avoids += ace_for_tao
+  after  += *RTCorba_idl
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/OctetSeq/OctetSeq.mpc b/TAO/tests/OctetSeq/OctetSeq.mpc
index 5a2d297780a..4a526ffae60 100644
--- a/TAO/tests/OctetSeq/OctetSeq.mpc
+++ b/TAO/tests/OctetSeq/OctetSeq.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*Server): taoserver {
+  avoids += ace_for_tao
   Source_Files {
     test_i.cpp
     server.cpp
@@ -9,6 +10,7 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
+  avoids += ace_for_tao
   after += *Server
   Source_Files {
     testC.cpp