Thu Apr 13 19:18:22 UTC 2006 Wallace Zhang <zhangw@ociweb.com>

11 files changed, 55 insertions, 6 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 9648dadfd87..c4d501a9706 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,17 +1,32 @@
+Thu Apr 13 19:18:22 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
+
+        * docs/tutorials/Quoter/Simple/Broker/Broker.mpc:
+        * docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc:
+        * examples/BasicSP/BMDevice/BMDevice.mpc:
+        * examples/BasicSP/EC/EC.mpc:
+        * examples/Display/NavDisplay/NavDisplay.mpc:
+        * examples/Hello/Receiver/Receiver.mpc:
+        * examples/Swapping/Receiver/Receiver.mpc:
+        * performance-tests/Benchmark/Benchmark.mpc:
+        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc:
+        * tests/Minimum/Sender/Sender.mpc:
+
+          Avoids building with ace_for_tao.
+
 Apr Thu 13 03:32:35 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
         * ciaosvcs/Events/CIAO_Events.idl
-        
+
           Removed this file.
-        
+
         * ciaosvcs/Events/CIAO_Events.mpc
-        
+
           Modified to put an empty segment of IDL_Files.
 
 Wed Apr 12 17:51:03 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
 
         * NEWS
-        
+
           Updated the NEWS file.
 
 Wed Apr 12 14:47:14 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
@@ -24,7 +39,7 @@ Wed Apr 12 14:47:14 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
         * ciaosvcs/Events/CIAO_Events.mpc
 
         Fixes for linking errors/warnings on OS X builds.
-        
+
 Tue Apr 11 12:39:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tools/Config_Handlers/Utils/Utils.mpc:
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.mpc b/TAO/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.mpc
index 724277307ed..70d9efbce53 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.mpc
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.mpc
@@ -2,6 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p Stock_Base Broker"
 
 project(Stock_Base_Broker_stub): ciao_client_dnc {
+  avoids += ace_for_tao
   after += Stock_Base_stub
   sharedname = Broker_stub
   idlflags += -Wb,stub_export_macro=BROKER_STUB_Export -Wb,stub_export_include=Broker_stub_export.h -Wb,skel_export_macro=BROKER_SVNT_Export -Wb,skel_export_include=Broker_svnt_export.h
@@ -18,6 +19,7 @@ project(Stock_Base_Broker_stub): ciao_client_dnc {
 }
 
 project(Stock_Base_Broker_svnt) : ciao_servant_dnc {
+  avoids += ace_for_tao
   after += Stock_Base_svnt Stock_Base_Broker_stub
   sharedname  = Broker_svnt
   libs    += Broker_stub Stock_Base_stub Stock_Base_svnt
@@ -42,6 +44,7 @@ project(Stock_Base_Broker_svnt) : ciao_servant_dnc {
 
 
 project(Stock_Base_Broker_exec) : ciao_component_dnc {
+  avoids += ace_for_tao
   after   += Stock_Base_Broker_svnt
   sharedname = Broker_exec
   libs      += Broker_stub Broker_svnt Stock_Base_stub Stock_Base_svnt
@@ -61,6 +64,7 @@ project(Stock_Base_Broker_exec) : ciao_component_dnc {
 
 
 project (Stock_Broker) : ciao_client_dnc, valuetype{
+  avoids += ace_for_tao
   exename = Broker
   after += Stock_Base_Broker_stub
   libs += Broker_stub Stock_Base_stub
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc b/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc
index 014838a3b5a..295c8d0004c 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc
@@ -2,6 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p Stock_Base Distributor"
 
 project(Stock_Base_Distributor_stub): ciao_client_dnc {
+  avoids += ace_for_tao
   after += Stock_Base_stub
   sharedname = Distributor_stub
   idlflags += -Wb,stub_export_macro=DISTRIBUTOR_STUB_Export -Wb,stub_export_include=Distributor_stub_export.h -Wb,skel_export_macro=DISTRIBUTOR_SVNT_Export -Wb,skel_export_include=Distributor_svnt_export.h
@@ -19,6 +20,7 @@ project(Stock_Base_Distributor_stub): ciao_client_dnc {
 }
 
 project(Stock_Base_Distributor_svnt) : ciao_servant_dnc {
+  avoids += ace_for_tao
   after += Stock_Base_svnt Stock_Base_Distributor_stub
   sharedname  = Distributor_svnt
   libs    += Distributor_stub Stock_Base_stub Stock_Base_svnt
@@ -43,6 +45,7 @@ project(Stock_Base_Distributor_svnt) : ciao_servant_dnc {
 
 
 project(Stock_Base_Distributor_exec) : ciao_component_dnc {
+  avoids += ace_for_tao
   after   += Stock_Base_Distributor_svnt
   sharedname = Distributor_exec
   libs      += Distributor_stub Distributor_svnt Stock_Base_stub Stock_Base_svnt
@@ -62,6 +65,7 @@ project(Stock_Base_Distributor_exec) : ciao_component_dnc {
 
 
 project (Stock_Distributor) : ciao_client_dnc, valuetype{
+  avoids += ace_for_tao
   exename = Distributor
   after += Stock_Base_Distributor_stub
   libs += Distributor_stub Stock_Base_stub
diff --git a/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc b/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
index a58ba4a18fe..90212cc63ec 100644
--- a/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
+++ b/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
@@ -1,6 +1,7 @@
 // $Id$
 
 project(BMDevice_DnC_stub): ciao_client_dnc {
+  avoids += ace_for_tao
   after += BasicSP_DnC_stub
   sharedname = BMDevice_stub
 
@@ -19,6 +20,7 @@ project(BMDevice_DnC_stub): ciao_client_dnc {
 }
 
 project(BMDevice_DnC_svnt) : ciao_servant_dnc {
+  avoids += ace_for_tao
   after += BMDevice_DnC_stub BasicSP_DnC_stub
   sharedname  = BMDevice_svnt
   libs    += BMDevice_stub BasicSP_stub BasicSP_svnt
@@ -43,6 +45,7 @@ project(BMDevice_DnC_svnt) : ciao_servant_dnc {
 
 
 project(BMDevice_DnC_exec) : ciao_component_dnc {
+  avoids += ace_for_tao
   after += BMDevice_DnC_svnt
   sharedname = BMDevice_exec
   libs      += BMDevice_stub BMDevice_svnt BasicSP_stub BasicSP_svnt
diff --git a/TAO/CIAO/examples/BasicSP/EC/EC.mpc b/TAO/CIAO/examples/BasicSP/EC/EC.mpc
index c850d19e968..6c318154655 100644
--- a/TAO/CIAO/examples/BasicSP/EC/EC.mpc
+++ b/TAO/CIAO/examples/BasicSP/EC/EC.mpc
@@ -2,6 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -l .. -p BasicSP -i -c EC"
 
 project(EC_DnC_stub): ciao_client_dnc {
+  avoids += ace_for_tao
   after += BasicSP_DnC_stub
 
   sharedname = EC_stub
@@ -25,6 +26,7 @@ project(EC_DnC_stub): ciao_client_dnc {
 }
 
 project(EC_DnC_svnt) : ciao_servant_dnc {
+  avoids += ace_for_tao
   after     += BasicSP_DnC_svnt EC_DnC_stub
   sharedname = EC_svnt
 
@@ -54,6 +56,7 @@ project(EC_DnC_svnt) : ciao_servant_dnc {
 
 
 project(EC_DnC_exec) : ciao_component_dnc {
+  avoids += ace_for_tao
   after    += EC_DnC_svnt
   sharedname = EC_exec
 
@@ -79,6 +82,7 @@ project(EC_DnC_exec) : ciao_component_dnc {
 
 
 project (EC_DnC_client) : ciao_client_dnc, valuetype {
+  avoids += ace_for_tao
   exename = client
   after += EC_DnC_stub
   libs += EC_stub BasicSP_stub
@@ -94,6 +98,7 @@ project (EC_DnC_client) : ciao_client_dnc, valuetype {
 
 
 project (EC_DnC_controller) : ciao_client_dnc, valuetype {
+  avoids += ace_for_tao
   exename = controller
   after += EC_DnC_stub
   libs += EC_stub BasicSP_stub
diff --git a/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc b/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
index 5aeaaa0ef8a..667c96250b8 100644
--- a/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
+++ b/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
@@ -2,6 +2,7 @@
 // This file is generated with "generate_component_mpc.pl -p HUDisplay NavDisplay"
 
 project(NavDisplay_DnC_stub): ciao_client_dnc {
+  avoids += ace_for_tao
   after += HUDisplay_DnC_stub
   sharedname = NavDisplay_DnC_stub
   idlflags += -Wb,stub_export_macro=NAVDISPLAY_STUB_Export -Wb,stub_export_include=NavDisplay_stub_export.h -Wb,skel_export_macro=NAVDISPLAY_SVNT_Export -Wb,skel_export_include=NavDisplay_svnt_export.h
@@ -17,6 +18,7 @@ project(NavDisplay_DnC_stub): ciao_client_dnc {
 }
 
 project(NavDisplay_DnC_svnt) : ciao_servant_dnc {
+  avoids += ace_for_tao
   after += HUDisplay_DnC_svnt NavDisplay_DnC_stub
   sharedname  = NavDisplay_DnC_svnt
   libs    += NavDisplay_DnC_stub HUDisplay_DnC_stub HUDisplay_DnC_svnt
@@ -41,6 +43,7 @@ project(NavDisplay_DnC_svnt) : ciao_servant_dnc {
 
 
 project(NavDisplay_DnC_exec) : ciao_component_dnc {
+  avoids += ace_for_tao
   after   += NavDisplay_DnC_svnt
   sharedname = NavDisplay_DnC_exec
   libs      += NavDisplay_DnC_stub NavDisplay_DnC_svnt HUDisplay_DnC_stub HUDisplay_DnC_svnt
diff --git a/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc b/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc
index 5aa0c89e176..df794278191 100644
--- a/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc
+++ b/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc
@@ -2,6 +2,7 @@
 // This file is generated with "generate_component_mpc_extra.pl -p Hello_Base Receiver"
 
 project(Hello_Base_Receiver_DnC_stub): ciao_client_dnc {
+  avoids += ace_for_tao
   after += Hello_Base_DnC_stub
   sharedname = Receiver_DnC_stub
   idlflags += -Sc \
@@ -30,6 +31,7 @@ project(Hello_Base_Receiver_DnC_stub): ciao_client_dnc {
 }
 
 project(Hello_Base_Receiver_DnC_svnt) : ciao_servant_dnc {
+  avoids += ace_for_tao
   after += Hello_Base_DnC_svnt \
            Hello_Base_Receiver_DnC_stub
   sharedname  = Receiver_DnC_svnt
@@ -70,6 +72,7 @@ project(Hello_Base_Receiver_DnC_svnt) : ciao_servant_dnc {
 
 
 project(Hello_Base_Receiver_DnC_exec) : ciao_component_dnc {
+  avoids += ace_for_tao
   after   += Hello_Base_Receiver_DnC_svnt
   sharedname = Receiver_DnC_exec
   libs      += Receiver_DnC_stub \
diff --git a/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc b/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc
index 5f00145521f..b6b13c0660b 100644
--- a/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc
+++ b/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc
@@ -2,6 +2,7 @@
 // This file is generated with "generate_component_mpc_extra.pl -p Hello_Base Receiver"
 
 project(HelloB_Receiver_DnC_Upgradeable_stub): ciao_client_dnc {
+  avoids += ace_for_tao
   after += Hello_Base_DnC_Upgradeable_stub
   sharedname = Receiver_DnC_Upgradeable_stub
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export -Wb,stub_export_include=Receiver_stub_export.h -Wb,skel_export_macro=RECEIVER_SVNT_Export -Wb,skel_export_include=Receiver_svnt_export.h
@@ -18,6 +19,7 @@ project(HelloB_Receiver_DnC_Upgradeable_stub): ciao_client_dnc {
 }
 
 project(HelloB_Receiver_DnC_Upgradeable_svnt) : ciao_servant_dnc {
+  avoids += ace_for_tao
   after += Hello_Base_DnC_Upgradeable_svnt HelloB_Receiver_DnC_Upgradeable_stub
   sharedname  = Receiver_DnC_Upgradeable_svnt
   libs    += Receiver_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_svnt
@@ -44,6 +46,7 @@ project(HelloB_Receiver_DnC_Upgradeable_svnt) : ciao_servant_dnc {
 
 
 project(HelloB_Receiver_DnC_Upgradeable_exec) : ciao_component_dnc {
+  avoids += ace_for_tao
   after   += HelloB_Receiver_DnC_Upgradeable_svnt
   sharedname = Receiver_DnC_Upgradeable_exec
   libs      += Receiver_DnC_Upgradeable_stub Receiver_DnC_Upgradeable_svnt Hello_Base_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_svnt
diff --git a/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc b/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc
index 32f12acaa2e..59cb34c414d 100644
--- a/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc
+++ b/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc
@@ -1,7 +1,7 @@
 // $Id$ 
 
 project(Benchmark_stub): ciao_client_dnc {
-
+  avoids += ace_for_tao
   sharedname = Benchmark_stub
   idlflags += -Wb,stub_export_macro=BENCHMARK_STUB_Export -Wb,stub_export_include=Benchmark_stub_export.h -Wb,skel_export_macro=BENCHMARK_SVNT_Export -Wb,skel_export_include=Benchmark_svnt_export.h
   dynamicflags   = BENCHMARK_STUB_BUILD_DLL
@@ -16,6 +16,7 @@ project(Benchmark_stub): ciao_client_dnc {
 }
 
 project(Benchmark_svnt) : ciao_component_dnc {
+  avoids += ace_for_tao
   after +=  Benchmark_stub
   sharedname = Benchmark_svnt
   libs    += Benchmark_stub
@@ -31,6 +32,7 @@ project(Benchmark_svnt) : ciao_component_dnc {
 }
 
 project (*server) : taoserver, strategies,ciao_component_dnc {
+  avoids += ace_for_tao
   after += Benchmark_svnt
   libs += Benchmark_svnt Benchmark_stub 
 
diff --git a/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc b/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
index d7202e70781..41501f86b1e 100644
--- a/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
+++ b/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
@@ -1,6 +1,7 @@
 //$Id$
 
 project(TSEC_CheckPoint_stub): ciao_client_dnc, event {
+  avoids += ace_for_tao
   after  += ENW_stub
   libpaths += ../interfaces
   libs     += ENW_stub
@@ -18,6 +19,7 @@ project(TSEC_CheckPoint_stub): ciao_client_dnc, event {
 }
 
 project(TSEC_CheckPoint_svnt) : ciao_servant_dnc, event {
+  avoids += ace_for_tao
   after +=  TSEC_CheckPoint_stub
   after +=  ENW_svnt ENW_stub
   sharedname  = TSEC_CheckPoint_svnt
@@ -45,6 +47,7 @@ project(TSEC_CheckPoint_svnt) : ciao_servant_dnc, event {
 
 
 project(TSEC_CheckPoint_exec) : ciao_component_dnc, event {
+  avoids += ace_for_tao
   after   += TSEC_CheckPoint_svnt
   after   += ENW_svnt ENW_stub
 
@@ -70,6 +73,7 @@ project(TSEC_CheckPoint_exec) : ciao_component_dnc, event {
 
 
 project(TSEC_CheckPoint_controller) : ciao_client_dnc, valuetype, event {
+  avoids += ace_for_tao
   exename = controller
   after += TSEC_CheckPoint_stub
   libs += TSEC_CheckPoint_stub ENW_stub
diff --git a/TAO/CIAO/tests/Minimum/Sender/Sender.mpc b/TAO/CIAO/tests/Minimum/Sender/Sender.mpc
index d1a92577943..583a980b793 100644
--- a/TAO/CIAO/tests/Minimum/Sender/Sender.mpc
+++ b/TAO/CIAO/tests/Minimum/Sender/Sender.mpc
@@ -2,6 +2,7 @@
 // This file is generated with "generate_component_mpc_extra.pl -p Minimum_Base Sender"
 
 project(Minimum_Base_Sender_DnC_stub): ciao_client_dnc {
+  avoids += ace_for_tao
   after += Minimum_Base_DnC_stub
   sharedname = Minimum_Sender_DnC_stub
   idlflags += -Sc \
@@ -30,6 +31,7 @@ project(Minimum_Base_Sender_DnC_stub): ciao_client_dnc {
 }
 
 project(Minimum_Base_Sender_DnC_svnt) : ciao_servant_dnc {
+  avoids += ace_for_tao
   after += Minimum_Base_DnC_svnt \
            Minimum_Base_Sender_DnC_stub
   sharedname  = Minimum_Sender_DnC_svnt
@@ -69,6 +71,7 @@ project(Minimum_Base_Sender_DnC_svnt) : ciao_servant_dnc {
 }
 
 project(Minimum_Base_Sender_DnC_exec) : ciao_component_dnc {
+  avoids += ace_for_tao
   after   += Minimum_Base_Sender_DnC_svnt
   sharedname = Minimum_Sender_DnC_exec
   libs      += Minimum_Sender_DnC_stub \