Wed Jun 17 10:07:19 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
        * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc
        * DAnCE/tests/CIAO/Components/ProcessColocation.mpc
        * DAnCE/tests/CIAO/Components/SimpleAttribute.mpc
        * DAnCE/tests/CIAO/Components/SimpleConsumer.mpc
        * DAnCE/tests/CIAO/Components/SimpleEmitter.mpc
        * DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc
        * DAnCE/tests/CIAO/Components/SimpleNull.mpc
        * DAnCE/tests/CIAO/Components/SimpleProvider.mpc
        * DAnCE/tests/CIAO/Components/SimplePublisher.mpc
        * DAnCE/tests/CIAO/Components/SimpleUser.mpc
        * docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc
        * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc
        * examples/BasicSP/BasicSP.mpc
        * examples/BasicSP/BMClosedED/BMClosedED.mpc
        * examples/BasicSP/BMDevice/BMDevice.mpc
        * examples/BasicSP/BMDisplay/BMDisplay.mpc
        * examples/BasicSP/EC/EC.mpc
        * examples/DevGuideExamples/Messenger/Administrator.mpc
        * examples/Display/GPS/GPS.mpc
        * examples/Display/NavDisplay/NavDisplay.mpc
        * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
        * examples/Display/RateGen/RateGen.mpc
        * examples/Hello/Sender/Sender.mpc
        * examples/Null_Component/Null_Component.mpc
        * examples/Swapping/Receiver/Receiver.mpc
        * examples/Swapping/Sender/Sender.mpc
        * MPC/config/ciao_servant.mpb
        * MPC/config/ciaocidldefaults.mpb
        * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
        * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
        * performance-tests/Protocols/Receiver/Receiver.mpc
        * performance-tests/Protocols/Sender/Sender.mpc
        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
        * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc
        * tests/CIDL/CodeGen/Basic.idl
        * tests/CIDL/CodeGen/CodeGen.mpc
        * tests/IDL_Test/Cornucopia/Cornucopia.mpc
        * tests/IDL_Test/Reused_Facet_Interface/CodeGen.mpc
        * tests/Minimum/Receiver/Receiver.mpc
        * tests/Minimum/Sender/Sender.mpc
        * tools/Config_Handlers/XML_File_Intf.cpp
          Zap ciaocidldefaults from the MPC files. Everything has to be rebuild to
          sort out the compile/link issues, but at least now cidlc is not used anymore

43 files changed, 274 insertions, 448 deletions

diff --git a/modules/CIAO/ChangeLog b/modules/CIAO/ChangeLog
index 43afb500e2f..e9eeebb4dd7 100644
--- a/modules/CIAO/ChangeLog
+++ b/modules/CIAO/ChangeLog
@@ -1,9 +1,56 @@
+Wed Jun 17 10:07:19 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
+        * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc
+        * DAnCE/tests/CIAO/Components/ProcessColocation.mpc
+        * DAnCE/tests/CIAO/Components/SimpleAttribute.mpc
+        * DAnCE/tests/CIAO/Components/SimpleConsumer.mpc
+        * DAnCE/tests/CIAO/Components/SimpleEmitter.mpc
+        * DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc
+        * DAnCE/tests/CIAO/Components/SimpleNull.mpc
+        * DAnCE/tests/CIAO/Components/SimpleProvider.mpc
+        * DAnCE/tests/CIAO/Components/SimplePublisher.mpc
+        * DAnCE/tests/CIAO/Components/SimpleUser.mpc
+        * docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc
+        * docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc
+        * examples/BasicSP/BasicSP.mpc
+        * examples/BasicSP/BMClosedED/BMClosedED.mpc
+        * examples/BasicSP/BMDevice/BMDevice.mpc
+        * examples/BasicSP/BMDisplay/BMDisplay.mpc
+        * examples/BasicSP/EC/EC.mpc
+        * examples/DevGuideExamples/Messenger/Administrator.mpc
+        * examples/Display/GPS/GPS.mpc
+        * examples/Display/NavDisplay/NavDisplay.mpc
+        * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
+        * examples/Display/RateGen/RateGen.mpc
+        * examples/Hello/Sender/Sender.mpc
+        * examples/Null_Component/Null_Component.mpc
+        * examples/Swapping/Receiver/Receiver.mpc
+        * examples/Swapping/Sender/Sender.mpc
+        * MPC/config/ciao_servant.mpb
+        * MPC/config/ciaocidldefaults.mpb
+        * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
+        * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
+        * performance-tests/Protocols/Receiver/Receiver.mpc
+        * performance-tests/Protocols/Sender/Sender.mpc
+        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
+        * tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc
+        * tests/CIDL/CodeGen/Basic.idl
+        * tests/CIDL/CodeGen/CodeGen.mpc
+        * tests/IDL_Test/Cornucopia/Cornucopia.mpc
+        * tests/IDL_Test/Reused_Facet_Interface/CodeGen.mpc
+        * tests/Minimum/Receiver/Receiver.mpc
+        * tests/Minimum/Sender/Sender.mpc
+        * tools/Config_Handlers/XML_File_Intf.cpp
+          Zap ciaocidldefaults from the MPC files. Everything has to be rebuild to
+          sort out the compile/link issues, but at least now cidlc is not used anymore
+
 Wed Jun 17 08:43:19 UTC 2009  Marcel Smit  <msmit@remedy.nl>
 
         * CIAO_TAO.mwc:
         * CIAO_TAO_DanCE.mwc:
           Removed CIDL
-          
+
         * DAnCE/RepositoryManager/RepositoryManager.mpc:
           Repositorymanager uses ciaodefaults instead of ciaobasedefaults
 
@@ -13,7 +60,7 @@ Wed Jun 17 08:43:19 UTC 2009  Marcel Smit  <msmit@remedy.nl>
         * DAnCE/TargetManager/TargetManager.mpc:
         * DAnCE/TargetManager/TargetManager_exec.h:
         * DAnCE/TargetManager/TargetManager_exec.cpp:
-          Changed because the CIDL compiler was removed. 
+          Changed because the CIDL compiler was removed.
           Changed TargetManagerImpl into TargetManager.
 
         * docs/tutorials/Quoter/Simple/03.html:
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/ProcessColocation.mpc b/modules/CIAO/DAnCE/tests/CIAO/Components/ProcessColocation.mpc
index fcd0fc366b2..abff1814995 100644
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/ProcessColocation.mpc
+++ b/modules/CIAO/DAnCE/tests/CIAO/Components/ProcessColocation.mpc
@@ -86,9 +86,6 @@ project(ProcessColocation_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = PROCESSCOLOCATION_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute.mpc b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute.mpc
index 7e4ca6a80d6..fc610177877 100644
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute.mpc
+++ b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleAttribute.mpc
@@ -9,7 +9,7 @@ project(SimpleAttribute_idl_gen) : componentidldefaults, anytypecode, avoids_ace
               -Wb,skel_export_include=SimpleAttribute_svnt_export.h \
               -Wb,exec_export_macro=SIMPLEATTRIBUTE_EXEC_Export \
               -Wb,exec_export_include=SimpleAttribute_exec_export.h \
-              
+
 
   IDL_Files {
     SimpleAttribute.idl
@@ -87,9 +87,6 @@ project(SimpleAttribute_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = SIMPLEATTRIBUTE_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer.mpc b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer.mpc
index 81c8f6bb25c..f3b57a7909d 100644
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer.mpc
+++ b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleConsumer.mpc
@@ -88,9 +88,6 @@ project(SimpleCommon_SimpleConsumer_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = SIMPLECONSUMER_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter.mpc b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter.mpc
index 34e58c6dfbe..cb73a23d9dd 100644
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter.mpc
+++ b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleEmitter.mpc
@@ -88,9 +88,6 @@ project(SimpleCommon_SimpleEmitter_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = SIMPLEEMITTER_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc
index 820e33e25b9..4b894a76d72 100644
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc
+++ b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleMultipleUser.mpc
@@ -88,9 +88,6 @@ project(SimpleCommon_SimpleMultipleUser_svnt) : ciao_servant, avoids_ace_for_tao
 
   dynamicflags = SIMPLEMULTIPLEUSER_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleNull.mpc b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleNull.mpc
index 38d1da58bef..49ec666693e 100644
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleNull.mpc
+++ b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleNull.mpc
@@ -8,7 +8,7 @@ project(SimpleNull_idl_gen) : componentidldefaults, anytypecode, avoids_ace_for_
               -Wb,skel_export_macro=SIMPLENULL_SVNT_Export \
               -Wb,skel_export_include=SimpleNull_svnt_export.h \
               -Wb,exec_export_macro=SIMPLENULL_EXEC_Export \
-              -Wb,exec_export_include=SimpleNull_exec_export.h 
+              -Wb,exec_export_include=SimpleNull_exec_export.h
   IDL_Files {
     SimpleNull.idl
   }
@@ -85,9 +85,6 @@ project(SimpleNull_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = SIMPLENULL_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider.mpc b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider.mpc
index 7742036b895..6f38b73b21e 100644
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider.mpc
+++ b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleProvider.mpc
@@ -88,9 +88,6 @@ project(SimpleCommon_SimpleProvider_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = SIMPLEPROVIDER_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher.mpc b/modules/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher.mpc
index 2f50e7dc7aa..43492f8ad7d 100644
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher.mpc
+++ b/modules/CIAO/DAnCE/tests/CIAO/Components/SimplePublisher.mpc
@@ -88,9 +88,6 @@ project(SimpleCommon_SimplePublisher_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = SIMPLEPUBLISHER_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleUser.mpc b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleUser.mpc
index 362d6875abf..b4d45d28c09 100644
--- a/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleUser.mpc
+++ b/modules/CIAO/DAnCE/tests/CIAO/Components/SimpleUser.mpc
@@ -9,7 +9,7 @@ project(SimpleCommon_SimpleUser_idl_gen) : componentidldefaults, anytypecode, av
               -Wb,skel_export_include=SimpleUser_svnt_export.h \
               -Wb,exec_export_macro=SIMPLEUSER_EXEC_Export \
               -Wb,exec_export_include=SimpleUser_exec_export.h \
-              -Gsv 
+              -Gsv
 
   IDL_Files {
     SimpleUser.idl
@@ -89,9 +89,6 @@ project(SimpleCommon_SimpleUser_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = SIMPLEUSER_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/MPC/config/ciao_servant.mpb b/modules/CIAO/MPC/config/ciao_servant.mpb
index 4dc7f0263d6..7005c3d7a86 100644
--- a/modules/CIAO/MPC/config/ciao_servant.mpb
+++ b/modules/CIAO/MPC/config/ciao_servant.mpb
@@ -1,5 +1,5 @@
 //$Id$
-project : ciao_port_activator_stub, ciao_servant_activator, ccm_svnt, ciaocidldefaults, taoidldefaults, ciao_container_base, portableserver, ccm_cookie, ciao_context_impl {
+project : ciao_port_activator_stub, ciao_servant_activator, ccm_svnt, taoidldefaults, ciao_container_base, portableserver, ccm_cookie, ciao_context_impl {
    after += CIAO_Servant_Impl
    libs += CIAO_Servant_Impl
 }
diff --git a/modules/CIAO/MPC/config/ciaocidldefaults.mpb b/modules/CIAO/MPC/config/ciaocidldefaults.mpb
deleted file mode 100644
index 534e83f5a68..00000000000
--- a/modules/CIAO/MPC/config/ciaocidldefaults.mpb
+++ /dev/null
@@ -1,36 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project: build_files {
-  after += CIDLC
-  // Set the cidl compiler and flags as template values
-  specific {
-    cidlc      = $(CIAO_ROOT)/bin/cidlc
-    cidlc_dep  = $(CIAO_ROOT)/bin/cidlc
-    cidlc_flags = -I $(CIAO_ROOT) \
-                  -I$(CIAO_ROOT)/DAnCE \
-                  -I$(CIAO_ROOT)/ciao \
-                  -I$(CIAO_ROOT)/ccm \
-                  -I$(TAO_ROOT) \
-                  -I$(TAO_ROOT)/tao \
-                  -I$(TAO_ROOT)/orbsvcs
-  }
-
-  Define_Custom(CIDL) {
-    automatic         = 0
-    dependent         = $(CIDLC_DEP)
-    command           = $(CIDLC)
-    commandflags      = $(CIDLC_FLAGS)
-    inputext          = .cidl
-    source_outputext  = _svnt.cpp
-    header_outputext  = _svnt.h
-    generic_outputext = E.idl
-    keyword cidlflags = commandflags
-
-
-    optional (documentation_outputext) {
-      commandflags (--gen-desc-file) = _Impl.ccd
-    }
-
-  }
-}
diff --git a/modules/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc b/modules/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
index f806abae95a..0d505737d13 100644
--- a/modules/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
+++ b/modules/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
@@ -1,30 +1,22 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Hello_Base Sender"
 
-project(Hello_Base_Sender_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
+project(Hello_Base_Sender_idl_gen) : componentidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
               -Wb,stub_export_include=Sender_stub_export.h \
               -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h
+              -Wb,skel_export_include=Sender_svnt_export.h \
+              -Wb,exec_export_macro=SENDER_EXEC_Export \
+              -Wb,exec_export_include=Sender_exec_export.h
 
   IDL_Files {
     Sender.idl
   }
 }
 
-project(Hello_Base_Sender_cidl_gen) : ciaocidldefaults, avoids_ace_for_tao {
-  custom_only = 1
-  cidlflags += --svnt-export-macro SENDER_SVNT_Export \
-               --svnt-export-include Sender_svnt_export.h
-
-  CIDL_Files {
-    Sender.cidl
-  }
-}
-
 project(Hello_Base_Sender_idle_gen) : ciaoidldefaults, avoids_ace_for_tao {
-  after += Hello_Base_Sender_cidl_gen
+  after += Hello_Base_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,export_macro=SENDER_EXEC_Export \
               -Wb,export_include=Sender_exec_export.h \
@@ -96,9 +88,6 @@ project(Hello_Base_Sender_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = SENDER_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc b/modules/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc
index 2f3230b9e84..0e1ad6cba8e 100644
--- a/modules/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc
+++ b/modules/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_Connector.mpc
@@ -1,32 +1,23 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Hello_Base Sender"
 
-project(Hello_Base_Sender_Connector_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
+project(Hello_Base_Sender_Connector_idl_gen) : componentidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_CONNECTOR_STUB_Export \
               -Wb,stub_export_include=Sender_Connector_stub_export.h \
               -Wb,skel_export_macro=SENDER_CONNECTOR_SVNT_Export \
               -Wb,skel_export_include=Sender_Connector_svnt_export.h \
-               -I%CIAO_ROOT%/connectors
+               -I%CIAO_ROOT%/connectors \
+              -Wb,exec_export_macro=SENDER_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=Sender_Connector_exec_export.h \
 
   IDL_Files {
     Hello_Sender.idl
   }
 }
 
-project(Hello_Base_Sender_Connector_cidl_gen) : ciaocidldefaults, avoids_ace_for_tao {
-  custom_only = 1
-  cidlflags += --svnt-export-macro SENDER_CONNECTOR_SVNT_Export \
-               --svnt-export-include Sender_Connector_svnt_export.h \
-               -I%CIAO_ROOT%/connectors
-
-  CIDL_Files {
-    Hello_Sender_Connector.cidl
-  }
-}
-
 project(Hello_Base_Sender_Connector_idle_gen) : ciaoidldefaults, avoids_ace_for_tao {
-  after += Hello_Base_Sender_Connector_cidl_gen
+  after += Hello_Base_Sender_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,export_macro=SENDER_CONNECTOR_EXEC_Export \
               -Wb,export_include=Sender_Connector_exec_export.h \
@@ -99,9 +90,6 @@ project(Hello_Base_Sender_Connector_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = SENDER_CONNECTOR_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc b/modules/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc
index b25e8c197b6..ba5fc6d4454 100644
--- a/modules/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc
+++ b/modules/CIAO/docs/tutorials/Quoter/Simple/Broker/StockBroker.mpc
@@ -1,30 +1,26 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Stock_Base -c StockBrokerDriver StockBroker"
 
-project(Stock_Base_StockBroker_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
+project(Stock_Base_StockBroker_idl_gen) : componentidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=STOCKBROKER_STUB_Export \
               -Wb,stub_export_include=StockBroker_stub_export.h \
               -Wb,skel_export_macro=STOCKBROKER_SVNT_Export \
-              -Wb,skel_export_include=StockBroker_svnt_export.h
+              -Wb,skel_export_include=StockBroker_svnt_export.h \
+              -Wb,exec_export_macro=STOCKBROKER_EXEC_Export \
+              -Wb,exec_export_include=StockBroker_exec_export.h
 
   IDL_Files {
     StockBroker.idl
   }
 }
 
-project(Stock_Base_StockBroker_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
+project(Stock_Base_StockBroker_idle_gen) : ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
-  cidlflags += --svnt-export-macro STOCKBROKER_SVNT_Export \
-               --svnt-export-include StockBroker_svnt_export.h
   idlflags += -Wb,export_macro=STOCKBROKER_EXEC_Export \
               -Wb,export_include=StockBroker_exec_export.h \
               -SS
 
-  CIDL_Files {
-    StockBroker.cidl
-  }
-
   IDL_Files {
     StockBrokerE.idl
   }
@@ -56,7 +52,7 @@ project(Stock_Base_StockBroker_stub) : ccm_stub, avoids_ace_for_tao {
 }
 
 project(Stock_Base_StockBroker_exec) : ciao_executor, avoids_ace_for_tao {
-  after   += Stock_Base_StockBroker_cidl_gen Stock_Base_StockBroker_stub
+  after   += Stock_Base_StockBroker_idle_gen Stock_Base_StockBroker_stub
   sharedname = StockBroker_exec
   libs += StockBroker_stub Stock_Base_stub
   libpaths += ../Stock_Base
@@ -94,9 +90,6 @@ project(Stock_Base_StockBroker_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = STOCKBROKER_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc b/modules/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc
index e8b1233276b..05f59f94d12 100644
--- a/modules/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc
+++ b/modules/CIAO/docs/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc
@@ -1,30 +1,26 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Stock_Base -c StockDistributorDriver StockDistributor"
 
-project(Stock_Base_StockDistributor_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
+project(Stock_Base_StockDistributor_idl_gen) : componentidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=STOCKDISTRIBUTOR_STUB_Export \
               -Wb,stub_export_include=StockDistributor_stub_export.h \
               -Wb,skel_export_macro=STOCKDISTRIBUTOR_SVNT_Export \
-              -Wb,skel_export_include=StockDistributor_svnt_export.h
+              -Wb,skel_export_include=StockDistributor_svnt_export.h \
+              -Wb,exec_export_macro=STOCKDISTRIBUTOR_EXEC_Export \
+              -Wb,exec_export_include=StockDistributor_exec_export.h
 
   IDL_Files {
     StockDistributor.idl
   }
 }
 
-project(Stock_Base_StockDistributor_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
+project(Stock_Base_StockDistributor_idle_gen) : ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
-  cidlflags += --svnt-export-macro STOCKDISTRIBUTOR_SVNT_Export \
-               --svnt-export-include StockDistributor_svnt_export.h
   idlflags += -Wb,export_macro=STOCKDISTRIBUTOR_EXEC_Export \
               -Wb,export_include=StockDistributor_exec_export.h \
               -SS
 
-  CIDL_Files {
-    StockDistributor.cidl
-  }
-
   IDL_Files {
     StockDistributorE.idl
   }
@@ -56,7 +52,7 @@ project(Stock_Base_StockDistributor_stub) : ccm_stub, avoids_ace_for_tao {
 }
 
 project(Stock_Base_StockDistributor_exec) : ciao_executor, avoids_ace_for_tao {
-  after   += Stock_Base_StockDistributor_cidl_gen Stock_Base_StockDistributor_stub
+  after   += Stock_Base_StockDistributor_idle_gen Stock_Base_StockDistributor_stub
   sharedname = StockDistributor_exec
   libs += StockDistributor_stub Stock_Base_stub
   libpaths += ../Stock_Base
@@ -94,9 +90,6 @@ project(Stock_Base_StockDistributor_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = STOCKDISTRIBUTOR_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc b/modules/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
index 43a41acd68f..1a7b91f3981 100644
--- a/modules/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
+++ b/modules/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
@@ -1,31 +1,26 @@
 // $Id$
 
-project(BMClosedED_stub_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
+project(BMClosedED_stub_gen) : componentidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
-  idlflags += -I $(CIAO_ROOT)/examples/BasicSP
-  idlflags += -Wb,stub_export_macro=BMCLOSEDED_STUB_Export
-  idlflags += -Wb,stub_export_include=BMClosedED_stub_export.h
-  idlflags += -Wb,skel_export_macro=BMCLOSEDED_SVNT_Export
-  idlflags += -Wb,skel_export_include=BMClosedED_svnt_export.h
+  idlflags += -I $(CIAO_ROOT)/examples/BasicSP \
+              -Wb,stub_export_macro=BMCLOSEDED_STUB_Export \
+              -Wb,stub_export_include=BMClosedED_stub_export.h \
+              -Wb,skel_export_macro=BMCLOSEDED_SVNT_Export \
+              -Wb,skel_export_include=BMClosedED_svnt_export.h \
+              -Wb,exec_export_macro=BMCLOSEDED_EXEC_Export \
+              -Wb,exec_export_include=BMClosedED_exec_export.h
 
   IDL_Files {
     BMClosedED.idl
   }
 }
 
-project(BMClosedED_lem_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
+project(BMClosedED_lem_gen) : ciaoidldefaults, avoids_ace_for_tao {
   after += BasicSP_lem_gen
   custom_only = 1
-  cidlflags += -I $(CIAO_ROOT)/examples/BasicSP
-
-  idlflags += -I $(CIAO_ROOT)/examples/BasicSP
   idlflags  +=  -Wb,export_macro=BMCLOSEDED_EXEC_Export \
                 -Wb,export_include=BMClosedED_exec_export.h \
-                -SS
-
-  CIDL_Files {
-    BMClosedED.cidl
-  }
+                -SS -I $(CIAO_ROOT)/examples/BasicSP
 
   IDL_Files {
     BMClosedEDE.idl
@@ -105,9 +100,6 @@ project(BMClosedED_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = BMCLOSEDED_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc b/modules/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
index edf9b5ae417..24910a36644 100644
--- a/modules/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
+++ b/modules/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
@@ -1,31 +1,27 @@
 // $Id$
 
-project(BMDevice_stub_gen): ciaoidldefaults,anytypecode, avoids_ace_for_tao {
+project(BMDevice_stub_gen): componentidldefaults,anytypecode, avoids_ace_for_tao {
   custom_only = 1
-  idlflags += -I $(CIAO_ROOT)/examples/BasicSP
-  idlflags += -Wb,stub_export_macro=BMDEVICE_STUB_Export
-  idlflags += -Wb,stub_export_include=BMDevice_stub_export.h
-  idlflags += -Wb,skel_export_macro=BMDEVICE_SVNT_Export
-  idlflags += -Wb,skel_export_include=BMDevice_svnt_export.h
+  idlflags += -I $(CIAO_ROOT)/examples/BasicSP \
+              -Wb,stub_export_macro=BMDEVICE_STUB_Export \
+              -Wb,stub_export_include=BMDevice_stub_export.h \
+              -Wb,skel_export_macro=BMDEVICE_SVNT_Export \
+              -Wb,skel_export_include=BMDevice_svnt_export.h \
+              -Wb,exec_export_macro=BMDEVICE_EXEC_Export \
+              -Wb,exec_export_include=BMDevice_exec_export.h
 
   IDL_Files {
     BMDevice.idl
   }
 }
 
-project(BMDevice_lem_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
+project(BMDevice_lem_gen) : ciaoidldefaults, avoids_ace_for_tao {
   after += BasicSP_lem_gen
   custom_only = 1
-  cidlflags += -I $(CIAO_ROOT)/examples/BasicSP
-
-  idlflags += -I $(CIAO_ROOT)/examples/BasicSP
   idlflags  +=  -Wb,export_macro=BMDEVICE_EXEC_Export \
                 -Wb,export_include=BMDevice_exec_export.h \
-                -SS
-
-  CIDL_Files {
-    BMDevice.cidl
-  }
+                -SS \
+                -I $(CIAO_ROOT)/examples/BasicSP
 
   IDL_Files {
     BMDeviceE.idl
@@ -105,9 +101,6 @@ project(BMDevice_svnt) : ciao_servant, avoids_ace_for_tao {
   libout = ../lib
   libpaths += ../lib
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc b/modules/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
index a439729a05f..a4ddaeb4d4b 100644
--- a/modules/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
+++ b/modules/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
@@ -1,31 +1,28 @@
 // $Id$
 
-project(BMDisplay_stub_gen): ciaoidldefaults,anytypecode, avoids_ace_for_tao {
+project(BMDisplay_stub_gen): componentidldefaults,anytypecode, avoids_ace_for_tao {
   custom_only = 1
-  idlflags += -I $(CIAO_ROOT)/examples/BasicSP
-  idlflags += -Wb,stub_export_macro=BMDISPLAY_STUB_Export
-  idlflags += -Wb,stub_export_include=BMDisplay_stub_export.h
-  idlflags += -Wb,skel_export_macro=BMDISPLAY_SVNT_Export
-  idlflags += -Wb,skel_export_include=BMDisplay_svnt_export.h
+  idlflags += -I $(CIAO_ROOT)/examples/BasicSP \
+              -Wb,stub_export_macro=BMDISPLAY_STUB_Export \
+              -Wb,stub_export_include=BMDisplay_stub_export.h \
+              -Wb,skel_export_macro=BMDISPLAY_SVNT_Export \
+              -Wb,skel_export_include=BMDisplay_svnt_export.h \
+              -Wb,exec_export_macro=BMDISPLAY_EXEC_Export \
+              -Wb,exec_export_include=BMDisplay_exec_export.h \
 
   IDL_Files {
     BMDisplay.idl
   }
 }
 
-project(BMDisplay_lem_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
+project(BMDisplay_lem_gen) : ciaoidldefaults, avoids_ace_for_tao {
   after += BasicSP_lem_gen
   custom_only = 1
-  cidlflags += -I $(CIAO_ROOT)/examples/BasicSP
 
-  idlflags += -I $(CIAO_ROOT)/examples/BasicSP
-  idlflags  +=  -Wb,export_macro=BMDISPLAY_EXEC_Export \
-                -Wb,export_include=BMDisplay_exec_export.h \
-                -SS
-
-  CIDL_Files {
-    BMDisplay.cidl
-  }
+  idlflags += -I $(CIAO_ROOT)/examples/BasicSP \
+              -Wb,export_macro=BMDISPLAY_EXEC_Export \
+              -Wb,export_include=BMDisplay_exec_export.h \
+              -SS
 
   IDL_Files {
     BMDisplayE.idl
@@ -109,9 +106,6 @@ project(BMDisplay_svnt) : ciao_servant, avoids_ace_for_tao {
   libout = ../lib
   libpaths += ../lib
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/examples/BasicSP/BasicSP.mpc b/modules/CIAO/examples/BasicSP/BasicSP.mpc
index 09aaee51d3b..96d2334782c 100644
--- a/modules/CIAO/examples/BasicSP/BasicSP.mpc
+++ b/modules/CIAO/examples/BasicSP/BasicSP.mpc
@@ -1,27 +1,20 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -n HUDisplay"
 
-project(BasicSP_stub_gen): ciaoidldefaults, anytypecode, avoids_ace_for_tao {
+project(BasicSP_stub_gen): componentidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=BASICSP_STUB_Export \
            -Wb,stub_export_include=BasicSP_stub_export.h \
            -Wb,skel_export_macro=BASICSP_SVNT_Export \
-           -Wb,skel_export_include=BasicSP_svnt_export.h
+           -Wb,skel_export_include=BasicSP_svnt_export.h \
+           -Wb,exec_export_macro=BASICSP_EXEC_Export \
+           -Wb,exec_export_include=BasicSP_exec_export.h \
 
   IDL_Files {
     BasicSP.idl
   }
 }
 
-project(BasicSP_lem_gen) : ciaocidldefaults, avoids_ace_for_tao {
-  custom_only = 1
-  cidlflags += --lem-force-all
-
-  CIDL_Files {
-    BasicSP.idl
-  }
-}
-
 project(BasicSP_lem_gen_idl) : ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
   after += BasicSP_lem_gen
@@ -89,8 +82,6 @@ project(BasicSP_svnt) : ciao_servant, avoids_ace_for_tao {
 
   IDL_Files {
   }
-  CIDL_Files {
-  }
   Header_Files {
     BasicSPS.h
     BasicSP_svnt.h
diff --git a/modules/CIAO/examples/BasicSP/EC/EC.mpc b/modules/CIAO/examples/BasicSP/EC/EC.mpc
index fc59ddf4a96..d01801db4be 100644
--- a/modules/CIAO/examples/BasicSP/EC/EC.mpc
+++ b/modules/CIAO/examples/BasicSP/EC/EC.mpc
@@ -1,31 +1,28 @@
 // $Id$
 
-project(EC_stub_gen): ciaoidldefaults, anytypecode, avoids_ace_for_tao {
+project(EC_stub_gen): componentidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
-  idlflags += -I $(CIAO_ROOT)/examples/BasicSP
-  idlflags += -Wb,stub_export_macro=EC_STUB_Export
-  idlflags += -Wb,stub_export_include=EC_stub_export.h
-  idlflags += -Wb,skel_export_macro=EC_SVNT_Export
-  idlflags += -Wb,skel_export_include=EC_svnt_export.h
+  idlflags += -I $(CIAO_ROOT)/examples/BasicSP \
+              -Wb,stub_export_macro=EC_STUB_Export \
+              -Wb,stub_export_include=EC_stub_export.h \
+              -Wb,skel_export_macro=EC_SVNT_Export \
+              -Wb,skel_export_include=EC_svnt_export.h \
+              -Wb,exec_export_macro=EC_EXEC_Export \
+              -Wb,exec_export_include=EC_exec_export.h
 
   IDL_Files {
     EC.idl
   }
 }
 
-project(EC_lem_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
-  after += BasicSP_lem_gen
+project(EC_lem_gen) : ciaoidldefaults, avoids_ace_for_tao {
+  after += BasicSP_lem_gen EC_stub_gen
   custom_only = 1
-  cidlflags += -I $(CIAO_ROOT)/examples/BasicSP
 
-  idlflags += -I $(CIAO_ROOT)/examples/BasicSP
   idlflags  +=  -Wb,export_macro=EC_EXEC_Export \
                 -Wb,export_include=EC_exec_export.h \
-                -SS
-
-  CIDL_Files {
-    EC.cidl
-  }
+                -SS \
+                -I $(CIAO_ROOT)/examples/BasicSP
 
   IDL_Files {
     ECE.idl
@@ -105,9 +102,6 @@ project(EC_svnt) : ciao_servant, avoids_ace_for_tao {
   libout = ../lib
   libpaths += ../lib
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/examples/DevGuideExamples/Messenger/Administrator.mpc b/modules/CIAO/examples/DevGuideExamples/Messenger/Administrator.mpc
index fbf7dde5025..da4c130b546 100644
--- a/modules/CIAO/examples/DevGuideExamples/Messenger/Administrator.mpc
+++ b/modules/CIAO/examples/DevGuideExamples/Messenger/Administrator.mpc
@@ -88,9 +88,6 @@ project(Messenger_Administrator_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = ADMINISTRATOR_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/examples/Display/GPS/GPS.mpc b/modules/CIAO/examples/Display/GPS/GPS.mpc
index a25de041e0c..1d9bb99d19e 100644
--- a/modules/CIAO/examples/Display/GPS/GPS.mpc
+++ b/modules/CIAO/examples/Display/GPS/GPS.mpc
@@ -1,30 +1,26 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Display_Base -u Display GPS"
 
-project(Display_GPS_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
+project(Display_GPS_idl_gen) : componentidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=GPS_STUB_Export \
               -Wb,stub_export_include=GPS_stub_export.h \
               -Wb,skel_export_macro=GPS_SVNT_Export \
-              -Wb,skel_export_include=GPS_svnt_export.h
+              -Wb,skel_export_include=GPS_svnt_export.h \
+              -Wb,exec_export_macro=GPS_EXEC_Export \
+              -Wb,exec_export_include=GPS_exec_export.h \
 
   IDL_Files {
     GPS.idl
   }
 }
 
-project(Display_GPS_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
+project(Display_GPS_idle_gen) : ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
-  cidlflags += --svnt-export-macro GPS_SVNT_Export \
-               --svnt-export-include GPS_svnt_export.h
   idlflags += -Wb,export_macro=GPS_EXEC_Export \
               -Wb,export_include=GPS_exec_export.h \
               -SS
 
-  CIDL_Files {
-    GPS.cidl
-  }
-
   IDL_Files {
     GPSE.idl
   }
@@ -57,7 +53,7 @@ project(Display_GPS_stub) : ccm_stub, avoids_ace_for_tao {
 }
 
 project(Display_GPS_exec) : ciao_executor, avoids_ace_for_tao {
-  after   += Display_GPS_cidl_gen Display_GPS_stub
+  after   += Display_GPS_idle_gen Display_GPS_stub
   sharedname = GPS_exec
   libs += GPS_stub Display_Base_stub
   libout = ../lib
@@ -97,9 +93,6 @@ project(Display_GPS_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = GPS_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/examples/Display/NavDisplay/NavDisplay.mpc b/modules/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
index 5b5b455309c..4bb067e506c 100644
--- a/modules/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
+++ b/modules/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
@@ -1,30 +1,27 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Display_Base -u Display NavDisplay"
 
-project(Display_NavDisplay_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
+project(Display_NavDisplay_idl_gen) : componentidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   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
+              -Wb,skel_export_include=NavDisplay_svnt_export.h \
+              -Wb,exec_export_macro=NAVDISPLAY_EXEC_Export \
+              -Wb,exec_export_include=NavDisplay_exec_export.h \
 
   IDL_Files {
     NavDisplay.idl
   }
 }
 
-project(Display_NavDisplay_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
+project(Display_NavDisplay_idle_gen) : ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
-  cidlflags += --svnt-export-macro NAVDISPLAY_SVNT_Export \
-               --svnt-export-include NavDisplay_svnt_export.h
+  after += Display_NavDisplay_idl_gen
   idlflags += -Wb,export_macro=NAVDISPLAY_EXEC_Export \
               -Wb,export_include=NavDisplay_exec_export.h \
               -SS
 
-  CIDL_Files {
-    NavDisplay.cidl
-  }
-
   IDL_Files {
     NavDisplayE.idl
   }
@@ -57,7 +54,7 @@ project(Display_NavDisplay_stub) : ccm_stub, avoids_ace_for_tao {
 }
 
 project(Display_NavDisplay_exec) : ciao_executor, avoids_ace_for_tao {
-  after   += Display_NavDisplay_cidl_gen Display_NavDisplay_stub
+  after   += Display_NavDisplay_idle_gen Display_NavDisplay_stub
   sharedname = NavDisplay_exec
   libs += NavDisplay_stub Display_Base_stub
   libout = ../lib
@@ -97,9 +94,6 @@ project(Display_NavDisplay_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = NAVDISPLAY_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc b/modules/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
index aef24de920b..8da56fc3747 100644
--- a/modules/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
+++ b/modules/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
@@ -11,7 +11,7 @@ project(Display_NavDisplayGUI_exec_moc) : ace_qt4, qt4_qt3support {
 }
 
 project(Display_NavDisplayGUI_exec) : ciao_executor, ace_qt4, qt4_qt3support, avoids_ace_for_tao {
-  after   += Display_NavDisplay_cidl_gen \
+  after   += Display_NavDisplay_idle_gen \
              Display_NavDisplay_stub \
              Display_NavDisplayGUI_exec_moc
   sharedname = NavDisplayGUI_exec
@@ -66,9 +66,6 @@ project(Display_NavDisplayGUI_svnt) : ciao_servant, ace_qt4, qt4_qt3support, avo
   libout = ../lib
   libpaths += ../lib
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/examples/Display/RateGen/RateGen.mpc b/modules/CIAO/examples/Display/RateGen/RateGen.mpc
index 5007485dea8..479fa14b1b1 100644
--- a/modules/CIAO/examples/Display/RateGen/RateGen.mpc
+++ b/modules/CIAO/examples/Display/RateGen/RateGen.mpc
@@ -1,30 +1,27 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Display_Base -u Display -c controller RateGen"
 
-project(Display_RateGen_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
+project(Display_RateGen_idl_gen) : componentidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RATEGEN_STUB_Export \
               -Wb,stub_export_include=RateGen_stub_export.h \
               -Wb,skel_export_macro=RATEGEN_SVNT_Export \
-              -Wb,skel_export_include=RateGen_svnt_export.h
+              -Wb,skel_export_include=RateGen_svnt_export.h \
+              -Wb,exec_export_macro=RATEGEN_EXEC_Export \
+              -Wb,exec_export_include=RateGen_exec_export.h
 
   IDL_Files {
     RateGen.idl
   }
 }
 
-project(Display_RateGen_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
+project(Display_RateGen_idle_gen) : ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
-  cidlflags += --svnt-export-macro RATEGEN_SVNT_Export \
-               --svnt-export-include RateGen_svnt_export.h
+  after += Display_RateGen_idl_gen
   idlflags += -Wb,export_macro=RATEGEN_EXEC_Export \
               -Wb,export_include=RateGen_exec_export.h \
               -SS
 
-  CIDL_Files {
-    RateGen.cidl
-  }
-
   IDL_Files {
     RateGenE.idl
   }
@@ -59,7 +56,7 @@ project(Display_RateGen_stub) : ccm_stub, avoids_ace_for_tao {
 project(Display_RateGen_exec) : ciao_executor, avoids_ace_for_tao {
   libout = ../lib
   libpaths += ../lib
-  after   += Display_RateGen_cidl_gen Display_RateGen_stub
+  after   += Display_RateGen_idle_gen Display_RateGen_stub
   sharedname = RateGen_exec
   libs += RateGen_stub Display_Base_stub
 
@@ -97,9 +94,6 @@ project(Display_RateGen_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = RATEGEN_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/examples/Hello/Sender/Sender.mpc b/modules/CIAO/examples/Hello/Sender/Sender.mpc
index 9772a7e9b82..926522d24cf 100644
--- a/modules/CIAO/examples/Hello/Sender/Sender.mpc
+++ b/modules/CIAO/examples/Hello/Sender/Sender.mpc
@@ -8,7 +8,7 @@ project(Hello_Sender_idl_gen) : componentidldefaults, anytypecode, avoids_ace_fo
               -Wb,skel_export_macro=SENDER_SVNT_Export \
               -Wb,skel_export_include=Sender_svnt_export.h \
               -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
+              -Wb,exec_export_include=Sender_exec_export.h
 
   IDL_Files {
     Sender.idl
@@ -94,9 +94,6 @@ project(Hello_Sender_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = SENDER_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/examples/Null_Component/Null_Component.mpc b/modules/CIAO/examples/Null_Component/Null_Component.mpc
index b12f45c05e0..b72a6621be2 100644
--- a/modules/CIAO/examples/Null_Component/Null_Component.mpc
+++ b/modules/CIAO/examples/Null_Component/Null_Component.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Null_Interface Null_Component"
 
-project(Null_Component_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
+project(Null_Component_idl_gen) : componentidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=NULL_COMPONENT_STUB_Export \
               -Wb,stub_export_include=Null_Component_stub_export.h \
@@ -88,9 +88,6 @@ project(Null_Component_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = NULL_COMPONENT_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/examples/Swapping/Receiver/Receiver.mpc b/modules/CIAO/examples/Swapping/Receiver/Receiver.mpc
index f5e51884325..4bc1eacc041 100644
--- a/modules/CIAO/examples/Swapping/Receiver/Receiver.mpc
+++ b/modules/CIAO/examples/Swapping/Receiver/Receiver.mpc
@@ -1,30 +1,25 @@
 // $Id$
 // This file is generated with "generate_component_mpc_extra.pl -p Hello_Base Receiver"
 
-project(Swapping_Hello_Receiver_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
+project(Swapping_Hello_Receiver_idl_gen) : componentidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   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
+              -Wb,skel_export_include=Receiver_svnt_export.h \
+              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
+              -Wb,exec_export_include=Receiver_exec_export.h \
 
   IDL_Files {
     Receiver.idl
   }
 }
 
-project(Swapping_Hello_Receiver_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
+project(Swapping_Hello_Receiver_idle_gen) : ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
-  cidlflags += --svnt-export-macro RECEIVER_SVNT_Export \
-               --svnt-export-include Receiver_svnt_export.h \
-               --custom-container upgradeable
   idlflags += -Wb,export_macro=RECEIVER_SVNT_Export \
               -Wb,export_include=Receiver_svnt_export.h \
               -SS
-  CIDL_Files {
-    Receiver.cidl
-  }
-
   IDL_Files {
     ReceiverE.idl
   }
@@ -59,7 +54,7 @@ project(Swapping_Hello_Receiver_stub): ccm_stub, avoids_ace_for_tao {
 project(Swapping_Hello_Receiver_svnt) : ciao_servant, avoids_ace_for_tao {
   after += Swapping_Hello_Base_skel \
            Swapping_Hello_Receiver_stub \
-           Swapping_Hello_Receiver_cidl_gen
+           Swapping_Hello_Receiver_idle_gen
   sharedname  = Swapping_Receiver_svnt
   libs    += Swapping_Receiver_stub \
              Swapping_Hello_Base_skel \
@@ -68,9 +63,6 @@ project(Swapping_Hello_Receiver_svnt) : ciao_servant, avoids_ace_for_tao {
   dynamicflags = RECEIVER_SVNT_BUILD_DLL
   requires += dummy_label
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/examples/Swapping/Sender/Sender.mpc b/modules/CIAO/examples/Swapping/Sender/Sender.mpc
index c3dbf9c29b4..f19dea3f895 100644
--- a/modules/CIAO/examples/Swapping/Sender/Sender.mpc
+++ b/modules/CIAO/examples/Swapping/Sender/Sender.mpc
@@ -1,33 +1,26 @@
 // $Id$
 // This file is generated with "generate_component_mpc_extra.pl -p Hello_Base Sender"
 
-project(Swapping_Hello_Sender_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
-  requires += dummy_label
+project(Swapping_Hello_Sender_idl_gen) : componentidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
               -Wb,stub_export_include=Sender_stub_export.h \
               -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h
+              -Wb,skel_export_include=Sender_svnt_export.h \
+              -Wb,exec_export_macro=SENDER_EXEC_Export \
+              -Wb,exec_export_include=Sender_exec_export.h
 
   IDL_Files {
     Sender.idl
   }
 }
 
-project(Swapping_Hello_Sender_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
-  requires += dummy_label
+project(Swapping_Hello_Sender_idle_gen) : ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
-  cidlflags += --svnt-export-macro SENDER_SVNT_Export \
-               --svnt-export-include Sender_svnt_export.h \
-               --custom-container upgradeable
   idlflags += -Wb,export_macro=SENDER_SVNT_Export \
               -Wb,export_include=Sender_svnt_export.h \
               -SS
 
-  CIDL_Files {
-    Sender.cidl
-  }
-
   IDL_Files {
     SenderE.idl
   }
@@ -64,7 +57,7 @@ project(Swapping_Hello_Sender_svnt) : ciao_servant, avoids_ace_for_tao {
   libpaths += ../Hello_Base
   after += Swapping_Hello_Base_skel \
            Swapping_Hello_Sender_stub \
-           Swapping_Hello_Sender_cidl_gen
+           Swapping_Hello_Sender_idle_gen
   sharedname  = Swapping_Sender_svnt
   libs    += Swapping_Sender_stub \
              Swapping_Hello_Base_skel \
@@ -72,9 +65,6 @@ project(Swapping_Hello_Sender_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = SENDER_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc b/modules/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
index 3ee05af0c99..508232f4c23 100644
--- a/modules/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
+++ b/modules/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
@@ -1,30 +1,26 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Benchmark -l .. -c client Roundtrip"
 
-project(Benchmark_RoundTrip_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
+project(Benchmark_RoundTrip_idl_gen) : componentidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=ROUNDTRIP_STUB_Export \
               -Wb,stub_export_include=RoundTrip_stub_export.h \
               -Wb,skel_export_macro=ROUNDTRIP_SVNT_Export \
-              -Wb,skel_export_include=RoundTrip_svnt_export.h
+              -Wb,skel_export_include=RoundTrip_svnt_export.h \
+              -Wb,exec_export_macro=ROUNDTRIP_EXEC_Export \
+              -Wb,exec_export_include=RoundTrip_exec_export.h
 
   IDL_Files {
     RoundTrip.idl
   }
 }
 
-project(Benchmark_RoundTrip_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
+project(Benchmark_RoundTrip_idle_gen) : ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
-  cidlflags += --svnt-export-macro ROUNDTRIP_SVNT_Export \
-               --svnt-export-include RoundTrip_svnt_export.h
   idlflags += -Wb,export_macro=ROUNDTRIP_EXEC_Export \
               -Wb,export_include=RoundTrip_exec_export.h \
               -SS
 
-  CIDL_Files {
-    RoundTrip.cidl
-  }
-
   IDL_Files {
     RoundTripE.idl
     RoundTripEI.idl << RoundTripE.idl
@@ -56,7 +52,7 @@ project(Benchmark_RoundTrip_stub) : ccm_stub, avoids_ace_for_tao {
 }
 
 project(Benchmark_RoundTrip_exec) : ciao_executor, avoids_ace_for_tao {
-  after   += Benchmark_RoundTrip_cidl_gen Benchmark_RoundTrip_stub
+  after   += Benchmark_RoundTrip_idle_gen Benchmark_RoundTrip_stub
   sharedname = RoundTrip_exec
   libs += RoundTrip_stub Benchmark_stub
   libpaths += ..
@@ -95,9 +91,6 @@ project(Benchmark_RoundTrip_svnt) : ciao_servant, avoids_ace_for_tao {
   libpaths += ..
   dynamicflags = ROUNDTRIP_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc b/modules/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
index 65f7a5db712..5605f1a54fb 100644
--- a/modules/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
+++ b/modules/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
@@ -1,30 +1,26 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Benchmark -l .. -c client RoundTripClient"
 
-project(Benchmark_RoundTripClient_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
+project(Benchmark_RoundTripClient_idl_gen) : componentidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=ROUNDTRIPCLIENT_STUB_Export \
               -Wb,stub_export_include=RoundTripClient_stub_export.h \
               -Wb,skel_export_macro=ROUNDTRIPCLIENT_SVNT_Export \
-              -Wb,skel_export_include=RoundTripClient_svnt_export.h
+              -Wb,skel_export_include=RoundTripClient_svnt_export.h \
+              -Wb,exec_export_macro=ROUNDTRIPCLIENT_EXEC_Export \
+              -Wb,exec_export_include=RoundTripClient_exec_export.h \
 
   IDL_Files {
     RoundTripClient.idl
   }
 }
 
-project(Benchmark_RoundTripClient_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
+project(Benchmark_RoundTripClient_idle_gen) : ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
-  cidlflags += --svnt-export-macro ROUNDTRIPCLIENT_SVNT_Export \
-               --svnt-export-include RoundTripClient_svnt_export.h
   idlflags += -Wb,export_macro=ROUNDTRIPCLIENT_EXEC_Export \
               -Wb,export_include=RoundTripClient_exec_export.h \
               -SS
 
-  CIDL_Files {
-    RoundTripClient.cidl
-  }
-
   IDL_Files {
     RoundTripClientE.idl
     RoundTripClientEI.idl << RoundTripClientE.idl
@@ -56,7 +52,7 @@ project(Benchmark_RoundTripClient_stub) : ccm_stub, avoids_ace_for_tao {
 }
 
 project(Benchmark_RoundTripClient_exec) : ciao_executor, avoids_ace_for_tao {
-  after   += Benchmark_RoundTripClient_cidl_gen Benchmark_RoundTripClient_stub
+  after   += Benchmark_RoundTripClient_idle_gen Benchmark_RoundTripClient_stub
   sharedname = RoundTripClient_exec
   libs += RoundTripClient_stub Benchmark_stub
   libpaths += ..
@@ -95,9 +91,6 @@ project(Benchmark_RoundTripClient_svnt) : ciao_servant, avoids_ace_for_tao {
   libpaths += ..
   dynamicflags = ROUNDTRIPCLIENT_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc b/modules/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
index 38c01bdc457..ec24228b19f 100644
--- a/modules/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
+++ b/modules/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
@@ -1,30 +1,26 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Protocols Receiver"
 
-project(Protocols_Receiver_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
+project(Protocols_Receiver_idl_gen) : componentidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   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
+              -Wb,skel_export_include=Receiver_svnt_export.h \
+              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
+              -Wb,exec_export_include=Receiver_exec_export.h \
 
   IDL_Files {
     Receiver.idl
   }
 }
 
-project(Protocols_Receiver_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
+project(Protocols_Receiver_idle_gen) : ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
-  cidlflags += --svnt-export-macro RECEIVER_SVNT_Export \
-               --svnt-export-include Receiver_svnt_export.h
   idlflags += -Wb,export_macro=RECEIVER_EXEC_Export \
               -Wb,export_include=Receiver_exec_export.h \
               -SS
 
-  CIDL_Files {
-    Receiver.cidl
-  }
-
   IDL_Files {
     ReceiverE.idl
   }
@@ -56,7 +52,7 @@ project(Protocols_Receiver_stub) : ccm_stub, avoids_ace_for_tao {
 }
 
 project(Protocols_Receiver_exec) : ciao_executor, avoids_ace_for_tao {
-  after   += Protocols_Receiver_cidl_gen Protocols_Receiver_stub
+  after   += Protocols_Receiver_idle_gen Protocols_Receiver_stub
   sharedname = Protocols_Receiver_exec
   libs += Protocols_Receiver_stub \
           Protocols_stub
@@ -95,9 +91,6 @@ project(Protocols_Receiver_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = RECEIVER_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/performance-tests/Protocols/Sender/Sender.mpc b/modules/CIAO/performance-tests/Protocols/Sender/Sender.mpc
index 69f68354ae0..e3b4292730f 100644
--- a/modules/CIAO/performance-tests/Protocols/Sender/Sender.mpc
+++ b/modules/CIAO/performance-tests/Protocols/Sender/Sender.mpc
@@ -1,30 +1,26 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Protocols Sender"
 
-project(Protocols_Sender_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
+project(Protocols_Sender_idl_gen) : componentidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
               -Wb,stub_export_include=Sender_stub_export.h \
               -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h
+              -Wb,skel_export_include=Sender_svnt_export.h \
+              -Wb,exec_export_macro=SENDER_EXEC_Export \
+              -Wb,exec_export_include=Sender_exec_export.h
 
   IDL_Files {
     Sender.idl
   }
 }
 
-project(Protocols_Sender_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
+project(Protocols_Sender_idle_gen) : ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
-  cidlflags += --svnt-export-macro SENDER_SVNT_Export \
-               --svnt-export-include Sender_svnt_export.h
   idlflags += -Wb,export_macro=SENDER_EXEC_Export \
               -Wb,export_include=Sender_exec_export.h \
               -SS
 
-  CIDL_Files {
-    Sender.cidl
-  }
-
   IDL_Files {
     SenderE.idl
   }
@@ -56,7 +52,7 @@ project(Protocols_Sender_stub) : ccm_stub, avoids_ace_for_tao {
 }
 
 project(Protocols_Sender_exec) : ciao_executor, rtcorba, avoids_ace_for_tao {
-  after   += Protocols_Sender_cidl_gen Protocols_Sender_stub
+  after   += Protocols_Sender_idle_gen Protocols_Sender_stub
   sharedname = Protocols_Sender_exec
   libs += Protocols_Sender_stub \
           Protocols_stub
@@ -97,9 +93,6 @@ project(Protocols_Sender_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = SENDER_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc b/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
index 8effb54af3d..d6f6c6edbdf 100644
--- a/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
+++ b/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
@@ -1,6 +1,33 @@
 //$Id$
 
-project(TSEC_CheckPoint_stub): ccm_stub, event, avoids_ace_for_tao {
+project(TSEC_CheckPoint_idl_gen) : componentidldefaults, anytypecode, avoids_ace_for_tao {
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=TSEC_CHECKPOINT_STUB_Export \
+              -Wb,stub_export_include=TSEC_CheckPoint_stub_export.h \
+              -Wb,skel_export_macro=TSEC_CHECKPOINT_SVNT_Export \
+              -Wb,skel_export_include=TSEC_CheckPoint_svnt_export.h \
+              -Wb,exec_export_macro=TSEC_CHECKPOINT_EXEC_Export \
+              -Wb,exec_export_include=TSEC_CheckPoint_exec_export.h \
+
+  IDL_Files {
+    TSEC_CheckPoint.idl
+  }
+}
+
+project(TSEC_CheckPoint_idle_gen) : ciaoidldefaults, avoids_ace_for_tao {
+  custom_only = 1
+  after += TSEC_CheckPoint_idl_gen
+  idlflags  +=  -SS -St \
+                -Wb,export_macro=TSEC_CHECKPOINT_EXEC_Export \
+                -Wb,export_include=TSEC_CheckPoint_exec_export.h
+
+  IDL_Files {
+    TSEC_CheckPointE.idl
+  }
+}
+
+
+project(SimpleComponent_idle_gen): ccm_stub, event, avoids_ace_for_tao {
   after  += ENW_stub
   libpaths += ../interfaces
   libs     += ENW_stub
@@ -31,17 +58,9 @@ project(TSEC_CheckPoint_svnt) : ciao_servant, event, avoids_ace_for_tao {
   libs     += ENW_stub ENW_skel
 
   idlflags -= -GT
-  idlflags  +=  -SS -St \
-                -Wb,export_macro=TSEC_CHECKPOINT_SVNT_Export \
-                -Wb,export_include=TSEC_CheckPoint_svnt_export.h
   dynamicflags = TSEC_CHECKPOINT_SVNT_BUILD_DLL
 
-  CIDL_Files {
-    TSEC_CheckPoint.cidl
-  }
-
   IDL_Files {
-    TSEC_CheckPointE.idl
   }
 
   Source_Files {
diff --git a/modules/CIAO/tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc b/modules/CIAO/tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc
index c2759cbe861..de294d1cdb5 100644
--- a/modules/CIAO/tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc
+++ b/modules/CIAO/tests/CIAO_ComponentServer/SimpleComponent/SimpleComponent.mpc
@@ -1,31 +1,25 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl SimpleComponent"
 
-project(SimpleComponent_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
+project(SimpleComponent_idl_gen) : componentidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SIMPLECOMPONENT_STUB_Export \
               -Wb,stub_export_include=SimpleComponent_stub_export.h \
               -Wb,skel_export_macro=SIMPLECOMPONENT_SVNT_Export \
-              -Wb,skel_export_include=SimpleComponent_svnt_export.h
+              -Wb,skel_export_include=SimpleComponent_svnt_export.h \
+              -Wb,exec_export_macro=SIMPLECOMPONENT_EXEC_Export \
+              -Wb,exec_export_include=SimpleComponent_exec_export.h \
 
   IDL_Files {
     SimpleComponent.idl
   }
 }
 
-project(SimpleComponent_cidl_gen) : ciaocidldefaults, avoids_ace_for_tao {
-  custom_only = 1
-
-  CIDL_Files {
-    SimpleComponent.cidl
-  }
-}
-
 project(SimpleComponent_idle_gen) : ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
-  after += SimpleComponent_cidl_gen
-  idlflags  += -Wb,stub_export_macro=SIMPLECOMPONENT_EXEC_Export \
-               -Wb,stub_export_include=SimpleComponent_exec_export.h \
+  after += SimpleComponent_idl_gen
+  idlflags  += -Wb,export_macro=SIMPLECOMPONENT_EXEC_Export \
+               -Wb,export_include=SimpleComponent_exec_export.h \
                -SS
 
   IDL_Files {
@@ -89,8 +83,6 @@ project(SimpleComponent_svnt) : ciao_servant, avoids_ace_for_tao {
   after      += SimpleComponent_stub SimpleComponent_exec
   dynamicflags = SIMPLECOMPONENT_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
   IDL_Files {
   }
   Source_Files {
diff --git a/modules/CIAO/tests/CIDL/CodeGen/Basic.idl b/modules/CIAO/tests/CIDL/CodeGen/Basic.idl
index 2d8ab209e5a..e85568837d5 100644
--- a/modules/CIAO/tests/CIDL/CodeGen/Basic.idl
+++ b/modules/CIAO/tests/CIDL/CodeGen/Basic.idl
@@ -21,6 +21,14 @@ module Extra
   exception NoReason {};
   exception NoRhyme {};
 
+    struct UserDataQosPolicy {
+        sequence<octet> value;
+    };
+
+  struct key {
+    long value[3];
+  };
+
   interface Superfluous
   {
     attribute string useless_attr;
diff --git a/modules/CIAO/tests/CIDL/CodeGen/CodeGen.mpc b/modules/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
index 2d082d8a211..adf88e5f082 100644
--- a/modules/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
+++ b/modules/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
@@ -6,31 +6,26 @@
 //       caution when regenerating this file (that is, remember to
 //       insert the logic for autogeneration of executor files).
 
-project(Basic_CodeGen_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
+project(Basic_CodeGen_idl_gen) : componentidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CODEGEN_STUB_Export \
               -Wb,stub_export_include=CodeGen_stub_export.h \
               -Wb,skel_export_macro=CODEGEN_SVNT_Export \
-              -Wb,skel_export_include=CodeGen_svnt_export.h
+              -Wb,skel_export_include=CodeGen_svnt_export.h \
+              -Wb,export_macro=CODEGEN_EXEC_Export \
+              -Wb,export_include=CodeGen_exec_export.h \
+              -Gex
 
   IDL_Files {
     CodeGen.idl
   }
 }
 
-project(Basic_CodeGen_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
+project(Basic_CodeGen_idle_gen) : ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
-  cidlflags += --svnt-export-macro CODEGEN_SVNT_Export \
-               --svnt-export-include CodeGen_svnt_export.h \
-               --gen-exec-impl
   idlflags += -Wb,export_macro=CODEGEN_EXEC_Export \
               -Wb,export_include=CodeGen_exec_export.h \
               -SS
-
-  CIDL_Files {
-    CodeGen.cidl
-  }
-
   IDL_Files {
     CodeGenE.idl
   }
@@ -61,7 +56,7 @@ project(Basic_CodeGen_stub) : ccm_stub, avoids_ace_for_tao {
 }
 
 project(Basic_CodeGen_exec) : ciao_executor, avoids_ace_for_tao {
-  after   += Basic_CodeGen_cidl_gen Basic_CodeGen_stub
+  after   += Basic_CodeGen_idle_gen Basic_CodeGen_stub
   sharedname = CodeGen_exec
   libs += CodeGen_stub Basic_stub
 
@@ -97,9 +92,6 @@ project(Basic_CodeGen_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = CODEGEN_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.mpc b/modules/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.mpc
index facff9d8b5a..457c61ddb32 100644
--- a/modules/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.mpc
+++ b/modules/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.mpc
@@ -84,14 +84,14 @@ project(Cornucopia_skel) : ccm_svnt, avoids_ace_for_tao {
   libs += Cornucopia_stub
 
   dynamicflags = CORNUCOPIA_SKEL_BUILD_DLL
-  
+
   IDL_Files {
   }
-  
+
   Source_Files {
     CornucopiaS.cpp
   }
-  
+
   Header_Files {
     CornucopiaS.h
     Cornucopia_skel_export.h
@@ -111,9 +111,6 @@ project(Cornucopia_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = CORNUCOPIA_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/tests/IDL_Test/Reused_Facet_Interface/CodeGen.mpc b/modules/CIAO/tests/IDL_Test/Reused_Facet_Interface/CodeGen.mpc
index 61a1e8fcc09..3f0ba73f533 100644
--- a/modules/CIAO/tests/IDL_Test/Reused_Facet_Interface/CodeGen.mpc
+++ b/modules/CIAO/tests/IDL_Test/Reused_Facet_Interface/CodeGen.mpc
@@ -1,7 +1,7 @@
 // $Id$
 //
 
-project(Basic_CodeGen_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
+project(Reused_Facet_Interface_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CODEGEN_STUB_Export \
               -Wb,stub_export_include=CodeGen_stub_export.h \
@@ -14,8 +14,8 @@ project(Basic_CodeGen_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_ta
   }
 }
 
-project(Basic_CodeGen_idle_gen) : ciaoidldefaults, avoids_ace_for_tao {
-  after += Basic_CodeGen_idl_gen
+project(Reused_Facet_Interface_idle_gen) : ciaoidldefaults, avoids_ace_for_tao {
+  after += Reused_Facet_Interface_idl_gen
   custom_only = 1
   idlflags += -Wb,export_macro=CODEGEN_EXEC_Export \
               -Wb,export_include=CodeGen_exec_export.h \
@@ -26,8 +26,8 @@ project(Basic_CodeGen_idle_gen) : ciaoidldefaults, avoids_ace_for_tao {
   }
 }
 
-project(Basic_CodeGen_stub) : ccm_stub, avoids_ace_for_tao {
-  after += Basic_CodeGen_idl_gen Basic_stub
+project(Reused_Facet_Interface_stub) : ccm_stub, avoids_ace_for_tao {
+  after += Reused_Facet_Interface_idl_gen Basic_stub
   libs  += Basic_stub
 
   sharedname = CodeGen_stub
@@ -50,8 +50,8 @@ project(Basic_CodeGen_stub) : ccm_stub, avoids_ace_for_tao {
   }
 }
 
-project(Basic_CodeGen_exec) : ciao_executor, avoids_ace_for_tao {
-  after   += Basic_CodeGen_idle_gen Basic_CodeGen_stub
+project(Reused_Facet_Interface_exec) : ciao_executor, avoids_ace_for_tao {
+  after   += Reused_Facet_Interface_idle_gen Reused_Facet_Interface_stub
   sharedname = CodeGen_exec
   libs += CodeGen_stub Basic_stub
 
@@ -77,8 +77,8 @@ project(Basic_CodeGen_exec) : ciao_executor, avoids_ace_for_tao {
 }
 
 
-project(Basic_CodeGen_svnt) : ciao_servant, avoids_ace_for_tao {
-  after      += Basic_skel Basic_CodeGen_exec
+project(Reused_Facet_Interface_svnt) : ciao_servant, avoids_ace_for_tao {
+  after      += Basic_skel Reused_Facet_Interface_exec
   sharedname  = CodeGen_svnt
   libs       += CodeGen_exec \
                 CodeGen_stub \
@@ -87,9 +87,6 @@ project(Basic_CodeGen_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = CODEGEN_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/tests/Minimum/Receiver/Receiver.mpc b/modules/CIAO/tests/Minimum/Receiver/Receiver.mpc
index 3c3ed01d829..c0bc0ccf809 100644
--- a/modules/CIAO/tests/Minimum/Receiver/Receiver.mpc
+++ b/modules/CIAO/tests/Minimum/Receiver/Receiver.mpc
@@ -1,28 +1,25 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Minimum_Base Receiver"
 
-project(Minimum_Base_Receiver_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
+project(Minimum_Base_Receiver_idl_gen) : componentidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   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
+              -Wb,skel_export_include=Receiver_svnt_export.h \
+              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
+              -Wb,exec_export_include=Receiver_exec_export.h
 
   IDL_Files {
     Receiver.idl
   }
 }
 
-project(Minimum_Base_Receiver_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
+project(Minimum_Base_Receiver_idle_gen) : ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
-  cidlflags += --svnt-export-macro RECEIVER_SVNT_Export \
-               --svnt-export-include Receiver_svnt_export.h
 
-  cidlflags += -I$(CIAO_ROOT)/ccm
-
-  CIDL_Files {
-    Receiver.cidl
-  }
+  idlflags += -Wb,export_macro=RECEIVER_EXEC_Export \
+              -Wb,export_include=Receiver_exec_export.h
 
   IDL_Files {
     ReceiverE.idl
@@ -55,7 +52,7 @@ project(Minimum_Base_Receiver_stub) : ccm_stub, avoids_ace_for_tao {
 }
 
 project(Minimum_Base_Receiver_exec) : ciao_executor, avoids_ace_for_tao {
-  after   += Minimum_Base_Receiver_cidl_gen Minimum_Base_Receiver_stub
+  after   += Minimum_Base_Receiver_idle_gen Minimum_Base_Receiver_stub
   sharedname = Receiver_exec
   libs += Receiver_stub Minimum_Base_stub
   libpaths += ../Minimum_Base
@@ -92,9 +89,6 @@ project(Minimum_Base_Receiver_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = RECEIVER_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/tests/Minimum/Sender/Sender.mpc b/modules/CIAO/tests/Minimum/Sender/Sender.mpc
index 5682020e37c..f5232c3b346 100644
--- a/modules/CIAO/tests/Minimum/Sender/Sender.mpc
+++ b/modules/CIAO/tests/Minimum/Sender/Sender.mpc
@@ -1,30 +1,26 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Minimum_Base Sender"
 
-project(Minimum_Base_Sender_idl_gen) : ciaoidldefaults, anytypecode, avoids_ace_for_tao {
+project(Minimum_Base_Sender_idl_gen) : componentidldefaults, anytypecode, avoids_ace_for_tao {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
               -Wb,stub_export_include=Sender_stub_export.h \
               -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h
+              -Wb,skel_export_include=Sender_svnt_export.h \
+              -Wb,exec_export_macro=SENDER_EXEC_Export \
+              -Wb,exec_export_include=Sender_exec_export.h \
 
   IDL_Files {
     Sender.idl
   }
 }
 
-project(Minimum_Base_Sender_cidl_gen) : ciaocidldefaults, ciaoidldefaults, avoids_ace_for_tao {
+project(Minimum_Base_Sender_idle_gen) : ciaoidldefaults, avoids_ace_for_tao {
   custom_only = 1
-  cidlflags += --svnt-export-macro SENDER_SVNT_Export \
-               --svnt-export-include Sender_svnt_export.h
   idlflags += -Wb,export_macro=SENDER_EXEC_Export \
               -Wb,export_include=Sender_exec_export.h \
               -SS
 
-  CIDL_Files {
-    Sender.cidl
-  }
-
   IDL_Files {
     SenderE.idl
   }
@@ -56,7 +52,7 @@ project(Minimum_Base_Sender_stub) : ccm_stub, avoids_ace_for_tao {
 }
 
 project(Minimum_Base_Sender_exec) : ciao_executor, avoids_ace_for_tao {
-  after   += Minimum_Base_Sender_cidl_gen Minimum_Base_Sender_stub
+  after   += Minimum_Base_Sender_idle_gen Minimum_Base_Sender_stub
   sharedname = Sender_exec
   libs += Sender_stub Minimum_Base_stub
   libpaths += ../Minimum_Base
@@ -94,9 +90,6 @@ project(Minimum_Base_Sender_svnt) : ciao_servant, avoids_ace_for_tao {
 
   dynamicflags = SENDER_SVNT_BUILD_DLL
 
-  CIDL_Files {
-  }
-
   IDL_Files {
   }
 
diff --git a/modules/CIAO/tools/Config_Handlers/XML_File_Intf.cpp b/modules/CIAO/tools/Config_Handlers/XML_File_Intf.cpp
index 274628f2aaf..7259244d67d 100644
--- a/modules/CIAO/tools/Config_Handlers/XML_File_Intf.cpp
+++ b/modules/CIAO/tools/Config_Handlers/XML_File_Intf.cpp
@@ -28,41 +28,41 @@ namespace CIAO
         {
           if (!XML_Helper::XML_HELPER.is_initialized ())
             return false;
-          
+
           CIAO_DEBUG ((LM_TRACE, CLINFO "XML_File_Intf::read_process_file - "
                        "Constructing DOM\n"));
           XERCES_CPP_NAMESPACE::DOMDocument *dom = 0;
-          dom = 
+          dom =
             XML_Helper::XML_HELPER.create_dom (file);
-          
+
           if (dom == 0)
             {
               CIAO_DEBUG ((LM_TRACE, CLINFO "XML_File_Intf::read_process_file - "
-                           "Failed to open file $s\n", file));
+                           "Failed to open file %C\n", file));
               return false;
             }
-          
+
           XERCES_CPP_NAMESPACE::DOMElement *foo = dom->getDocumentElement ();
           CIAO_DEBUG ((LM_TRACE, CLINFO "XML_File_Intf::read_process_file - "
                        "DOMElement pointer: %u\n", foo));
-          
+
           CIAO_DEBUG ((LM_TRACE, CLINFO "XML_File_Intf::read_process_file - "
                        "Parsing XML file with XSC\n"));
           deploymentPlan dp =
             CIAO::Config_Handlers::reader::DeploymentPlan (dom);
-          
+
           CIAO_DEBUG ((LM_TRACE, CLINFO "XML_File_Intf::read_process_file - "
                        "Processing using config handlers\n"));
           DP_Handler dp_handler (dp);
-          
+
           this->idl_dp_.reset (dp_handler.plan ());
-          
+
           if (this->idl_dp_.get ())
             return true;
         }
       catch (Config_Error &ex)
         {
-          ACE_ERROR ((LM_ERROR, "error at %s: %s\n",
+          ACE_ERROR ((LM_ERROR, "error at %C: %C\n",
                       ex.name_.c_str (), ex.error_.c_str ()));
         }
       catch (...)
@@ -74,12 +74,12 @@ namespace CIAO
     }
 
     ::Deployment::DeploymentPlan const *
-    XML_File_Intf::get_plan (void) 
+    XML_File_Intf::get_plan (void)
     {
       CIAO_TRACE("get_plan");
       if (this->idl_dp_.get () == 0 && !this->read_process_file (this->file_.c_str ()))
         return 0;
-      
+
       return this->idl_dp_.get ();
     }
 
@@ -91,13 +91,13 @@ namespace CIAO
         return 0;
       return this->idl_dp_.release ();
     }
-    
+
     void
     XML_File_Intf::add_search_path (const ACE_TCHAR *environment,
                                     const ACE_TCHAR *relpath)
     {
       XML_Helper::_path_resolver.add_path (environment, relpath);
     }
-    
+
   }
 }