ChangeLogTag:Thu Sep 18 14:11:53 MST 2003 Trevor Fields <fields_t@ociweb.com>

33 files changed, 104 insertions, 17 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index ba3a2e81b13..cb226776bc8 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,49 @@
+Thu Sep 18 14:11:53 MST 2003 Trevor Fields <fields_t@ociweb.com>
+
+        * TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc:
+
+          Corrected the name of the IDL_Cubit project to build after
+
+        * TAO/examples/Quoter/Quoter.mpc:
+        * TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc:
+        * TAO/orbsvcs/IFR_Service/IFR_Service.mpc:
+        * TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc:
+        * TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc:
+        * TAO/orbsvcs/orbsvcs/FTORB.mpc:
+        * TAO/orbsvcs/orbsvcs/FaultTolerance.mpc:
+        * TAO/orbsvcs/orbsvcs/IFRService.mpc:
+        * TAO/orbsvcs/orbsvcs/PortableGroup.mpc:
+        * TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb:
+        * TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc:
+        * TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc:
+        * TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc:
+        * TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc:
+        * TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc:
+        * TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb:
+        * TAO/orbsvcs/tests/InterfaceRepo/Application_Test/InterfaceRepo_Application_Test.mpc:
+        * TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/InterfaceRepo_IDL3_Test.mpc:
+        * TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/InterfaceRepo_IFR_Test.mpc:
+        * TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/InterfaceRepo_Persistence_Test.mpc:
+        * TAO/tests/ICMG_Any_Bug/Hello.mpc:
+        * TAO/tests/Object_Loader/Object_Loader.mpc:
+        * TAO/tests/POA/Default_Servant/Default_Servant.mpc:
+        * TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc:
+
+          Changed to not build when minimum_corba = 1
+
+        * TAO/orbsvcs/examples/RtEC/IIOPGateway/RtEC_IIOPGateway.mpc:
+        * TAO/tao/RTCORBA/RTCORBA.mpc:
+        * TAO/tao/RTPortableServer/RTPortableServer.mpc:
+        * TAO/tao/RTScheduling/RTScheduler.mpc:
+
+          Added requires += corba_messaging
+
+        * TAO/tests/AMI_Buffering/AMI_Buffering.mpc:
+        * TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc:
+        * TAO/tests/LongUpcalls/LongUpcalls.mpc:
+
+          Added requires += ami
+
 Thurs Sep 18 17:15:51 2003  Yamuna Krishnamurthy  <yamuna@oomworks.com>
 	
 	* examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h: 
diff --git a/TAO/examples/Quoter/Quoter.mpc b/TAO/examples/Quoter/Quoter.mpc
index 95ded085b6e..6200f5f05f9 100644
--- a/TAO/examples/Quoter/Quoter.mpc
+++ b/TAO/examples/Quoter/Quoter.mpc
@@ -2,6 +2,7 @@
 //        removing the includes += lines below, and updating
 //        the source code instead.
 project(*server): namingexe, lifecycle {
+  avoids   += minimum_corba
   idlflags += -I../../orbsvcs/orbsvcs
   includes += ../../orbsvcs/orbsvcs
   Source_Files {
@@ -11,6 +12,7 @@ project(*server): namingexe, lifecycle {
 }
 
 project(*client): namingexe, lifecycle {
+  avoids   += minimum_corba
   idlflags += -I../../orbsvcs/orbsvcs
   includes += ../../orbsvcs/orbsvcs
   Source_Files {
@@ -19,6 +21,7 @@ project(*client): namingexe, lifecycle {
 }
 
 project(*Factory Finder): namingexe, lifecycle {
+  avoids   += minimum_corba
   idlflags += -I../../orbsvcs/orbsvcs
   includes += ../../orbsvcs/orbsvcs
   Source_Files {
@@ -28,6 +31,7 @@ project(*Factory Finder): namingexe, lifecycle {
 }
 
 project(*Generic Factory): namingexe, lifecycle {
+  avoids   += minimum_corba
   idlflags += -I../../orbsvcs/orbsvcs
   includes += ../../orbsvcs/orbsvcs
   Source_Files {
diff --git a/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc b/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc
index 600b1810efa..7eaef3102a4 100644
--- a/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc
+++ b/TAO/examples/TypeCode_Creation/TypeCode_Creation.mpc
@@ -1,6 +1,7 @@
 // $Id$
 
 project (TypeCode_Creation_Test) : taoclient, typecodefactory, ifr_client {
+  avoids  += minimum_corba
   exename  = create_tc
   Source_Files {
     testC.cpp
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
index 7dc0347c6c4..90015efb281 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
@@ -1,4 +1,5 @@
 project(IFR_Service) : orbsvcsexe, core, ifrservice, typecodefactory, svc_utils, ifr_client, iortable, portableserver {
+  avoids   += minimum_corba
   exename  = IFR_Service
   Source_Files {
     IFR_Server.cpp
@@ -8,6 +9,7 @@ project(IFR_Service) : orbsvcsexe, core, ifrservice, typecodefactory, svc_utils,
 
 
 project(TAO_IFR_BE) : taolib, core, ifr_client {
+  avoids      += minimum_corba
   after       += TAO_IDL_FE
   sharedname   = TAO_IFR_BE
   libs        += TAO_IDL_FE
@@ -29,6 +31,7 @@ project(TAO_IFR_BE) : taolib, core, ifr_client {
 
 
 project(TAO_IFR_EXE) : taoexe, core, ifr_client {
+  avoids         += minimum_corba
   after          += TAO_IFR_BE TAO_IDL_FE
   exename         = tao_ifr
   idlpreprocessor = 1
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
index c143901f4aa..cdf5e915d92 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
@@ -1,3 +1,4 @@
 project : orbsvcsexe, core, lifecycle, naming, trading {
+  avoids  += minimum_corba
   exename  = LifeCycle_Service
 }
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/RtEC_IIOPGateway.mpc b/TAO/orbsvcs/examples/RtEC/IIOPGateway/RtEC_IIOPGateway.mpc
index e3d26aeed38..a589a239133 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/RtEC_IIOPGateway.mpc
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/RtEC_IIOPGateway.mpc
@@ -1,22 +1,30 @@
 project(*Consumer): messaging, rteventexe, naming {
+  requires  += corba_messaging
+
   Source_Files {
     Consumer.cpp
   }
 }
 
 project(*Supplier): messaging, rteventexe, naming {
+  requires  += corba_messaging
+
   Source_Files {
     Supplier.cpp
   }
 }
 
 project(*): messaging, rteventexe, naming {
+  requires  += corba_messaging
+
   Source_Files {
     Gateway.cpp
   }
 }
 
 project(*EC): messaging, rteventexe, naming {
+  requires  += corba_messaging
+
   Source_Files {
     EC.cpp
   }
diff --git a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
index 277072fe10c..01fe250960a 100644
--- a/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
@@ -6,6 +6,7 @@ project(CosLoadBalancing) : orbsvcslib, core, naming, portablegroup, messaging {
   tagchecks   += CosLoadBalancing
   // Add this include path for precompiled headers
   includes    += $(TAO_ROOT)/orbsvcs/orbsvcs
+  avoids      += minimum_corba
 
   IDL_Files {
     CosLoadBalancing.idl
diff --git a/TAO/orbsvcs/orbsvcs/FTORB.mpc b/TAO/orbsvcs/orbsvcs/FTORB.mpc
index deb287c4cc1..46acca986d5 100644
--- a/TAO/orbsvcs/orbsvcs/FTORB.mpc
+++ b/TAO/orbsvcs/orbsvcs/FTORB.mpc
@@ -5,6 +5,7 @@ project(FTORB) : orbsvcslib, core, iormanip, portableserver {
   tagchecks   += FTORB
   // Add this include path for precompiled headers
   includes    += $(TAO_ROOT)/orbsvcs/orbsvcs
+  avoids      += minimum_corba
 
   IDL_Files {
     FT_CORBA_ORB.idl
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
index e3087bc99d6..85e45993e4c 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
@@ -3,6 +3,7 @@ project(FaultTolerance) : orbsvcslib, core, notification, ftorb {
   idlflags    += -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h
   dynamicflags = TAO_FT_BUILD_DLL
   tagchecks   += FaultTolerance
+  avoids      += minimum_corba
 
   IDL_Files {
     FT_CORBA.idl
diff --git a/TAO/orbsvcs/orbsvcs/IFRService.mpc b/TAO/orbsvcs/orbsvcs/IFRService.mpc
index fca70d806e2..41a79159953 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService.mpc
+++ b/TAO/orbsvcs/orbsvcs/IFRService.mpc
@@ -1,4 +1,5 @@
 project(IFRService) : orbsvcslib, core, typecodefactory, svc_utils, ifr_client, iortable, portableserver {
+  avoids      += minimum_corba
   sharedname   = TAO_IFRService
   dynamicflags = TAO_IFRSERVICE_BUILD_DLL
   tagchecks   += IFRService
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
index 4bad4bef343..32b09fc9a80 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
@@ -3,6 +3,7 @@ project(PortableGroup) : orbsvcslib, core, naming, svc_utils, portableserver, me
   idlflags    += -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=PortableGroup/portablegroup_export.h
   dynamicflags = TAO_PORTABLEGROUP_BUILD_DLL
   tagchecks   += PortableGroup
+  avoids      += minimum_corba
 
   IDL_Files {
     miop.idl
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb b/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb
index cb49cc2358a..c08a6a105cf 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb
@@ -1,4 +1,4 @@
-project : orbsvcsexe, messaging, taoserver, event, naming, svc_utils, iortable {
+project : orbsvcsexe, messaging, taoserver, event, naming, svc_utils, iortable, corba_messaging {
   after    += CosEvent_Test_Lib
   libs     += CECTests
   includes += ../lib
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc b/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc
index 1925cb18283..64c4e2cbc93 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc
+++ b/TAO/orbsvcs/tests/CosEvent/lib/CosEvent_lib.mpc
@@ -1,4 +1,4 @@
-project(CosEvent Test Lib): orbsvcslib, event, naming, svc_utils, iortable, portableserver {
+project(CosEvent Test Lib): orbsvcslib, event, naming, svc_utils, iortable, portableserver, corba_messaging {
   sharedname   = CECTests
   dynamicflags = CEC_TEST_BUILD_DLL
   Header_Files {
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc b/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc
index 9f24bdc487e..b18305d9dfd 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc
@@ -1,4 +1,4 @@
-project(ECM Supplier): rteventexe, rtsched, naming, iortable, messaging {
+project(ECM Supplier): rteventexe, rtsched, naming, iortable, messaging, corba_messaging {
   exename  = ECM_Supplier
   Source_Files {
     ECM_Data.cpp
@@ -6,7 +6,7 @@ project(ECM Supplier): rteventexe, rtsched, naming, iortable, messaging {
   }
 }
 
-project(ECM Consumer): rteventexe, rtsched, naming, iortable, messaging {
+project(ECM Consumer): rteventexe, rtsched, naming, iortable, messaging, corba_messaging {
   exename  = ECM_Consumer
   Source_Files {
     ECM_Data.cpp
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc
index e347b814cda..54b07f50600 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.mpc
@@ -1,3 +1,3 @@
-project(EC_Mcast): rteventexe, messaging {
+project(EC_Mcast): rteventexe, messaging, corba_messaging {
   exename  = EC_Mcast
-}
\ No newline at end of file
+}
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc
index 7ad66908fb9..97b1a32b606 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.mpc
@@ -1,3 +1,3 @@
-project(EC_Multiple): rteventexe, rtoldevent, rtschedevent, naming, iortable, messaging {
+project(EC_Multiple): rteventexe, rtoldevent, rtschedevent, naming, iortable, messaging, corba_messaging {
   exename  = EC_Multiple
 }
diff --git a/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc b/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc
index 1256f6edba6..b2618598556 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc
+++ b/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc
@@ -1,4 +1,4 @@
-project(ECT Supplier): rteventexe, rtoldevent, rtsched, naming, iortable, messaging {
+project(ECT Supplier): rteventexe, rtoldevent, rtsched, naming, iortable, messaging, corba_messaging {
   exename  = ECT_Supplier
   comps   += Naming RTOLDEvent
 
@@ -9,7 +9,7 @@ project(ECT Supplier): rteventexe, rtoldevent, rtsched, naming, iortable, messag
   }
 }
 
-project(ECT Consumer): rteventexe, rtoldevent, rtsched, naming, iortable, messaging {
+project(ECT Consumer): rteventexe, rtoldevent, rtsched, naming, iortable, messaging, corba_messaging {
   exename  = ECT_Consumer
   comps   += Naming RTOLDEvent
 
@@ -20,7 +20,7 @@ project(ECT Consumer): rteventexe, rtoldevent, rtsched, naming, iortable, messag
   }
 }
 
-project(ECT Throughput): rteventexe, rtoldevent, rtsched, naming, iortable, messaging {
+project(ECT Throughput): rteventexe, rtoldevent, rtsched, naming, iortable, messaging, corba_messaging {
   exename  = ECT_Throughput
   comps   += Naming RTOLDEvent
 
diff --git a/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb b/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb
index c9fab7fabf5..38e54d1ab3c 100644
--- a/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb
+++ b/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb
@@ -1,4 +1,4 @@
-project: messaging, rteventexe, naming, iortable {
+project: messaging, rteventexe, naming, iortable, corba_messaging {
   after    += Event_Test_Lib
   libs     += ECTests
   includes += ../lib
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/InterfaceRepo_Application_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/InterfaceRepo_Application_Test.mpc
index 33224b6317b..b94dc0ab17c 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/InterfaceRepo_Application_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/InterfaceRepo_Application_Test.mpc
@@ -1,4 +1,6 @@
 project(*server): taoserver, ifr_client {
+  avoids  += minimum_corba
+
   Source_Files {
     test_i.cpp
     server.cpp
@@ -6,6 +8,8 @@ project(*server): taoserver, ifr_client {
 }
 
 project(*client): taoserver, ifr_client, dynamicinterface {
+  avoids  += minimum_corba
+
   IDL_Files {
   }
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/InterfaceRepo_IDL3_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/InterfaceRepo_IDL3_Test.mpc
index 9418992bf66..8d9098ac01e 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/InterfaceRepo_IDL3_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/InterfaceRepo_IDL3_Test.mpc
@@ -1,4 +1,5 @@
 project: taoexe, ifr_client {
+  avoids  += minimum_corba
   exename  = IDL3_Test
 
   IDL_Files {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/InterfaceRepo_IFR_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/InterfaceRepo_IFR_Test.mpc
index 7cba36180a2..181f9147d37 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/InterfaceRepo_IFR_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/InterfaceRepo_IFR_Test.mpc
@@ -1,3 +1,4 @@
 project: taoexe, ifr_client {
+  avoids  += minimum_corba
   exename  = IFR_Test
 }
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/InterfaceRepo_Persistence_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/InterfaceRepo_Persistence_Test.mpc
index 2e1e428b9ee..0952a59b6be 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/InterfaceRepo_Persistence_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/InterfaceRepo_Persistence_Test.mpc
@@ -1,3 +1,4 @@
 project: taoexe, ifr_client {
+  avoids  += minimum_corba
   exename  = Persistence_Test
 }
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc
index 63eb46a1095..ba7a7ee6bc1 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/DII_Cubit.mpc
@@ -1,7 +1,8 @@
 project(*client): taoserver, strategies, dynamicinterface {
   exename   = client
-  after    += IDL_Cubit_Server_Exe 
+  after    += IDL_Cubit_Server
   idlflags += -Gd
+  avoids   += minimum_corba
 
   Source_Files {
     cubitC.cpp
diff --git a/TAO/tao/RTCORBA/RTCORBA.mpc b/TAO/tao/RTCORBA/RTCORBA.mpc
index db4ceb8ac4e..788c335394e 100644
--- a/TAO/tao/RTCORBA/RTCORBA.mpc
+++ b/TAO/tao/RTCORBA/RTCORBA.mpc
@@ -2,5 +2,5 @@ project : taolib, core {
   sharedname   = TAO_RTCORBA
   dynamicflags = TAO_RTCORBA_BUILD_DLL
   include_dir  = tao/RTCORBA
-  requires    += rt_corba
+  requires    += rt_corba corba_messaging
 }
diff --git a/TAO/tao/RTPortableServer/RTPortableServer.mpc b/TAO/tao/RTPortableServer/RTPortableServer.mpc
index 6059840899e..678d76e7b13 100644
--- a/TAO/tao/RTPortableServer/RTPortableServer.mpc
+++ b/TAO/tao/RTPortableServer/RTPortableServer.mpc
@@ -1,4 +1,4 @@
-project : taolib, core, rtcorba, portableserver {
+project : taolib, core, rtcorba, portableserver, corba_messaging {
   sharedname   = TAO_RTPortableServer
   dynamicflags = TAO_RTPORTABLESERVER_BUILD_DLL
   include_dir  = tao/RTPortableServer
diff --git a/TAO/tao/RTScheduling/RTScheduler.mpc b/TAO/tao/RTScheduling/RTScheduler.mpc
index 98a0bd43038..5f5bf4aae99 100644
--- a/TAO/tao/RTScheduling/RTScheduler.mpc
+++ b/TAO/tao/RTScheduling/RTScheduler.mpc
@@ -1,4 +1,4 @@
-project : taolib, rtcorba, portableserver, core {
+project : taolib, rtcorba, portableserver, core, corba_messaging {
   sharedname   = TAO_RTScheduler
   dynamicflags = TAO_RTSCHEDULER_BUILD_DLL
   include_dir  = tao/RTScheduler
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc
index 522cf1f4d8f..d909d73dcb1 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc
@@ -1,6 +1,7 @@
 project(*Server): messaging, taoserver {
   idlflags -= -Sc
   idlflags += -GC
+  requires += ami
 
   Source_Files {
     AMI_Buffering.cpp
@@ -12,6 +13,7 @@ project(*Client): messaging, taoserver {
   idlflags -= -Sc
   idlflags += -GC
   exename   = client
+  requires += ami
 
   Source_Files {
     Client_Task.cpp
@@ -24,6 +26,7 @@ project(*Admin): messaging, taoserver {
   idlflags -= -Sc
   idlflags += -GC
   exename   = admin
+  requires += ami
 
   Source_Files {
     AMI_Buffering_Admin.cpp
diff --git a/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc b/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc
index 89848db55a8..00f6a25e656 100644
--- a/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc
+++ b/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc
@@ -1,6 +1,7 @@
 project(*Server): messaging, taoserver {
   idlflags -= -Sc
   idlflags += -GC
+  requires += ami
 
   Source_Files {
     timeout_i.cpp
@@ -13,6 +14,7 @@ project(*Client): messaging, taoserver {
   exename   = client
   idlflags -= -Sc
   idlflags += -GC
+  requires += ami
 
   Source_Files {
     timeout_i.cpp
diff --git a/TAO/tests/ICMG_Any_Bug/Hello.mpc b/TAO/tests/ICMG_Any_Bug/Hello.mpc
index bb9f38df22c..e64724c3d20 100644
--- a/TAO/tests/ICMG_Any_Bug/Hello.mpc
+++ b/TAO/tests/ICMG_Any_Bug/Hello.mpc
@@ -6,7 +6,7 @@ project(ICMG_Any_Bug_Hello_Server): taoserver {
   }
 }
 
-project(ICMG_Any_Bug_Hello_Client): ifr_client, dynamicinterface {
+project(ICMG_Any_Bug_Hello_Client): ifr_client, dynamicinterface, minimum_corba {
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/LongUpcalls/LongUpcalls.mpc b/TAO/tests/LongUpcalls/LongUpcalls.mpc
index 2e1ee65d664..bb5e4208dce 100644
--- a/TAO/tests/LongUpcalls/LongUpcalls.mpc
+++ b/TAO/tests/LongUpcalls/LongUpcalls.mpc
@@ -2,6 +2,7 @@ project(*Server): messaging, taoserver {
   idlflags -= -Sc
   idlflags += -GC
   exename   = blocking_server
+  requires += ami
 
   Source_Files {
     Manager.cpp
@@ -13,6 +14,7 @@ project(*Client): messaging, taoserver {
   idlflags -= -Sc
   idlflags += -GC
   exename   = blocking_client
+  requires += ami
 
   Source_Files {
     Controller.cpp
@@ -24,6 +26,7 @@ project(*AMI Server): messaging, taoserver {
   idlflags -= -Sc
   idlflags += -GC
   exename   = ami_server
+  requires += ami
 
   Source_Files {
     AMI_Manager.cpp
@@ -35,6 +38,7 @@ project(*AMI Client): messaging, taoserver {
   idlflags -= -Sc
   idlflags += -GC
   exename   = ami_client
+  requires += ami
 
   Source_Files {
     Controller.cpp
diff --git a/TAO/tests/Object_Loader/Object_Loader.mpc b/TAO/tests/Object_Loader/Object_Loader.mpc
index 1c1c6eceb8b..f34291b9c8e 100644
--- a/TAO/tests/Object_Loader/Object_Loader.mpc
+++ b/TAO/tests/Object_Loader/Object_Loader.mpc
@@ -1,4 +1,4 @@
-project(*Test): taolib_with_idl, portableserver {
+project(*Test): taolib_with_idl, portableserver, minimum_corba {
   sharedname   = Test_DLL
   dynamicflags = OLT_BUILD_DLL
 
diff --git a/TAO/tests/POA/Default_Servant/Default_Servant.mpc b/TAO/tests/POA/Default_Servant/Default_Servant.mpc
index c8372eac5e9..4534039f011 100644
--- a/TAO/tests/POA/Default_Servant/Default_Servant.mpc
+++ b/TAO/tests/POA/Default_Servant/Default_Servant.mpc
@@ -1,3 +1,4 @@
 project(POA Default Servant): taoserver {
   exename = Default_Servant
+  avoids += minimum_corba
 }
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 b2023cd2b8c..e1fab62dea6 100644
--- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc
+++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.mpc
@@ -1,3 +1,4 @@
 project(POA MT Servant Locator): taoserver {
   exename = MT_Servant_Locator
+  avoids += minimum_corba
 }