ChangeLogTag: Thu Sep 22 14:03:11 2005 J.T. Conklin <jtc@acorntoolworks.com>

156 files changed, 5012 insertions, 427 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 1eea2e01c1e..4e390522136 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,7 +1,183 @@
+Thu Sep 22 14:03:11 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* configure.ac:
+
+	  Updated AC_CONFIG_FILES for the new directories.
+
+	  Added BUILD_REPO, BUILD_THREADS, and BUILD_EC_TYPED_EVENTS
+	  automake conditionals.  Explicitly set to false, true, and
+	  true (at least for now).
+
+	* TAO_IDL/Makefile.am:
+	* orbsvcs/Makefile.am:
+	* orbsvcs/Concurrency_Service/Makefile.am:
+	* orbsvcs/CosEvent_Service/Makefile.am:
+	* orbsvcs/Dump_Schedule/Makefile.am:
+	* orbsvcs/Event_Service/Makefile.am:
+	* orbsvcs/FTRT_Event_Service/Makefile.am:
+	* orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am:
+	* orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am:
+	* orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am:
+	* orbsvcs/FT_ReplicationManager/Makefile.am:
+	* orbsvcs/Fault_Detector/Makefile.am:
+	* orbsvcs/Fault_Notifier/Makefile.am:
+	* orbsvcs/IFR_Service/Makefile.am:
+	* orbsvcs/ImplRepo_Service/Makefile.am:
+	* orbsvcs/LifeCycle_Service/Makefile.am:
+	* orbsvcs/LoadBalancer/Makefile.am:
+	* orbsvcs/Logging_Service/Makefile.am:
+	* orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am:
+	* orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am:
+	* orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am:
+	* orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am:
+	* orbsvcs/Naming_Service/Makefile.am:
+	* orbsvcs/Notify_Service/Makefile.am:
+	* orbsvcs/Scheduling_Service/Makefile.am:
+	* orbsvcs/TAO_Service/Makefile.am:
+	* orbsvcs/Time_Service/Makefile.am:
+	* orbsvcs/Trading_Service/Makefile.am:
+	* orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am:
+	* orbsvcs/orbsvcs/Makefile.am:
+	* orbsvcs/performance-tests/Makefile.am:
+	* orbsvcs/performance-tests/LoadBalancing/Makefile.am:
+	* orbsvcs/performance-tests/LoadBalancing/LBPerf/Makefile.am:
+	* orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am:
+	* orbsvcs/performance-tests/RTEvent/Makefile.am:
+	* orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am:
+	* orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am:
+	* orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am:
+	* orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am:
+	* orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am:
+	* orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am:
+	* orbsvcs/performance-tests/RTEvent/lib/Makefile.am:
+	* orbsvcs/tests/Makefile.am:
+	* orbsvcs/tests/AVStreams/Makefile.am:
+	* orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am:
+	* orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am:
+	* orbsvcs/tests/AVStreams/Component_Switching/Makefile.am:
+	* orbsvcs/tests/AVStreams/Full_Profile/Makefile.am:
+	* orbsvcs/tests/AVStreams/Latency/Makefile.am:
+	* orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am:
+	* orbsvcs/tests/AVStreams/Multicast/Makefile.am:
+	* orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am:
+	* orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am:
+	* orbsvcs/tests/AVStreams/Pluggable/Makefile.am:
+	* orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am:
+	* orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am:
+	* orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am:
+	* orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am:
+	* orbsvcs/tests/BiDir_CORBALOC/Makefile.am:
+	* orbsvcs/tests/Bug_1334_Regression/Makefile.am:
+	* orbsvcs/tests/Bug_1393_Regression/Makefile.am:
+	* orbsvcs/tests/Bug_1395_Regression/Makefile.am:
+	* orbsvcs/tests/Bug_1630_Regression/Makefile.am:
+	* orbsvcs/tests/Concurrency/Makefile.am:
+	* orbsvcs/tests/CosEvent/Makefile.am:
+	* orbsvcs/tests/CosEvent/Basic/Makefile.am:
+	* orbsvcs/tests/CosEvent/lib/Makefile.am:
+	* orbsvcs/tests/EC_Custom_Marshal/Makefile.am:
+	* orbsvcs/tests/EC_MT_Mcast/Makefile.am:
+	* orbsvcs/tests/EC_Mcast/Makefile.am:
+	* orbsvcs/tests/EC_Multiple/Makefile.am:
+	* orbsvcs/tests/EC_Throughput/Makefile.am:
+	* orbsvcs/tests/Event/Makefile.am:
+	* orbsvcs/tests/Event/Basic/Makefile.am:
+	* orbsvcs/tests/Event/Mcast/Makefile.am:
+	* orbsvcs/tests/Event/Mcast/Common/Makefile.am:
+	* orbsvcs/tests/Event/Mcast/Complex/Makefile.am:
+	* orbsvcs/tests/Event/Mcast/Simple/Makefile.am:
+	* orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am:
+	* orbsvcs/tests/Event/Performance/Makefile.am:
+	* orbsvcs/tests/Event/lib/Makefile.am:
+	* orbsvcs/tests/FT_App/Makefile.am:
+	* orbsvcs/tests/FaultTolerance/Makefile.am:
+	* orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am:
+	* orbsvcs/tests/FaultTolerance/IOGR/Makefile.am:
+	* orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am:
+	* orbsvcs/tests/FtRtEvent/Makefile.am:
+	* tao/Makefile.am:
+	* utils/Makefile.am:
+	* utils/catior/Makefile.am:
+	* utils/nslist/Makefile.am:
+
+	  Regenerated.
+
+	* orbsvcs/examples/Makefile.am:
+	* orbsvcs/examples/CosEC/Makefile.am:
+	* orbsvcs/examples/CosEC/Factory/Makefile.am:
+	* orbsvcs/examples/CosEC/RtEC_Based/Makefile.am:
+	* orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am:
+	* orbsvcs/examples/CosEC/RtEC_Based/tests/Makefile.am:
+	* orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am:
+	* orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am:
+	* orbsvcs/examples/CosEC/Simple/Makefile.am:
+	* orbsvcs/examples/CosEC/TypedSimple/Makefile.am:
+	* orbsvcs/examples/FaultTolerance/Makefile.am:
+	* orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am:
+	* orbsvcs/examples/ImR/Makefile.am:
+	* orbsvcs/examples/ImR/Advanced/Makefile.am:
+	* orbsvcs/examples/ImR/Combined_Service/Makefile.am:
+	* orbsvcs/examples/LoadBalancing/Makefile.am:
+	* orbsvcs/examples/Log/Makefile.am:
+	* orbsvcs/examples/Log/Basic/Makefile.am:
+	* orbsvcs/examples/Log/Event/Makefile.am:
+	* orbsvcs/examples/Log/Notify/Makefile.am:
+	* orbsvcs/examples/Log/RTEvent/Makefile.am:
+	* orbsvcs/examples/Notify/Makefile.am:
+	* orbsvcs/examples/Notify/Federation/Makefile.am:
+	* orbsvcs/examples/Notify/Federation/Agent/Makefile.am:
+	* orbsvcs/examples/Notify/Federation/Gate/Makefile.am:
+	* orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am:
+	* orbsvcs/examples/Notify/Filter/Makefile.am:
+	* orbsvcs/examples/Notify/Lanes/Makefile.am:
+	* orbsvcs/examples/Notify/Subscribe/Makefile.am:
+	* orbsvcs/examples/Notify/ThreadPool/Makefile.am:
+	* orbsvcs/examples/ORT/Makefile.am:
+	* orbsvcs/examples/RtEC/Makefile.am:
+	* orbsvcs/examples/RtEC/IIOPGateway/Makefile.am:
+	* orbsvcs/examples/RtEC/Kokyu/Makefile.am:
+	* orbsvcs/examples/RtEC/MCast/Makefile.am:
+	* orbsvcs/examples/RtEC/Schedule/Makefile.am:
+	* orbsvcs/examples/RtEC/Simple/Makefile.am:
+	* orbsvcs/examples/Security/Makefile.am:
+	* orbsvcs/examples/Security/Send_File/Makefile.am:
+
+	  Added.
+
+	* examples/AMI/FL_Callback/FL_Callback.mpc:
+	* examples/Advanced/ch_3/Advanced_ch_3.mpc:
+	* orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc:
+	* orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc:
+	* orbsvcs/examples/LoadBalancing/LoadBalancing.mpc:
+	* orbsvcs/examples/ORT/ORT.mpc:
+	* orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc:
+	* orbsvcs/tests/Notify/Blocking/Blocking.mpc:
+	* orbsvcs/tests/Notify/Discarding/Discarding.mpc:
+	* orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc:
+	* orbsvcs/tests/Notify/Ordering/Ordering.mpc:
+	* orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc:
+	* orbsvcs/tests/Notify/Sequence_Multi_Filter/Seq_Multi_Filter.mpc:
+	* orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc:
+	* orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc:
+	* orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc:
+	* orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc:
+	* orbsvcs/tests/Security/Big_Request/Big_Request.mpc:
+	* orbsvcs/tests/Security/Callback/Callback.mpc:
+	* orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc:
+	* orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc:
+	* orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc:
+	* performance-tests/Sequence_Latency/DII/DII.mpc:
+	* performance-tests/Sequence_Latency/DSI/DSI.mpc:
+	* performance-tests/Sequence_Latency/Deferred/Deferred.mpc:
+
+          Add "*idl" projects for compiling *.idl files. This eliminates
+          duplicate rules that would otherwise result when Makefile.am's
+          are aggregated in the automake build.
+
 Thu Sep 22 15:12:12 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * orbsvcs/tests/InterfaceRepo/IDL3_Test/test.idl:
-        
+
           Modified valuetype declartion used as a primary key to
           conform to the CCM spec section 61.7.2.1 listing
           constraints on primary key types.
@@ -169,7 +345,6 @@ Mon Sep 19 08:00:00 UTC 2005  Simon Massey  <sma@prismtech.com>
 
         Incorrect emulated exception call for init_orb.
 
->>>>>>> 1.6825
 Fri Sep 16 15:12:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
 
         * test/IPV6/Hello.mpc:
diff --git a/TAO/TAO_IDL/Makefile.am b/TAO/TAO_IDL/Makefile.am
index 12589c695e4..b683f1afe69 100644
--- a/TAO/TAO_IDL/Makefile.am
+++ b/TAO/TAO_IDL/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/configure.ac b/TAO/configure.ac
index b4be07dcead..5379b57f408 100644
--- a/TAO/configure.ac
+++ b/TAO/configure.ac
@@ -162,6 +162,9 @@ AM_CONDITIONAL(BUILD_MINIMUM_CORBA, false)
 AM_CONDITIONAL(BUILD_INTERCEPTORS, true)
 AM_CONDITIONAL(BUILD_ACE_UUID, true)
 AM_CONDITIONAL(BUILD_AMI, true)
+AM_CONDITIONAL(BUILD_REPO, false)
+AM_CONDITIONAL(BUILD_THREADS, true)
+AM_CONDITIONAL(BUILD_EC_TYPED_EVENTS, true)
 
 ACE_ENABLE_ACEXML
 ACE_ENABLE_SSL
@@ -182,7 +185,88 @@ dnl created first.
 AC_CONFIG_FILES([
   Makefile
   TAO_IDL/Makefile
-  tao/Makefile
+  docs/Makefile
+  docs/tutorials/Makefile
+  docs/tutorials/Quoter/AMI/Makefile
+  docs/tutorials/Quoter/Event_Service/Makefile
+  docs/tutorials/Quoter/Makefile
+  docs/tutorials/Quoter/Naming_Service/Makefile
+  docs/tutorials/Quoter/On_Demand_Activation/Makefile
+  docs/tutorials/Quoter/RT_Event_Service/Makefile
+  docs/tutorials/Quoter/Simple/Client/Makefile
+  docs/tutorials/Quoter/Simple/Impl-Repo/Makefile
+  docs/tutorials/Quoter/Simple/ImprovedServer/Makefile
+  docs/tutorials/Quoter/Simple/Makefile
+  docs/tutorials/Quoter/Simple/Persistent/Makefile
+  docs/tutorials/Quoter/Simple/Server/Makefile
+  docs/tutorials/Quoter/idl/Makefile
+  examples/AMH/Makefile
+  examples/AMH/Sink_Server/Makefile
+  examples/AMI/FL_Callback/Makefile
+  examples/AMI/Makefile
+  examples/Advanced/Makefile
+  examples/Advanced/ch_3/Makefile
+  examples/Buffered_AMI/Makefile
+  examples/Buffered_Oneways/Makefile
+  examples/Callback_Quoter/Makefile
+  examples/Content_Server/AMI_Iterator/Makefile
+  examples/Content_Server/AMI_Observer/Makefile
+  examples/Content_Server/Makefile
+  examples/Content_Server/SMI_Iterator/Makefile
+  examples/Event_Comm/Makefile
+  examples/Kokyu_dsrt_schedulers/Makefile
+  examples/Kokyu_dsrt_schedulers/fp_example/Makefile
+  examples/Kokyu_dsrt_schedulers/mif_example/Makefile
+  examples/Kokyu_dsrt_schedulers/muf_example/Makefile
+  examples/Load_Balancing/Makefile
+  examples/Load_Balancing_persistent/Makefile
+  examples/Logging/Makefile
+  examples/Makefile
+  examples/OBV/Makefile
+  examples/OBV/Typed_Events/Makefile
+  examples/POA/Adapter_Activator/Makefile
+  examples/POA/DSI/Makefile
+  examples/POA/Default_Servant/Makefile
+  examples/POA/Explicit_Activation/Alt_Resources/Makefile
+  examples/POA/Explicit_Activation/Makefile
+  examples/POA/FindPOA/Makefile
+  examples/POA/Forwarding/Makefile
+  examples/POA/Generic_Servant/Makefile
+  examples/POA/Loader/Makefile
+  examples/POA/Makefile
+  examples/POA/NewPOA/Makefile
+  examples/POA/On_Demand_Activation/Makefile
+  examples/POA/On_Demand_Loading/Makefile
+  examples/POA/POA_BiDir/Makefile
+  examples/POA/Reference_Counted_Servant/Makefile
+  examples/POA/RootPOA/Makefile
+  examples/POA/TIE/Makefile
+  examples/Persistent_Grid/Makefile
+  examples/PluggableUDP/Makefile
+  examples/PluggableUDP/tests/Basic/Makefile
+  examples/PluggableUDP/tests/Makefile
+  examples/PluggableUDP/tests/Performance/Makefile
+  examples/PluggableUDP/tests/SimplePerformance/Makefile
+  examples/Quoter/Makefile
+  examples/RTCORBA/Activity/Makefile
+  examples/RTCORBA/Makefile
+  examples/RTScheduling/Fixed_Priority_Scheduler/Makefile
+  examples/RTScheduling/MIF_Scheduler/Makefile
+  examples/RTScheduling/Makefile
+  examples/Simple/Makefile
+  examples/Simple/bank/Makefile
+  examples/Simple/chat/Makefile
+  examples/Simple/echo/Makefile
+  examples/Simple/grid/Makefile
+  examples/Simple/time-date/Makefile
+  examples/Simple/time/Makefile
+  examples/Simulator/Event_Supplier/Makefile
+  examples/Simulator/Makefile
+  examples/TypeCode_Creation/Makefile
+  examples/ior_corbaloc/Makefile
+  examples/mfc/Makefile
+  interop-tests/Makefile
+  interop-tests/wchar/Makefile
   orbsvcs/Concurrency_Service/Makefile
   orbsvcs/CosEvent_Service/Makefile
   orbsvcs/Dump_Schedule/Makefile
@@ -194,8 +278,8 @@ AC_CONFIG_FILES([
   orbsvcs/FT_ReplicationManager/Makefile
   orbsvcs/Fault_Detector/Makefile
   orbsvcs/Fault_Notifier/Makefile
-  orbsvcs/ImplRepo_Service/Makefile
   orbsvcs/IFR_Service/Makefile
+  orbsvcs/ImplRepo_Service/Makefile
   orbsvcs/LifeCycle_Service/Makefile
   orbsvcs/LoadBalancer/Makefile
   orbsvcs/Logging_Service/Basic_Logging_Service/Makefile
@@ -210,26 +294,65 @@ AC_CONFIG_FILES([
   orbsvcs/TAO_Service/Makefile
   orbsvcs/Time_Service/Makefile
   orbsvcs/Trading_Service/Makefile
+  orbsvcs/examples/CosEC/Factory/Makefile
+  orbsvcs/examples/CosEC/Makefile
+  orbsvcs/examples/CosEC/RtEC_Based/Makefile
+  orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile
+  orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile
+  orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile
+  orbsvcs/examples/CosEC/RtEC_Based/tests/Makefile
+  orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile
+  orbsvcs/examples/CosEC/Simple/Makefile
+  orbsvcs/examples/CosEC/TypedSimple/Makefile
+  orbsvcs/examples/FaultTolerance/Makefile
+  orbsvcs/examples/FaultTolerance/RolyPoly/Makefile
+  orbsvcs/examples/ImR/Advanced/Makefile
+  orbsvcs/examples/ImR/Combined_Service/Makefile
+  orbsvcs/examples/ImR/Makefile
+  orbsvcs/examples/LoadBalancing/Makefile
+  orbsvcs/examples/Log/Basic/Makefile
+  orbsvcs/examples/Log/Event/Makefile
+  orbsvcs/examples/Log/Makefile
+  orbsvcs/examples/Log/Notify/Makefile
+  orbsvcs/examples/Log/RTEvent/Makefile
+  orbsvcs/examples/Makefile
+  orbsvcs/examples/Notify/Federation/Agent/Makefile
+  orbsvcs/examples/Notify/Federation/Gate/Makefile
+  orbsvcs/examples/Notify/Federation/Makefile
+  orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile
+  orbsvcs/examples/Notify/Filter/Makefile
+  orbsvcs/examples/Notify/Lanes/Makefile
+  orbsvcs/examples/Notify/Makefile
+  orbsvcs/examples/Notify/Subscribe/Makefile
+  orbsvcs/examples/Notify/ThreadPool/Makefile
+  orbsvcs/examples/ORT/Makefile
+  orbsvcs/examples/RtEC/IIOPGateway/Makefile
+  orbsvcs/examples/RtEC/Kokyu/Makefile
+  orbsvcs/examples/RtEC/MCast/Makefile
+  orbsvcs/examples/RtEC/Makefile
+  orbsvcs/examples/RtEC/Schedule/Makefile
+  orbsvcs/examples/RtEC/Simple/Makefile
+  orbsvcs/examples/Security/Makefile
+  orbsvcs/examples/Security/Send_File/Makefile
   orbsvcs/orbsvcs/Makefile
-  orbsvcs/performance-tests/Makefile
-  orbsvcs/performance-tests/LoadBalancing/Makefile
   orbsvcs/performance-tests/LoadBalancing/LBPerf/Makefile
   orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile
-  orbsvcs/performance-tests/RTEvent/Makefile
+  orbsvcs/performance-tests/LoadBalancing/Makefile
+  orbsvcs/performance-tests/Makefile
   orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile
   orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile
+  orbsvcs/performance-tests/RTEvent/Makefile
   orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile
   orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile
   orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile
   orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile
   orbsvcs/performance-tests/RTEvent/lib/Makefile
-  orbsvcs/tests/Makefile
-  orbsvcs/tests/AVStreams/Makefile
   orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile
   orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile
   orbsvcs/tests/AVStreams/Component_Switching/Makefile
   orbsvcs/tests/AVStreams/Full_Profile/Makefile
   orbsvcs/tests/AVStreams/Latency/Makefile
+  orbsvcs/tests/AVStreams/Makefile
   orbsvcs/tests/AVStreams/Modify_QoS/Makefile
   orbsvcs/tests/AVStreams/Multicast/Makefile
   orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile
@@ -244,30 +367,99 @@ AC_CONFIG_FILES([
   orbsvcs/tests/Bug_1393_Regression/Makefile
   orbsvcs/tests/Bug_1395_Regression/Makefile
   orbsvcs/tests/Bug_1630_Regression/Makefile
+  orbsvcs/tests/Bug_2137_Regression/Makefile
   orbsvcs/tests/Concurrency/Makefile
-  orbsvcs/tests/CosEvent/Makefile
   orbsvcs/tests/CosEvent/Basic/Makefile
+  orbsvcs/tests/CosEvent/Makefile
   orbsvcs/tests/CosEvent/lib/Makefile
   orbsvcs/tests/EC_Custom_Marshal/Makefile
   orbsvcs/tests/EC_MT_Mcast/Makefile
   orbsvcs/tests/EC_Mcast/Makefile
   orbsvcs/tests/EC_Multiple/Makefile
   orbsvcs/tests/EC_Throughput/Makefile
-  orbsvcs/tests/Event/Makefile
   orbsvcs/tests/Event/Basic/Makefile
-  orbsvcs/tests/Event/Mcast/Makefile
+  orbsvcs/tests/Event/Makefile
   orbsvcs/tests/Event/Mcast/Common/Makefile
   orbsvcs/tests/Event/Mcast/Complex/Makefile
+  orbsvcs/tests/Event/Mcast/Makefile
   orbsvcs/tests/Event/Mcast/Simple/Makefile
   orbsvcs/tests/Event/Mcast/Two_Way/Makefile
   orbsvcs/tests/Event/Performance/Makefile
   orbsvcs/tests/Event/lib/Makefile
   orbsvcs/tests/FT_App/Makefile
-  orbsvcs/tests/FaultTolerance/Makefile
   orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile
   orbsvcs/tests/FaultTolerance/IOGR/Makefile
   orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile
+  orbsvcs/tests/FaultTolerance/Makefile
   orbsvcs/tests/FtRtEvent/Makefile
+  orbsvcs/tests/HTIOP/AMI/Makefile
+  orbsvcs/tests/HTIOP/BiDirectional/Makefile
+  orbsvcs/tests/HTIOP/Hello/Makefile
+  orbsvcs/tests/HTIOP/Makefile
+  orbsvcs/tests/IOR_MCast/Makefile
+  orbsvcs/tests/ImplRepo/Makefile
+  orbsvcs/tests/ImplRepo/NameService/Makefile
+  orbsvcs/tests/ImplRepo/scale/Makefile
+  orbsvcs/tests/InterfaceRepo/Application_Test/Makefile
+  orbsvcs/tests/InterfaceRepo/IDL3_Test/Makefile
+  orbsvcs/tests/InterfaceRepo/IFR_Test/Makefile
+  orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile
+  orbsvcs/tests/InterfaceRepo/Makefile
+  orbsvcs/tests/InterfaceRepo/Persistence_Test/Makefile
+  orbsvcs/tests/Interoperable_Naming/Makefile
+  orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile
+  orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile
+  orbsvcs/tests/LoadBalancing/GenericFactory/Makefile
+  orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Makefile
+  orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/Makefile
+  orbsvcs/tests/LoadBalancing/LoadMonitor/Makefile
+  orbsvcs/tests/LoadBalancing/Makefile
+  orbsvcs/tests/Log/Basic_Log_Test/Makefile
+  orbsvcs/tests/Log/Makefile
+  orbsvcs/tests/Makefile
+  orbsvcs/tests/Miop/Makefile
+  orbsvcs/tests/Miop/McastHello/Makefile
+  orbsvcs/tests/Notify/Basic/Makefile
+  orbsvcs/tests/Notify/Blocking/Makefile
+  orbsvcs/tests/Notify/Destroy/Makefile
+  orbsvcs/tests/Notify/Discarding/Makefile
+  orbsvcs/tests/Notify/Driver/Makefile
+  orbsvcs/tests/Notify/MT_Dispatching/Makefile
+  orbsvcs/tests/Notify/Makefile
+  orbsvcs/tests/Notify/Ordering/Makefile
+  orbsvcs/tests/Notify/PluggableTopology/Makefile
+  orbsvcs/tests/Notify/RT_lib/Makefile
+  orbsvcs/tests/Notify/Reconnecting/Makefile
+  orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile
+  orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile
+  orbsvcs/tests/Notify/Structured_Filter/Makefile
+  orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile
+  orbsvcs/tests/Notify/Test_Filter/Makefile
+  orbsvcs/tests/Notify/XML_Persistence/Makefile
+  orbsvcs/tests/Notify/lib/Makefile
+  orbsvcs/tests/Notify/performance-tests/Filter/Makefile
+  orbsvcs/tests/Notify/performance-tests/Makefile
+  orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile
+  orbsvcs/tests/Notify/performance-tests/Throughput/Makefile
+  orbsvcs/tests/Property/Makefile
+  orbsvcs/tests/Redundant_Naming/Makefile
+  orbsvcs/tests/Sched/Makefile
+  orbsvcs/tests/Sched_Conf/Makefile
+  orbsvcs/tests/Security/BiDirectional/Makefile
+  orbsvcs/tests/Security/Big_Request/Makefile
+  orbsvcs/tests/Security/Callback/Makefile
+  orbsvcs/tests/Security/Crash_Test/Makefile
+  orbsvcs/tests/Security/MT_IIOP_SSL/Makefile
+  orbsvcs/tests/Security/MT_SSLIOP/Makefile
+  orbsvcs/tests/Security/Makefile
+  orbsvcs/tests/Security/Secure_Invocation/Makefile
+  orbsvcs/tests/Security/ssliop_corbaloc/Makefile
+  orbsvcs/tests/Simple_Naming/Makefile
+  orbsvcs/tests/Time/Makefile
+  orbsvcs/tests/Trading/Makefile
+  orbsvcs/tests/ior_corbaname/Makefile
+  orbsvcs/tests/tests_svc_loader/Makefile
+  tao/Makefile
   utils/Makefile
   utils/catior/Makefile
   utils/nslist/Makefile
diff --git a/TAO/examples/AMI/FL_Callback/FL_Callback.mpc b/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
index 3830cb052d3..9e2fa3a3042 100644
--- a/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
+++ b/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
@@ -1,16 +1,35 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl): taoexe, messaging, ami {
+  IDL_Files {
+    test.idl
+  }
+  custom_only = 1
+}
+
 project(*progress): taoexe, messaging, ami, portableserver, tao_flresource {
+  after += *idl
+
   Source_Files {
     Progress_i.cpp
     progress.cpp
+    testS.cpp
+    testC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*peer): taoexe, strategies, messaging, ami, portableserver {
+  after += *idl
+
   Source_Files {
     Peer_i.cpp
     peer.cpp
+    testS.cpp
+    testC.cpp
+  }
+  IDL_Files {
   }
 }
diff --git a/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc b/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc
index efa29045915..2e2cc5507a3 100644
--- a/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc
+++ b/TAO/examples/Advanced/ch_3/Advanced_ch_3.mpc
@@ -1,16 +1,31 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl) : taoclient, exceptions {
+  IDL_Files {
+    time.idl
+  }
+  custom_only = 1
+}
+
 project(*client) : taoclient, anytypecode, exceptions {
+  after += *idl
   requires += corba_messaging
   source_files {
-    timeC.cpp
     client.cpp
+    timeC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*server) : taoserver, exceptions {
+  after += *idl
   source_files {
     server.cpp
+    timeS.cpp
+    timeC.cpp
+  }
+  IDL_Files {
   }
 }
diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile.am b/TAO/orbsvcs/Concurrency_Service/Makefile.am
index 1efe51b46ee..b1fbdf6f104 100644
--- a/TAO/orbsvcs/Concurrency_Service/Makefile.am
+++ b/TAO/orbsvcs/Concurrency_Service/Makefile.am
@@ -6,13 +6,14 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
+## Makefile.Concurrency_Service.am
 
 bin_PROGRAMS = Concurrency_Service
 
diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile.am b/TAO/orbsvcs/CosEvent_Service/Makefile.am
index fc23f5ca428..4517c9fe8e3 100644
--- a/TAO/orbsvcs/CosEvent_Service/Makefile.am
+++ b/TAO/orbsvcs/CosEvent_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -14,6 +14,7 @@ TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
 
+## Makefile.CosEvent_Service.am
 
 if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile.am b/TAO/orbsvcs/Dump_Schedule/Makefile.am
index b63f0704426..aefc694c05b 100644
--- a/TAO/orbsvcs/Dump_Schedule/Makefile.am
+++ b/TAO/orbsvcs/Dump_Schedule/Makefile.am
@@ -6,13 +6,14 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
+## Makefile.Dump_Schedule.am
 
 bin_PROGRAMS = Dump_Schedule
 
diff --git a/TAO/orbsvcs/Event_Service/Makefile.am b/TAO/orbsvcs/Event_Service/Makefile.am
index e610c250790..493b761ff98 100644
--- a/TAO/orbsvcs/Event_Service/Makefile.am
+++ b/TAO/orbsvcs/Event_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -14,6 +14,7 @@ TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
 
+## Makefile.Event_Service.am
 
 if BUILD_CORBA_MESSAGING
 
@@ -45,6 +46,7 @@ Event_Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am
index f934e039e61..9445c3fe356 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -14,6 +14,7 @@ TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
 
+## Makefile.FTRT_Event_Service.am
 
 if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am
index a1a598cf46e..520e6d6aec8 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -14,6 +14,7 @@ TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
 
+## Makefile.FTRTEC_Factory_Service.am
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am
index e588fa8b05e..b31a1b82f0a 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am
+++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -14,6 +14,7 @@ TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
 
+## Makefile.FTRTEC_Gateway_Service.am
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Makefile.am
index a07accfbdd4..e71a9615f39 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Makefile.am
+++ b/TAO/orbsvcs/FTRT_Event_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Event_Service \
diff --git a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am
index 214d2a7078d..f8d2336a8b5 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am
+++ b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/Fault_Detector/Makefile.am b/TAO/orbsvcs/Fault_Detector/Makefile.am
index df3c756ce50..12d58097bbc 100644
--- a/TAO/orbsvcs/Fault_Detector/Makefile.am
+++ b/TAO/orbsvcs/Fault_Detector/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -14,6 +14,7 @@ TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
 
+## Makefile.Fault_Detector.am
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
diff --git a/TAO/orbsvcs/Fault_Notifier/Makefile.am b/TAO/orbsvcs/Fault_Notifier/Makefile.am
index ca7a37321cc..155f96c821d 100644
--- a/TAO/orbsvcs/Fault_Notifier/Makefile.am
+++ b/TAO/orbsvcs/Fault_Notifier/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -14,6 +14,7 @@ TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
 
+## Makefile.Fault_Notifier.am
 
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
diff --git a/TAO/orbsvcs/IFR_Service/Makefile.am b/TAO/orbsvcs/IFR_Service/Makefile.am
index 35d2ce5422a..98ff20e127d 100644
--- a/TAO/orbsvcs/IFR_Service/Makefile.am
+++ b/TAO/orbsvcs/IFR_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile.am b/TAO/orbsvcs/ImplRepo_Service/Makefile.am
index fcb688ca6d8..8f1e9c79059 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Makefile.am
+++ b/TAO/orbsvcs/ImplRepo_Service/Makefile.am
@@ -6,15 +6,14 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_ROOT = $(top_srcdir)
 
 bin_PROGRAMS =
 
diff --git a/TAO/orbsvcs/LifeCycle_Service/Makefile.am b/TAO/orbsvcs/LifeCycle_Service/Makefile.am
index 01b8f158139..8d7c3fa3c49 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Makefile.am
+++ b/TAO/orbsvcs/LifeCycle_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -14,6 +14,7 @@ TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
 
+## Makefile.LifeCycle_Service.am
 
 if !BUILD_MINIMUM_CORBA
 
diff --git a/TAO/orbsvcs/LoadBalancer/Makefile.am b/TAO/orbsvcs/LoadBalancer/Makefile.am
index 72cfbd8e241..0c2a8f29fec 100644
--- a/TAO/orbsvcs/LoadBalancer/Makefile.am
+++ b/TAO/orbsvcs/LoadBalancer/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am
index 39d7e8ca534..275cfcbd9c0 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile.am
@@ -6,13 +6,14 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
+## Makefile.Basic_Logging_Service.am
 
 bin_PROGRAMS = Basic_Logging_Service
 
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am
index af43a906ca8..d6937fbf230 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -14,6 +14,7 @@ TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
 
+## Makefile.Event_Logging_Service.am
 
 if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
diff --git a/TAO/orbsvcs/Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Makefile.am
index 53741eaaba9..76a35fff27b 100644
--- a/TAO/orbsvcs/Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/Makefile.am
@@ -1,4 +1,12 @@
 ##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Basic_Logging_Service \
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am
index 1d1e482512d..d491faeff1a 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -14,6 +14,7 @@ TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
 
+## Makefile.Notify_Logging_Service.am
 
 if !BUILD_MINIMUM_CORBA
 
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am
index 20d3eced720..1e6258a1cff 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -14,6 +14,7 @@ TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
 
+## Makefile.RTEvent_Logging_Service.am
 
 if BUILD_CORBA_MESSAGING
 
diff --git a/TAO/orbsvcs/Makefile.am b/TAO/orbsvcs/Makefile.am
index dcd6522ec9d..f079ecca777 100644
--- a/TAO/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/Makefile.am
@@ -1,27 +1,35 @@
 ##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
-	TAO_Service \
-	orbsvcs \
-	Trading_Service \
-	Time_Service \
-	Scheduling_Service \
-	Notify_Service \
-	Naming_Service \
-	Logging_Service \
-	LoadBalancer \
-	LifeCycle_Service \
+        TAO_Service \
+        orbsvcs \
+        Trading_Service \
+        Time_Service \
+        Scheduling_Service \
+        Notify_Service \
+        Naming_Service \
+        Logging_Service \
+        LoadBalancer \
+        LifeCycle_Service \
         ImplRepo_Service \
-	IFR_Service \
-	Fault_Notifier \
-	Fault_Detector \
-	FT_ReplicationManager \
-	FTRT_Event_Service \
-	Event_Service \
-	Dump_Schedule \
-	CosEvent_Service \
-	Concurrency_Service \
-	performance-tests \
-	tests
+        IFR_Service \
+        Fault_Notifier \
+        Fault_Detector \
+        FT_ReplicationManager \
+        FTRT_Event_Service \
+        Event_Service \
+        Dump_Schedule \
+        CosEvent_Service \
+        Concurrency_Service \
+        performance-tests \
+        tests \
+        examples
 
-#	 examples
diff --git a/TAO/orbsvcs/Naming_Service/Makefile.am b/TAO/orbsvcs/Naming_Service/Makefile.am
index 49e61dd025b..dcc66b40f3c 100644
--- a/TAO/orbsvcs/Naming_Service/Makefile.am
+++ b/TAO/orbsvcs/Naming_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/Notify_Service/Makefile.am b/TAO/orbsvcs/Notify_Service/Makefile.am
index 9ad82e5a5da..2739ad56e5e 100644
--- a/TAO/orbsvcs/Notify_Service/Makefile.am
+++ b/TAO/orbsvcs/Notify_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile.am b/TAO/orbsvcs/Scheduling_Service/Makefile.am
index d837460536d..43995bc6e1a 100644
--- a/TAO/orbsvcs/Scheduling_Service/Makefile.am
+++ b/TAO/orbsvcs/Scheduling_Service/Makefile.am
@@ -6,13 +6,14 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
+## Makefile.Scheduling_Service.am
 
 bin_PROGRAMS = Scheduling_Service
 
diff --git a/TAO/orbsvcs/TAO_Service/Makefile.am b/TAO/orbsvcs/TAO_Service/Makefile.am
index 6ec8c756079..f98eda1cf61 100644
--- a/TAO/orbsvcs/TAO_Service/Makefile.am
+++ b/TAO/orbsvcs/TAO_Service/Makefile.am
@@ -6,13 +6,14 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
+## Makefile.TAO_Service.am
 
 bin_PROGRAMS = TAO_Service
 
diff --git a/TAO/orbsvcs/Time_Service/Makefile.am b/TAO/orbsvcs/Time_Service/Makefile.am
index f31e05970e4..d4a28eb22ae 100644
--- a/TAO/orbsvcs/Time_Service/Makefile.am
+++ b/TAO/orbsvcs/Time_Service/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/Trading_Service/Makefile.am b/TAO/orbsvcs/Trading_Service/Makefile.am
index c019ea3b4b4..96e60ad6770 100644
--- a/TAO/orbsvcs/Trading_Service/Makefile.am
+++ b/TAO/orbsvcs/Trading_Service/Makefile.am
@@ -6,13 +6,14 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
+## Makefile.Trading_Service.am
 
 bin_PROGRAMS = Trading_Service
 
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc b/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc
index a8ca4d25dab..2ff7ecdb1d7 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc
+++ b/TAO/orbsvcs/examples/CosEC/Factory/CosEC_Factory.mpc
@@ -1,20 +1,36 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl) : orbsvcslib {
+ 
+  IDL_Files { 
+    CosEventChannelFactory.idl
+  }
+  
+  custom_only = 1
+}
+
 project(*Client) : orbsvcsexe, event, event_skel, naming {
-  idlflags += -I ../../..
+  after += *idl
   exename = FactoryClient
   source_files {
     FactoryClient.cpp
+    CosEventChannelFactoryC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*Server) : orbsvcsexe, event, event_serv, naming {
-  idlflags += -I ../../..
+  after += *idl
   exename = FactoryServer
   source_files {
     main.cpp
     FactoryDriver.cpp
     CosEventChannelFactory_i.cpp
+    CosEventChannelFactoryS.cpp
+    CosEventChannelFactoryC.cpp
+  }
+  IDL_Files {
   }
 }
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am b/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am
new file mode 100644
index 00000000000..9fe96484a60
--- /dev/null
+++ b/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am
@@ -0,0 +1,135 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
+TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_ROOT = $(top_srcdir)
+
+noinst_PROGRAMS =
+
+## Makefile.CosEC_Factory_Idl.am
+
+BUILT_SOURCES = \
+  CosEventChannelFactoryC.cpp \
+  CosEventChannelFactoryC.h \
+  CosEventChannelFactoryC.inl \
+  CosEventChannelFactoryS.cpp \
+  CosEventChannelFactoryS.h \
+  CosEventChannelFactoryS.inl \
+  CosEventChannelFactoryS_T.cpp \
+  CosEventChannelFactoryS_T.h \
+  CosEventChannelFactoryS_T.inl
+
+CLEANFILES = \
+  CosEventChannelFactory-stamp \
+  CosEventChannelFactoryC.cpp \
+  CosEventChannelFactoryC.h \
+  CosEventChannelFactoryC.inl \
+  CosEventChannelFactoryS.cpp \
+  CosEventChannelFactoryS.h \
+  CosEventChannelFactoryS.inl \
+  CosEventChannelFactoryS_T.cpp \
+  CosEventChannelFactoryS_T.h \
+  CosEventChannelFactoryS_T.inl
+
+CosEventChannelFactoryC.cpp CosEventChannelFactoryC.h CosEventChannelFactoryC.inl CosEventChannelFactoryS.cpp CosEventChannelFactoryS.h CosEventChannelFactoryS.inl CosEventChannelFactoryS_T.cpp CosEventChannelFactoryS_T.h CosEventChannelFactoryS_T.inl: CosEventChannelFactory-stamp
+
+CosEventChannelFactory-stamp: $(srcdir)/CosEventChannelFactory.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/CosEventChannelFactory.idl
+	@touch $@
+
+
+## Makefile.CosEC_Factory_Client.am
+
+if !BUILD_MINIMUM_CORBA
+
+noinst_PROGRAMS += FactoryClient
+
+FactoryClient_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
+
+FactoryClient_SOURCES = \
+  CosEventChannelFactoryC.cpp \
+  FactoryClient.cpp \
+  CosEventChannelFactory_i.h \
+  FactoryDriver.h
+
+FactoryClient_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+
+## Makefile.CosEC_Factory_Server.am
+
+if BUILD_CORBA_MESSAGING
+if !BUILD_MINIMUM_CORBA
+
+noinst_PROGRAMS += FactoryServer
+
+FactoryServer_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
+
+FactoryServer_SOURCES = \
+  CosEventChannelFactoryC.cpp \
+  CosEventChannelFactoryS.cpp \
+  CosEventChannelFactory_i.cpp \
+  FactoryDriver.cpp \
+  main.cpp \
+  CosEventChannelFactory_i.h \
+  FactoryDriver.h
+
+FactoryServer_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/examples/CosEC/Makefile.am b/TAO/orbsvcs/examples/CosEC/Makefile.am
new file mode 100644
index 00000000000..f8f648efc77
--- /dev/null
+++ b/TAO/orbsvcs/examples/CosEC/Makefile.am
@@ -0,0 +1,16 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+SUBDIRS = \
+        Factory \
+        RtEC_Based \
+        Simple \
+        TypedSimple
+
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/Makefile.am
new file mode 100644
index 00000000000..04535daeb37
--- /dev/null
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/Makefile.am
@@ -0,0 +1,15 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+SUBDIRS = \
+        lib \
+        bin \
+        tests
+
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am
index 2b19fa4cfef..bd084639c8c 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am
@@ -1,36 +1,65 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's CosEvent Service
+##  Process this file with automake to create Makefile.in
 ##
-##---------------------------------------------------------------------------
-
+## $Id$
 ##
-##  Process this file with automake to create Makefile.in
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
 ##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
 
-bin_PROGRAMS = CosEvent_Service
+## Makefile.CosEC_RtEC_Based_bin.am
 
-CosEvent_Service_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+if BUILD_CORBA_MESSAGING
+if !BUILD_MINIMUM_CORBA
 
-CosEvent_Service_SOURCES = \
-        CosEvent_Service.cpp
+noinst_PROGRAMS = RtEC_Based_CosEC
 
-noinst_HEADERS = \
-        CosEvent_Service.h
+RtEC_Based_CosEC_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -I$(srcdir)/../lib \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
 
-EXTRA_DIST = README
+RtEC_Based_CosEC_SOURCES = \
+  RtEC_Based_CosEC.cpp \
+  RtEC_Based_CosEC.h
 
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
+RtEC_Based_CosEC_LDADD = \
+  $(top_builddir)/orbsvcs/examples/CosEC/RtEC_Based/lib/libCosEC_RtEC_Based.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
 
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am
new file mode 100644
index 00000000000..aec74e8c7f4
--- /dev/null
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am
@@ -0,0 +1,60 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
+
+
+## Makefile.CosEC_RtEC_Based_lib.am
+
+if BUILD_CORBA_MESSAGING
+if !BUILD_MINIMUM_CORBA
+
+noinst_LTLIBRARIES = libCosEC_RtEC_Based.la
+
+libCosEC_RtEC_Based_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL \
+  -DTAO_RTEC_COSEC_BUILD_DLL
+
+libCosEC_RtEC_Based_la_SOURCES = \
+  ConsumerAdmin_i.cpp \
+  CosEvent_Utilities.cpp \
+  EventChannel_i.cpp \
+  ProxyPushConsumer_i.cpp \
+  ProxyPushSupplier_i.cpp \
+  SupplierAdmin_i.cpp
+
+noinst_HEADERS = \
+  ConsumerAdmin_i.h \
+  CosEvent_Utilities.h \
+  EventChannel_i.h \
+  ProxyPushConsumer_i.h \
+  ProxyPushSupplier_i.h \
+  SupplierAdmin_i.h \
+  rtec_cosec_export.h
+
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am
new file mode 100644
index 00000000000..03514fff03a
--- /dev/null
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am
@@ -0,0 +1,70 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
+
+
+## Makefile.CosEC_RtEC_Based_Tests_Basic_Client.am
+
+if BUILD_CORBA_MESSAGING
+if !BUILD_MINIMUM_CORBA
+
+noinst_PROGRAMS = Basic
+
+Basic_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -I$(srcdir)/../../lib \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
+
+Basic_SOURCES = \
+  Basic.cpp \
+  Consumer.cpp \
+  Supplier.cpp \
+  Basic.h \
+  Consumer.h \
+  Supplier.h
+
+Basic_LDADD = \
+  $(top_builddir)/orbsvcs/examples/CosEC/RtEC_Based/lib/libCosEC_RtEC_Based.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Makefile.am
new file mode 100644
index 00000000000..d6b34018ff9
--- /dev/null
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Makefile.am
@@ -0,0 +1,14 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+SUBDIRS = \
+        Basic \
+        Multiple
+
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am
new file mode 100644
index 00000000000..b001df4e92d
--- /dev/null
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am
@@ -0,0 +1,110 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
+
+noinst_PROGRAMS =
+
+## Makefile.CosEC_RtEC_Based_Mult_Cons.am
+
+if BUILD_CORBA_MESSAGING
+if !BUILD_MINIMUM_CORBA
+
+noinst_PROGRAMS += Consumer
+
+Consumer_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -I$(srcdir)/../../lib \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
+
+Consumer_SOURCES = \
+  Consumer.cpp \
+  Multiple.cpp \
+  Consumer.h \
+  Multiple.h
+
+Consumer_LDADD = \
+  $(top_builddir)/orbsvcs/examples/CosEC/RtEC_Based/lib/libCosEC_RtEC_Based.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
+
+## Makefile.CosEC_RtEC_Based_Mult_Supp.am
+
+if BUILD_CORBA_MESSAGING
+if !BUILD_MINIMUM_CORBA
+
+noinst_PROGRAMS += Supplier
+
+Supplier_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -I$(srcdir)/../../lib \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
+
+Supplier_SOURCES = \
+  Multiple.cpp \
+  Supplier.cpp \
+  Multiple.h \
+  Supplier.h
+
+Supplier_LDADD = \
+  $(top_builddir)/orbsvcs/examples/CosEC/RtEC_Based/lib/libCosEC_RtEC_Based.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Makefile.am b/TAO/orbsvcs/examples/CosEC/Simple/Makefile.am
new file mode 100644
index 00000000000..2bf40c26247
--- /dev/null
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Makefile.am
@@ -0,0 +1,123 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
+
+noinst_PROGRAMS =
+
+## Makefile.CosEC_Simple_Consumer.am
+
+if !BUILD_MINIMUM_CORBA
+
+noinst_PROGRAMS += Consumer
+
+Consumer_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
+
+Consumer_SOURCES = \
+  Consumer.cpp \
+  Consumer.h
+
+Consumer_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+
+## Makefile.CosEC_Simple_Service.am
+
+if BUILD_CORBA_MESSAGING
+if !BUILD_MINIMUM_CORBA
+
+noinst_PROGRAMS += Service
+
+Service_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
+
+Service_SOURCES = \
+  Service.cpp \
+  Consumer.h \
+  Supplier.h
+
+Service_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
+
+## Makefile.CosEC_Simple_Supplier.am
+
+if !BUILD_MINIMUM_CORBA
+
+noinst_PROGRAMS += Supplier
+
+Supplier_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
+
+Supplier_SOURCES = \
+  Supplier.cpp \
+  Supplier.h
+
+Supplier_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am b/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am
new file mode 100644
index 00000000000..0d9b863ffa6
--- /dev/null
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Makefile.am
@@ -0,0 +1,128 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
+TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_ROOT = $(top_srcdir)
+
+noinst_PROGRAMS =
+
+## Makefile.CosEC_TypedSimple_Consumer.am
+
+if BUILD_EC_TYPED_EVENTS
+if !BUILD_MINIMUM_CORBA
+
+BUILT_SOURCES = \
+  CountryC.cpp \
+  CountryC.h \
+  CountryC.inl \
+  CountryS.cpp \
+  CountryS.h \
+  CountryS.inl \
+  CountryS_T.cpp \
+  CountryS_T.h \
+  CountryS_T.inl
+
+CLEANFILES = \
+  Country-stamp \
+  CountryC.cpp \
+  CountryC.h \
+  CountryC.inl \
+  CountryS.cpp \
+  CountryS.h \
+  CountryS.inl \
+  CountryS_T.cpp \
+  CountryS_T.h \
+  CountryS_T.inl
+
+CountryC.cpp CountryC.h CountryC.inl CountryS.cpp CountryS.h CountryS.inl CountryS_T.cpp CountryS_T.h CountryS_T.inl: Country-stamp
+
+Country-stamp: $(srcdir)/Country.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Country.idl
+	@touch $@
+
+noinst_PROGRAMS += Consumer
+
+Consumer_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
+
+Consumer_SOURCES = \
+  Consumer.cpp \
+  CountryC.cpp \
+  CountryS.cpp \
+  Country_i.cpp \
+  CountryC.h \
+  CountryC.inl \
+  CountryS.h \
+  CountryS_T.h \
+  CountryS_T.inl \
+  Country_i.h
+
+Consumer_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_EC_TYPED_EVENTS
+
+## Makefile.CosEC_TypedSimple_Supplier.am
+
+if BUILD_EC_TYPED_EVENTS
+if !BUILD_MINIMUM_CORBA
+
+noinst_PROGRAMS += Supplier
+
+Supplier_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
+
+Supplier_SOURCES = \
+  CountryC.cpp \
+  Supplier.cpp \
+  Country_i.h
+
+Supplier_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_EC_TYPED_EVENTS
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/examples/FaultTolerance/Makefile.am b/TAO/orbsvcs/examples/FaultTolerance/Makefile.am
new file mode 100644
index 00000000000..de68f48e20a
--- /dev/null
+++ b/TAO/orbsvcs/examples/FaultTolerance/Makefile.am
@@ -0,0 +1,13 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+SUBDIRS = \
+        RolyPoly
+
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am
new file mode 100644
index 00000000000..e6bc57c13ff
--- /dev/null
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am
@@ -0,0 +1,177 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
+TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_ROOT = $(top_srcdir)
+
+noinst_PROGRAMS =
+
+## Makefile.RolyPoly_Idl.am
+
+BUILT_SOURCES = \
+  RolyPolyC.cpp \
+  RolyPolyC.h \
+  RolyPolyC.inl \
+  RolyPolyS.cpp \
+  RolyPolyS.h \
+  RolyPolyS.inl \
+  RolyPolyS_T.cpp \
+  RolyPolyS_T.h \
+  RolyPolyS_T.inl
+
+CLEANFILES = \
+  RolyPoly-stamp \
+  RolyPolyC.cpp \
+  RolyPolyC.h \
+  RolyPolyC.inl \
+  RolyPolyS.cpp \
+  RolyPolyS.h \
+  RolyPolyS.inl \
+  RolyPolyS_T.cpp \
+  RolyPolyS_T.h \
+  RolyPolyS_T.inl
+
+RolyPolyC.cpp RolyPolyC.h RolyPolyC.inl RolyPolyS.cpp RolyPolyS.h RolyPolyS.inl RolyPolyS_T.cpp RolyPolyS_T.h RolyPolyS_T.inl: RolyPoly-stamp
+
+RolyPoly-stamp: $(srcdir)/RolyPoly.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/RolyPoly.idl
+	@touch $@
+
+
+## Makefile.RolyPoly_Client.am
+
+if BUILD_ACE_UUID
+if BUILD_CORBA_MESSAGING
+if BUILD_EXCEPTIONS
+if BUILD_INTERCEPTORS
+if !BUILD_MINIMUM_CORBA
+
+noinst_PROGRAMS += client
+
+client_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
+
+client_SOURCES = \
+  RolyPolyC.cpp \
+  client.cpp \
+  CrashPoint.h \
+  Log.h \
+  LogACE_RB_Tree.h \
+  LogStdMap.h \
+  ORB_Initializer.h \
+  ReplicaController.h \
+  RolyPoly_i.h \
+  StateUpdate.h
+
+client_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_INTERCEPTORS
+endif BUILD_EXCEPTIONS
+endif BUILD_CORBA_MESSAGING
+endif BUILD_ACE_UUID
+
+## Makefile.RolyPoly_Server.am
+
+if BUILD_ACE_UUID
+if BUILD_CORBA_MESSAGING
+if BUILD_EXCEPTIONS
+if BUILD_INTERCEPTORS
+if BUILD_THREADS
+if !BUILD_MINIMUM_CORBA
+
+noinst_PROGRAMS += server
+
+server_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -I$(ACE_ROOT)/protocols \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
+
+server_SOURCES = \
+  CrashPoint.cpp \
+  ORB_Initializer.cpp \
+  ReplicaController.cpp \
+  RolyPolyC.cpp \
+  RolyPolyS.cpp \
+  RolyPoly_i.cpp \
+  server.cpp \
+  CrashPoint.h \
+  ORB_Initializer.h \
+  ReplicaController.h \
+  RolyPoly_i.h
+
+server_LDADD = \
+  $(ACE_BUILDDIR)/protocols/ace/TMCast/libACE_TMCast.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_THREADS
+endif BUILD_INTERCEPTORS
+endif BUILD_EXCEPTIONS
+endif BUILD_CORBA_MESSAGING
+endif BUILD_ACE_UUID
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc
index 04dfb4fc843..dea14f4a82c 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc
@@ -1,18 +1,32 @@
 // $Id$
+project(*idl): taoidldefaults {
+  IDL_Files {
+    RolyPoly.idl
+  }
+  custom_only = 1
+}
+
 project(*Server): orbsvcsexe, fault_tolerance, tmcast, pi_server, interceptors {
+  after += *idl
   Source_Files {
+    RolyPolyS.cpp
+    RolyPolyC.cpp
     RolyPoly_i.cpp
     ORB_Initializer.cpp
     ReplicaController.cpp
     CrashPoint.cpp
     server.cpp
   }
+  IDL_Files {
+  }
 }
 
 project(*Client): taoclient, fault_tolerance, exceptions {
+  after += *idl
   Source_Files {
     RolyPolyC.cpp
     client.cpp
   }
+  IDL_Files {
+  }
 }
-
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Makefile.am b/TAO/orbsvcs/examples/ImR/Advanced/Makefile.am
new file mode 100644
index 00000000000..1aa331f7e27
--- /dev/null
+++ b/TAO/orbsvcs/examples/ImR/Advanced/Makefile.am
@@ -0,0 +1,309 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
+TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_ROOT = $(top_srcdir)
+
+CLEANFILES =
+noinst_PROGRAMS =
+BUILT_SOURCES =
+
+## Makefile.Advanced_Client.am
+
+if BUILD_EXCEPTIONS
+
+BUILT_SOURCES += \
+  ManagerC.h \
+  ManagerC.inl \
+  ManagerS.h \
+  ManagerS.inl \
+  ManagerS_T.cpp \
+  ManagerS_T.h \
+  ManagerS_T.inl
+
+CLEANFILES += \
+  Manager-stamp \
+  ManagerC.h \
+  ManagerC.inl \
+  ManagerS.h \
+  ManagerS.inl \
+  ManagerS_T.cpp \
+  ManagerS_T.h \
+  ManagerS_T.inl
+
+ManagerC.h ManagerC.inl ManagerS.h ManagerS.inl ManagerS_T.cpp ManagerS_T.h ManagerS_T.inl: Manager-stamp
+
+Manager-stamp: $(srcdir)/Manager.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Manager.idl
+	@touch $@
+
+BUILT_SOURCES += \
+  MessengerC.cpp \
+  MessengerC.h \
+  MessengerC.inl \
+  MessengerS.h \
+  MessengerS.inl \
+  MessengerS_T.cpp \
+  MessengerS_T.h \
+  MessengerS_T.inl
+
+CLEANFILES += \
+  Messenger-stamp \
+  MessengerC.cpp \
+  MessengerC.h \
+  MessengerC.inl \
+  MessengerS.h \
+  MessengerS.inl \
+  MessengerS_T.cpp \
+  MessengerS_T.h \
+  MessengerS_T.inl
+
+MessengerC.cpp MessengerC.h MessengerC.inl MessengerS.h MessengerS.inl MessengerS_T.cpp MessengerS_T.h MessengerS_T.inl: Messenger-stamp
+
+Messenger-stamp: $(srcdir)/Messenger.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Messenger.idl
+	@touch $@
+
+noinst_PROGRAMS += client_main
+
+client_main_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR)
+
+client_main_SOURCES = \
+  MessengerC.cpp \
+  TestClient.cpp \
+  client_main.cpp \
+  ManagerC.h \
+  ManagerC.inl \
+  ManagerS.h \
+  ManagerS_T.h \
+  ManagerS_T.inl \
+  MessengerC.h \
+  MessengerC.inl \
+  MessengerS.h \
+  MessengerS_T.h \
+  MessengerS_T.inl \
+  TestClient.h
+
+client_main_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif BUILD_EXCEPTIONS
+
+## Makefile.Advanced_Manager.am
+
+if BUILD_EXCEPTIONS
+
+BUILT_SOURCES += \
+  ManagerC.cpp \
+  ManagerC.h \
+  ManagerC.inl \
+  ManagerS.cpp \
+  ManagerS.h \
+  ManagerS.inl \
+  ManagerS_T.cpp \
+  ManagerS_T.h \
+  ManagerS_T.inl
+
+CLEANFILES += \
+  Manager-stamp \
+  ManagerC.cpp \
+  ManagerC.h \
+  ManagerC.inl \
+  ManagerS.cpp \
+  ManagerS.h \
+  ManagerS.inl \
+  ManagerS_T.cpp \
+  ManagerS_T.h \
+  ManagerS_T.inl
+
+ManagerC.cpp ManagerC.h ManagerC.inl ManagerS.cpp ManagerS.h ManagerS.inl ManagerS_T.cpp ManagerS_T.h ManagerS_T.inl: Manager-stamp
+
+Manager-stamp: $(srcdir)/Manager.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Manager.idl
+	@touch $@
+
+BUILT_SOURCES += \
+  MessengerC.cpp \
+  MessengerC.h \
+  MessengerC.inl \
+  MessengerS.cpp \
+  MessengerS.h \
+  MessengerS.inl \
+  MessengerS_T.cpp \
+  MessengerS_T.h \
+  MessengerS_T.inl
+
+CLEANFILES += \
+  Messenger-stamp \
+  MessengerC.cpp \
+  MessengerC.h \
+  MessengerC.inl \
+  MessengerS.cpp \
+  MessengerS.h \
+  MessengerS.inl \
+  MessengerS_T.cpp \
+  MessengerS_T.h \
+  MessengerS_T.inl
+
+MessengerC.cpp MessengerC.h MessengerC.inl MessengerS.cpp MessengerS.h MessengerS.inl MessengerS_T.cpp MessengerS_T.h MessengerS_T.inl: Messenger-stamp
+
+Messenger-stamp: $(srcdir)/Messenger.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Messenger.idl
+	@touch $@
+
+noinst_PROGRAMS += manager_main
+
+manager_main_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR)
+
+manager_main_SOURCES = \
+  ManagerC.cpp \
+  ManagerS.cpp \
+  Manager_i.cpp \
+  MessengerC.cpp \
+  MessengerS.cpp \
+  manager_main.cpp \
+  ManagerC.h \
+  ManagerC.inl \
+  ManagerS.h \
+  ManagerS_T.h \
+  ManagerS_T.inl \
+  Manager_i.h \
+  MessengerC.h \
+  MessengerC.inl \
+  MessengerS.h \
+  MessengerS_T.h \
+  MessengerS_T.inl
+
+manager_main_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif BUILD_EXCEPTIONS
+
+## Makefile.Advanced_Server.am
+
+if BUILD_EXCEPTIONS
+
+BUILT_SOURCES += \
+  ManagerC.cpp \
+  ManagerC.h \
+  ManagerC.inl \
+  ManagerS.h \
+  ManagerS.inl \
+  ManagerS_T.cpp \
+  ManagerS_T.h \
+  ManagerS_T.inl
+
+CLEANFILES += \
+  Manager-stamp \
+  ManagerC.cpp \
+  ManagerC.h \
+  ManagerC.inl \
+  ManagerS.h \
+  ManagerS.inl \
+  ManagerS_T.cpp \
+  ManagerS_T.h \
+  ManagerS_T.inl
+
+ManagerC.cpp ManagerC.h ManagerC.inl ManagerS.h ManagerS.inl ManagerS_T.cpp ManagerS_T.h ManagerS_T.inl: Manager-stamp
+
+Manager-stamp: $(srcdir)/Manager.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Manager.idl
+	@touch $@
+
+BUILT_SOURCES += \
+  MessengerC.cpp \
+  MessengerC.h \
+  MessengerC.inl \
+  MessengerS.cpp \
+  MessengerS.h \
+  MessengerS.inl \
+  MessengerS_T.cpp \
+  MessengerS_T.h \
+  MessengerS_T.inl
+
+CLEANFILES += \
+  Messenger-stamp \
+  MessengerC.cpp \
+  MessengerC.h \
+  MessengerC.inl \
+  MessengerS.cpp \
+  MessengerS.h \
+  MessengerS.inl \
+  MessengerS_T.cpp \
+  MessengerS_T.h \
+  MessengerS_T.inl
+
+MessengerC.cpp MessengerC.h MessengerC.inl MessengerS.cpp MessengerS.h MessengerS.inl MessengerS_T.cpp MessengerS_T.h MessengerS_T.inl: Messenger-stamp
+
+Messenger-stamp: $(srcdir)/Messenger.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Messenger.idl
+	@touch $@
+
+noinst_PROGRAMS += server_main
+
+server_main_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR)
+
+server_main_SOURCES = \
+  ManagerC.cpp \
+  MessengerC.cpp \
+  MessengerS.cpp \
+  Messenger_i.cpp \
+  TestServer.cpp \
+  server_main.cpp \
+  ManagerC.h \
+  ManagerC.inl \
+  ManagerS.h \
+  ManagerS_T.h \
+  ManagerS_T.inl \
+  MessengerC.h \
+  MessengerC.inl \
+  MessengerS.h \
+  MessengerS_T.h \
+  MessengerS_T.inl \
+  Messenger_i.h \
+  TestServer.h
+
+server_main_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif BUILD_EXCEPTIONS
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/Makefile.am b/TAO/orbsvcs/examples/ImR/Combined_Service/Makefile.am
new file mode 100644
index 00000000000..f21e5c64190
--- /dev/null
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/Makefile.am
@@ -0,0 +1,317 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
+TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_ROOT = $(top_srcdir)
+
+CLEANFILES =
+noinst_PROGRAMS =
+BUILT_SOURCES =
+
+## Makefile.ImR_Combined_Service.am
+
+if BUILD_EXCEPTIONS
+
+BUILT_SOURCES += \
+  service_configC.cpp \
+  service_configC.h \
+  service_configC.inl \
+  service_configS.cpp \
+  service_configS.h \
+  service_configS.inl \
+  service_configS_T.cpp \
+  service_configS_T.h \
+  service_configS_T.inl
+
+CLEANFILES += \
+  service_config-stamp \
+  service_configC.cpp \
+  service_configC.h \
+  service_configC.inl \
+  service_configS.cpp \
+  service_configS.h \
+  service_configS.inl \
+  service_configS_T.cpp \
+  service_configS_T.h \
+  service_configS_T.inl
+
+service_configC.cpp service_configC.h service_configC.inl service_configS.cpp service_configS.h service_configS.inl service_configS_T.cpp service_configS_T.h service_configS_T.inl: service_config-stamp
+
+service_config-stamp: $(srcdir)/service_config.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/service_config.idl
+	@touch $@
+
+noinst_PROGRAMS += combined_service
+
+combined_service_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR)
+
+combined_service_SOURCES = \
+  combined.cpp \
+  service_configC.cpp \
+  service_configS.cpp \
+  service_configC.h \
+  service_configC.inl \
+  service_configS.h \
+  service_configS_T.h \
+  service_configS_T.inl
+
+combined_service_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif BUILD_EXCEPTIONS
+
+## Makefile.ImR_Combined_Service_Controller.am
+
+if BUILD_EXCEPTIONS
+
+BUILT_SOURCES += \
+  service_configC.cpp \
+  service_configC.h \
+  service_configC.inl \
+  service_configS.h \
+  service_configS.inl \
+  service_configS_T.cpp \
+  service_configS_T.h \
+  service_configS_T.inl
+
+CLEANFILES += \
+  service_config-stamp \
+  service_configC.cpp \
+  service_configC.h \
+  service_configC.inl \
+  service_configS.h \
+  service_configS.inl \
+  service_configS_T.cpp \
+  service_configS_T.h \
+  service_configS_T.inl
+
+service_configC.cpp service_configC.h service_configC.inl service_configS.h service_configS.inl service_configS_T.cpp service_configS_T.h service_configS_T.inl: service_config-stamp
+
+service_config-stamp: $(srcdir)/service_config.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/service_config.idl
+	@touch $@
+
+noinst_PROGRAMS += controller
+
+controller_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR)
+
+controller_SOURCES = \
+  controller.cpp \
+  service_configC.cpp \
+  service_configC.h \
+  service_configC.inl \
+  service_configS.h \
+  service_configS_T.h \
+  service_configS_T.inl
+
+controller_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif BUILD_EXCEPTIONS
+
+## Makefile.ImR_Combined_Service_DynamicServer.am
+
+if BUILD_EXCEPTIONS
+
+BUILT_SOURCES += \
+  testC.cpp \
+  testC.h \
+  testC.inl \
+  testS.cpp \
+  testS.h \
+  testS.inl \
+  testS_T.cpp \
+  testS_T.h \
+  testS_T.inl
+
+CLEANFILES += \
+  test-stamp \
+  testC.cpp \
+  testC.h \
+  testC.inl \
+  testS.cpp \
+  testS.h \
+  testS.inl \
+  testS_T.cpp \
+  testS_T.h \
+  testS_T.inl
+
+testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
+
+test-stamp: $(srcdir)/test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
+	@touch $@
+
+noinst_LTLIBRARIES = libDynServer.la
+
+libDynServer_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -DDYNSERVER_BUILD_DLL
+
+libDynServer_la_SOURCES = \
+  dynserver.cpp \
+  testC.cpp \
+  testS.cpp
+
+noinst_HEADERS = \
+  dynserver.h \
+  dynserver_export.h \
+  test.idl \
+  testC.h \
+  testC.inl \
+  testS.h \
+  testS_T.cpp \
+  testS_T.h \
+  testS_T.inl
+
+endif BUILD_EXCEPTIONS
+
+## Makefile.ImR_Combined_Service_Test.am
+
+if BUILD_EXCEPTIONS
+
+BUILT_SOURCES += \
+  testC.cpp \
+  testC.h \
+  testC.inl \
+  testS.h \
+  testS.inl \
+  testS_T.cpp \
+  testS_T.h \
+  testS_T.inl
+
+CLEANFILES += \
+  test-stamp \
+  testC.cpp \
+  testC.h \
+  testC.inl \
+  testS.h \
+  testS.inl \
+  testS_T.cpp \
+  testS_T.h \
+  testS_T.inl
+
+testC.cpp testC.h testC.inl testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
+
+test-stamp: $(srcdir)/test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
+	@touch $@
+
+noinst_PROGRAMS += test
+
+test_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR)
+
+test_SOURCES = \
+  test.cpp \
+  testC.cpp \
+  testC.h \
+  testC.inl \
+  testS.h \
+  testS_T.h \
+  testS_T.inl
+
+test_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif BUILD_EXCEPTIONS
+
+## Makefile.ImR_Combined_Service_TestServer.am
+
+if BUILD_EXCEPTIONS
+
+BUILT_SOURCES += \
+  testC.cpp \
+  testC.h \
+  testC.inl \
+  testS.cpp \
+  testS.h \
+  testS.inl \
+  testS_T.cpp \
+  testS_T.h \
+  testS_T.inl
+
+CLEANFILES += \
+  test-stamp \
+  testC.cpp \
+  testC.h \
+  testC.inl \
+  testS.cpp \
+  testS.h \
+  testS.inl \
+  testS_T.cpp \
+  testS_T.h \
+  testS_T.inl
+
+testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
+
+test-stamp: $(srcdir)/test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
+	@touch $@
+
+noinst_PROGRAMS += test_server
+
+test_server_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR)
+
+test_server_SOURCES = \
+  testC.cpp \
+  testS.cpp \
+  test_server.cpp \
+  testC.h \
+  testC.inl \
+  testS.h \
+  testS_T.h \
+  testS_T.inl
+
+test_server_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif BUILD_EXCEPTIONS
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/examples/ImR/Makefile.am b/TAO/orbsvcs/examples/ImR/Makefile.am
new file mode 100644
index 00000000000..a2e0227610a
--- /dev/null
+++ b/TAO/orbsvcs/examples/ImR/Makefile.am
@@ -0,0 +1,14 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+SUBDIRS = \
+        Advanced \
+        Combined_Service
+
diff --git a/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc b/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc
index 704dd916769..d5e1b0db90c 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc
+++ b/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc
@@ -1,5 +1,13 @@
 // $Id$
+project(*idl) : taoidldefaults  {
+  IDL_Files {
+    Test.idl
+  }
+  custom_only = 1
+}
+
 project(*Server): taoexe, loadbalancing, pi_server, exceptions {
+  after += *idl
   Source_Files {
     ServerRequestInterceptor.cpp
     ORBInitializer.cpp
@@ -7,12 +15,19 @@ project(*Server): taoexe, loadbalancing, pi_server, exceptions {
     RPS_Monitor.cpp
     Stock.cpp
     server.cpp
+    TestS.cpp
+    TestC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*Client): taoclient, strategies {
+  after += *idl
   Source_Files {
     TestC.cpp
     client.cpp
   }
+  IDL_Files {
+  }
 }
diff --git a/TAO/orbsvcs/examples/LoadBalancing/Makefile.am b/TAO/orbsvcs/examples/LoadBalancing/Makefile.am
new file mode 100644
index 00000000000..4e5d3372702
--- /dev/null
+++ b/TAO/orbsvcs/examples/LoadBalancing/Makefile.am
@@ -0,0 +1,136 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
+TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_ROOT = $(top_srcdir)
+
+
+## Makefile.LoadBalancing_Idl.am
+
+BUILT_SOURCES = \
+  TestC.cpp \
+  TestC.h \
+  TestC.inl \
+  TestS.cpp \
+  TestS.h \
+  TestS.inl \
+  TestS_T.cpp \
+  TestS_T.h \
+  TestS_T.inl
+
+CLEANFILES = \
+  Test-stamp \
+  TestC.cpp \
+  TestC.h \
+  TestC.inl \
+  TestS.cpp \
+  TestS.h \
+  TestS.inl \
+  TestS_T.cpp \
+  TestS_T.h \
+  TestS_T.inl
+
+TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp
+
+Test-stamp: $(srcdir)/Test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Test.idl
+	@touch $@
+
+
+## Makefile.LoadBalancing_Client.am
+
+noinst_PROGRAMS = client
+
+client_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR)
+
+client_SOURCES = \
+  TestC.cpp \
+  client.cpp \
+  ORBInitializer.h \
+  RPS_Monitor.h \
+  ServerRequestInterceptor.h \
+  Stock.h \
+  StockFactory.h
+
+client_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+## Makefile.LoadBalancing_Server.am
+
+if BUILD_AMI
+if BUILD_CORBA_MESSAGING
+if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
+
+noinst_PROGRAMS += server
+
+server_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs
+
+server_SOURCES = \
+  ORBInitializer.cpp \
+  RPS_Monitor.cpp \
+  ServerRequestInterceptor.cpp \
+  Stock.cpp \
+  StockFactory.cpp \
+  TestC.cpp \
+  TestS.cpp \
+  server.cpp \
+  ORBInitializer.h \
+  RPS_Monitor.h \
+  ServerRequestInterceptor.h \
+  Stock.h \
+  StockFactory.h
+
+server_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosLoadBalancing.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_EXCEPTIONS
+endif BUILD_CORBA_MESSAGING
+endif BUILD_AMI
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/examples/Log/Basic/Makefile.am b/TAO/orbsvcs/examples/Log/Basic/Makefile.am
new file mode 100644
index 00000000000..df4614a7f86
--- /dev/null
+++ b/TAO/orbsvcs/examples/Log/Basic/Makefile.am
@@ -0,0 +1,46 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
+
+## Makefile.Log_Basic_Client.am
+
+noinst_PROGRAMS = client
+
+client_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs
+
+client_SOURCES = \
+  TLS_Client.cpp \
+  main.cpp \
+  TLS_Client.h
+
+client_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/examples/Log/Event/Makefile.am b/TAO/orbsvcs/examples/Log/Event/Makefile.am
new file mode 100644
index 00000000000..32a750f2032
--- /dev/null
+++ b/TAO/orbsvcs/examples/Log/Event/Makefile.am
@@ -0,0 +1,88 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
+
+noinst_PROGRAMS =
+
+## Makefile.Log_Event_Consumer.am
+
+if !BUILD_MINIMUM_CORBA
+
+noinst_PROGRAMS += Event_Consumer
+
+Event_Consumer_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
+
+Event_Consumer_SOURCES = \
+  Event_Consumer.cpp \
+  Event_Consumer.h
+
+Event_Consumer_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+
+## Makefile.Log_Event_Supplier.am
+
+if !BUILD_MINIMUM_CORBA
+
+noinst_PROGRAMS += Event_Supplier
+
+Event_Supplier_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
+
+Event_Supplier_SOURCES = \
+  Event_Supplier.cpp \
+  Event_Supplier.h
+
+Event_Supplier_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/examples/Log/Makefile.am b/TAO/orbsvcs/examples/Log/Makefile.am
new file mode 100644
index 00000000000..0ac9d35f6a2
--- /dev/null
+++ b/TAO/orbsvcs/examples/Log/Makefile.am
@@ -0,0 +1,16 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+SUBDIRS = \
+        Basic \
+        Event \
+        Notify \
+        RTEvent
+
diff --git a/TAO/orbsvcs/examples/Log/Notify/Makefile.am b/TAO/orbsvcs/examples/Log/Notify/Makefile.am
new file mode 100644
index 00000000000..6db9cd17c3e
--- /dev/null
+++ b/TAO/orbsvcs/examples/Log/Notify/Makefile.am
@@ -0,0 +1,94 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
+
+noinst_PROGRAMS =
+
+## Makefile.Log_Notify_Consumer.am
+
+if !BUILD_MINIMUM_CORBA
+
+noinst_PROGRAMS += Notify_Consumer
+
+Notify_Consumer_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
+
+Notify_Consumer_SOURCES = \
+  Notify_Consumer.cpp \
+  Notify_Consumer.h
+
+Notify_Consumer_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsNotifyLogAdmin.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+
+## Makefile.Log_Notify_Supplier.am
+
+if !BUILD_MINIMUM_CORBA
+
+noinst_PROGRAMS += Notify_Supplier
+
+Notify_Supplier_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
+
+Notify_Supplier_SOURCES = \
+  Notify_Supplier.cpp \
+  Notify_Supplier.h
+
+Notify_Supplier_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsNotifyLogAdmin.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsEventLogAdmin.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am b/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am
new file mode 100644
index 00000000000..15f071cbc2a
--- /dev/null
+++ b/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am
@@ -0,0 +1,108 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
+
+noinst_PROGRAMS =
+
+## Makefile.Log_RTEvent_Consumer.am
+
+if BUILD_CORBA_MESSAGING
+
+noinst_PROGRAMS += RTEvent_Consumer
+
+RTEvent_Consumer_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs
+
+RTEvent_Consumer_SOURCES = \
+  RTEvent_Consumer.cpp \
+  RTEvent_Consumer.h
+
+RTEvent_Consumer_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEventLogAdmin.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif BUILD_CORBA_MESSAGING
+
+## Makefile.Log_RTEvent_Supplier.am
+
+if BUILD_CORBA_MESSAGING
+
+noinst_PROGRAMS += RTEvent_Supplier
+
+RTEvent_Supplier_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs
+
+RTEvent_Supplier_SOURCES = \
+  RTEvent_Supplier.cpp \
+  RTEvent_Supplier.h
+
+RTEvent_Supplier_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEventLogAdmin.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_DsLogAdmin.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif BUILD_CORBA_MESSAGING
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/examples/Makefile.am b/TAO/orbsvcs/examples/Makefile.am
new file mode 100644
index 00000000000..6946fc50461
--- /dev/null
+++ b/TAO/orbsvcs/examples/Makefile.am
@@ -0,0 +1,21 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+SUBDIRS = \
+        CosEC \
+        FaultTolerance \
+        ImR \
+        LoadBalancing \
+        Log \
+        Notify \
+        ORT \
+        RtEC \
+        Security
+
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am
new file mode 100644
index 00000000000..d501c88ddad
--- /dev/null
+++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am
@@ -0,0 +1,65 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
+
+
+## Makefile.Agent.am
+
+if BUILD_THREADS
+if !BUILD_MINIMUM_CORBA
+
+noinst_PROGRAMS = agent
+
+agent_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(ACE_ROOT)/protocols \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -I$(srcdir)/.. \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
+
+agent_SOURCES = \
+  Agent.cpp
+
+agent_LDADD = \
+  $(top_builddir)/orbsvcs/examples/Notify/Federation/Gate/libGate.la \
+  $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/protocols/ace/RMCast/libACE_RMCast.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_THREADS
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am
new file mode 100644
index 00000000000..e08d005cca6
--- /dev/null
+++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am
@@ -0,0 +1,51 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
+
+
+## Makefile.Gate.am
+
+if BUILD_THREADS
+if !BUILD_MINIMUM_CORBA
+
+noinst_LTLIBRARIES = libGate.la
+
+libGate_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(ACE_ROOT)/protocols \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL \
+  -DGATE_BUILD_DLL
+
+libGate_la_SOURCES = \
+  Gate.cpp
+
+noinst_HEADERS = \
+  Export.h \
+  Gate.h
+
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_THREADS
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/Makefile.am
new file mode 100644
index 00000000000..e2cd22eac8a
--- /dev/null
+++ b/TAO/orbsvcs/examples/Notify/Federation/Makefile.am
@@ -0,0 +1,15 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+SUBDIRS = \
+        Gate \
+        Agent \
+        SpaceCraft
+
diff --git a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am
new file mode 100644
index 00000000000..0b95a973522
--- /dev/null
+++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am
@@ -0,0 +1,65 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
+
+
+## Makefile.SpaceCraft.am
+
+if BUILD_THREADS
+if !BUILD_MINIMUM_CORBA
+
+noinst_PROGRAMS = craft
+
+craft_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(ACE_ROOT)/protocols \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -I$(srcdir)/.. \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
+
+craft_SOURCES = \
+  SpaceCraft.cpp
+
+craft_LDADD = \
+  $(top_builddir)/orbsvcs/examples/Notify/Federation/Gate/libGate.la \
+  $(TAO_BUILDDIR)/tao/libTAO_TypeCodeFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/protocols/ace/RMCast/libACE_RMCast.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_THREADS
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Makefile.am b/TAO/orbsvcs/examples/Notify/Filter/Makefile.am
new file mode 100644
index 00000000000..1b9aea27185
--- /dev/null
+++ b/TAO/orbsvcs/examples/Notify/Filter/Makefile.am
@@ -0,0 +1,56 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
+
+
+## Makefile.Notify_Filter.am
+
+if !BUILD_MINIMUM_CORBA
+
+noinst_PROGRAMS = main
+
+main_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
+
+main_SOURCES = \
+  Filter.cpp \
+  main.cpp \
+  Filter.h
+
+main_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am b/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am
new file mode 100644
index 00000000000..c71332e7d66
--- /dev/null
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am
@@ -0,0 +1,122 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
+
+noinst_PROGRAMS =
+
+## Makefile.Notify_Lanes_Consumer.am
+
+if BUILD_RT_CORBA
+if !BUILD_MINIMUM_CORBA
+
+noinst_PROGRAMS += Consumer
+
+Consumer_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
+
+Consumer_SOURCES = \
+  Consumer.cpp \
+  Consumer_Client.cpp \
+  ORB_Objects.cpp \
+  ORB_Run_Task.cpp \
+  Consumer.h \
+  Consumer_Client.h \
+  ORB_Objects.h \
+  ORB_Run_Task.h
+
+Consumer_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RT_Notification.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
+  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_RT_CORBA
+
+## Makefile.Notify_Lanes_Supplier.am
+
+if BUILD_RT_CORBA
+if !BUILD_MINIMUM_CORBA
+
+noinst_PROGRAMS += Supplier
+
+Supplier_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
+
+Supplier_SOURCES = \
+  ORB_Objects.cpp \
+  ORB_Run_Task.cpp \
+  Supplier.cpp \
+  Supplier_Client.cpp \
+  ORB_Objects.h \
+  ORB_Run_Task.h \
+  Supplier.h \
+  Supplier_Client.h
+
+Supplier_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RT_Notification.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_RT_CORBA
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/examples/Notify/Makefile.am b/TAO/orbsvcs/examples/Notify/Makefile.am
new file mode 100644
index 00000000000..f7629bec5f9
--- /dev/null
+++ b/TAO/orbsvcs/examples/Notify/Makefile.am
@@ -0,0 +1,17 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+SUBDIRS = \
+        Federation \
+        Filter \
+        Lanes \
+        Subscribe \
+        ThreadPool
+
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am b/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am
new file mode 100644
index 00000000000..3064ac4889d
--- /dev/null
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am
@@ -0,0 +1,56 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
+
+
+## Makefile.Notify_Subscribe.am
+
+if !BUILD_MINIMUM_CORBA
+
+noinst_PROGRAMS = main
+
+main_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
+
+main_SOURCES = \
+  Subscribe.cpp \
+  main.cpp \
+  Subscribe.h
+
+main_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am b/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am
new file mode 100644
index 00000000000..a1ebe89bc56
--- /dev/null
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am
@@ -0,0 +1,126 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
+
+noinst_PROGRAMS =
+
+## Makefile.Notify_ThreadPool_Consumer.am
+
+if BUILD_RT_CORBA
+if !BUILD_MINIMUM_CORBA
+
+noinst_PROGRAMS += Consumer
+
+Consumer_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
+
+Consumer_SOURCES = \
+  Consumer.cpp \
+  Consumer_Client.cpp \
+  ORB_Objects.cpp \
+  ORB_Run_Task.cpp \
+  Consumer.h \
+  Consumer_Client.h \
+  ORB_Objects.h \
+  ORB_Run_Task.h
+
+Consumer_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RT_Notification.la \
+  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_RT_CORBA
+
+## Makefile.Notify_ThreadPool_Supplier.am
+
+if BUILD_RT_CORBA
+if !BUILD_MINIMUM_CORBA
+
+noinst_PROGRAMS += Supplier
+
+Supplier_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -I$(TAO_ROOT)/orbsvcs/tests/Notify/lib \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
+
+Supplier_SOURCES = \
+  ORB_Objects.cpp \
+  ORB_Run_Task.cpp \
+  Supplier.cpp \
+  Supplier_Client.cpp \
+  ORB_Objects.h \
+  ORB_Run_Task.h \
+  Supplier.h \
+  Supplier_Client.h
+
+Supplier_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \
+  $(TAO_BUILDDIR)/orbsvcs/tests/Notify/lib/libTAO_NotifyTests.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RT_Notification.la \
+  $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Serv.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_RT_CORBA
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/examples/ORT/Makefile.am b/TAO/orbsvcs/examples/ORT/Makefile.am
new file mode 100644
index 00000000000..62e0ffb9e32
--- /dev/null
+++ b/TAO/orbsvcs/examples/ORT/Makefile.am
@@ -0,0 +1,237 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
+TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_ROOT = $(top_srcdir)
+
+CLEANFILES =
+noinst_PROGRAMS =
+BUILT_SOURCES =
+
+## Makefile.ORT_Idl.am
+
+if !BUILD_MINIMUM_CORBA
+
+BUILT_SOURCES += \
+  GatewayC.cpp \
+  GatewayC.h \
+  GatewayC.inl \
+  GatewayS.cpp \
+  GatewayS.h \
+  GatewayS.inl \
+  GatewayS_T.cpp \
+  GatewayS_T.h \
+  GatewayS_T.inl
+
+CLEANFILES += \
+  Gateway-stamp \
+  GatewayC.cpp \
+  GatewayC.h \
+  GatewayC.inl \
+  GatewayS.cpp \
+  GatewayS.h \
+  GatewayS.inl \
+  GatewayS_T.cpp \
+  GatewayS_T.h \
+  GatewayS_T.inl
+
+GatewayC.cpp GatewayC.h GatewayC.inl GatewayS.cpp GatewayS.h GatewayS.inl GatewayS_T.cpp GatewayS_T.h GatewayS_T.inl: Gateway-stamp
+
+Gateway-stamp: $(srcdir)/Gateway.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Gateway.idl
+	@touch $@
+
+BUILT_SOURCES += \
+  ObjectReferenceFactoryC.cpp \
+  ObjectReferenceFactoryC.h \
+  ObjectReferenceFactoryC.inl \
+  ObjectReferenceFactoryS.cpp \
+  ObjectReferenceFactoryS.h \
+  ObjectReferenceFactoryS.inl \
+  ObjectReferenceFactoryS_T.cpp \
+  ObjectReferenceFactoryS_T.h \
+  ObjectReferenceFactoryS_T.inl
+
+CLEANFILES += \
+  ObjectReferenceFactory-stamp \
+  ObjectReferenceFactoryC.cpp \
+  ObjectReferenceFactoryC.h \
+  ObjectReferenceFactoryC.inl \
+  ObjectReferenceFactoryS.cpp \
+  ObjectReferenceFactoryS.h \
+  ObjectReferenceFactoryS.inl \
+  ObjectReferenceFactoryS_T.cpp \
+  ObjectReferenceFactoryS_T.h \
+  ObjectReferenceFactoryS_T.inl
+
+ObjectReferenceFactoryC.cpp ObjectReferenceFactoryC.h ObjectReferenceFactoryC.inl ObjectReferenceFactoryS.cpp ObjectReferenceFactoryS.h ObjectReferenceFactoryS.inl ObjectReferenceFactoryS_T.cpp ObjectReferenceFactoryS_T.h ObjectReferenceFactoryS_T.inl: ObjectReferenceFactory-stamp
+
+ObjectReferenceFactory-stamp: $(srcdir)/ObjectReferenceFactory.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/ObjectReferenceFactory.idl
+	@touch $@
+
+BUILT_SOURCES += \
+  sum_serverC.cpp \
+  sum_serverC.h \
+  sum_serverC.inl \
+  sum_serverS.cpp \
+  sum_serverS.h \
+  sum_serverS.inl \
+  sum_serverS_T.cpp \
+  sum_serverS_T.h \
+  sum_serverS_T.inl
+
+CLEANFILES += \
+  sum_server-stamp \
+  sum_serverC.cpp \
+  sum_serverC.h \
+  sum_serverC.inl \
+  sum_serverS.cpp \
+  sum_serverS.h \
+  sum_serverS.inl \
+  sum_serverS_T.cpp \
+  sum_serverS_T.h \
+  sum_serverS_T.inl
+
+sum_serverC.cpp sum_serverC.h sum_serverC.inl sum_serverS.cpp sum_serverS.h sum_serverS.inl sum_serverS_T.cpp sum_serverS_T.h sum_serverS_T.inl: sum_server-stamp
+
+sum_server-stamp: $(srcdir)/sum_server.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/sum_server.idl
+	@touch $@
+
+
+endif !BUILD_MINIMUM_CORBA
+
+## Makefile.ORT_Gateway.am
+
+if BUILD_CORBA_MESSAGING
+if !BUILD_MINIMUM_CORBA
+
+noinst_PROGRAMS += gateway_server
+
+gateway_server_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR)
+
+gateway_server_SOURCES = \
+  GatewayC.cpp \
+  GatewayS.cpp \
+  Gateway_i.cpp \
+  Object_Factory_i.cpp \
+  gateway_server.cpp \
+  Gateway_i.h \
+  Object_Factory_i.h
+
+gateway_server_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
+
+## Makefile.ORT_Server.am
+
+if BUILD_CORBA_MESSAGING
+if !BUILD_MINIMUM_CORBA
+
+noinst_PROGRAMS += server
+
+server_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR)
+
+server_SOURCES = \
+  GatewayC.cpp \
+  Gateway_ObjRef_Factory.cpp \
+  ObjectReferenceFactoryC.cpp \
+  Server_IORInterceptor.cpp \
+  Server_IORInterceptor_ORBInitializer.cpp \
+  server.cpp \
+  sum_serverC.cpp \
+  sum_serverS.cpp \
+  sum_server_i.cpp \
+  Gateway_ObjRef_Factory.h \
+  Server_IORInterceptor.h \
+  Server_IORInterceptor_ORBInitializer.h \
+  sum_server_i.h
+
+server_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
+  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
+  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+endif BUILD_CORBA_MESSAGING
+
+## Makefile.ORT_Client.am
+
+if !BUILD_MINIMUM_CORBA
+
+noinst_PROGRAMS += client
+
+client_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -DTAO_HAS_TYPED_EVENT_CHANNEL
+
+client_SOURCES = \
+  client.cpp \
+  sum_serverC.cpp \
+  Gateway_ObjRef_Factory.h \
+  Gateway_i.h \
+  Object_Factory_i.h \
+  Server_IORInterceptor.h \
+  Server_IORInterceptor_ORBInitializer.h \
+  sum_server_i.h
+
+client_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif !BUILD_MINIMUM_CORBA
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/examples/ORT/ORT.mpc b/TAO/orbsvcs/examples/ORT/ORT.mpc
index 37769667fc4..ebe74844f8d 100644
--- a/TAO/orbsvcs/examples/ORT/ORT.mpc
+++ b/TAO/orbsvcs/examples/ORT/ORT.mpc
@@ -1,6 +1,17 @@
 // $Id$
 
+project(*idl): taoidldefaults, minimum_corba {
+  idl_files {
+    Gateway.idl
+    ObjectReferenceFactory.idl
+    sum_server.idl
+  }
+  custom_only = 1
+}
+
 project(*Gateway) : orbsvcsexe, dynamicinterface, ifr_client, minimum_corba {
+  after += *idl
+
   source_files {
     GatewayC.cpp
     GatewayS.cpp
@@ -9,7 +20,6 @@ project(*Gateway) : orbsvcsexe, dynamicinterface, ifr_client, minimum_corba {
     Object_Factory_i.cpp
   }
   idl_files {
-    Gateway.idl
   }
 }
 
@@ -28,8 +38,6 @@ project(*Server) : orbsvcsexe, dynamicinterface, ifr_client, minimum_corba, iori
     ObjectReferenceFactoryC.cpp
   }
   idl_files {
-    ObjectReferenceFactory.idl
-    sum_server.idl
   }
 }
 
@@ -39,9 +47,6 @@ project(*Client) : orbsvcsexe, event, minimum_corba {
     client.cpp
     sum_serverC.cpp
   }
+  idl_files {
+  }
 }
-
-
-
-
-
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am
new file mode 100644
index 00000000000..011e6455fee
--- /dev/null
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am
@@ -0,0 +1,162 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
+
+noinst_PROGRAMS =
+
+## Makefile.RtEC_IIOPGateway.am
+
+if BUILD_CORBA_MESSAGING
+
+noinst_PROGRAMS += Gateway
+
+Gateway_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs
+
+Gateway_SOURCES = \
+  Gateway.cpp \
+  Gateway.h
+
+Gateway_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif BUILD_CORBA_MESSAGING
+
+## Makefile.RtEC_IIOPGateway_Consumer.am
+
+if BUILD_CORBA_MESSAGING
+
+noinst_PROGRAMS += Consumer
+
+Consumer_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs
+
+Consumer_SOURCES = \
+  Consumer.cpp \
+  Consumer.h
+
+Consumer_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif BUILD_CORBA_MESSAGING
+
+## Makefile.RtEC_IIOPGateway_EC.am
+
+if BUILD_CORBA_MESSAGING
+
+noinst_PROGRAMS += EC
+
+EC_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs
+
+EC_SOURCES = \
+  EC.cpp \
+  EC.h
+
+EC_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif BUILD_CORBA_MESSAGING
+
+## Makefile.RtEC_IIOPGateway_Supplier.am
+
+if BUILD_CORBA_MESSAGING
+
+noinst_PROGRAMS += Supplier
+
+Supplier_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs
+
+Supplier_SOURCES = \
+  Supplier.cpp \
+  Supplier.h
+
+Supplier_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif BUILD_CORBA_MESSAGING
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am b/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am
new file mode 100644
index 00000000000..2a904831e54
--- /dev/null
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am
@@ -0,0 +1,66 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
+
+
+## Makefile.RtECKokyu.am
+
+if BUILD_CORBA_MESSAGING
+
+noinst_PROGRAMS = Service
+
+Service_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs \
+  -I$(ACE_ROOT)/Kokyu \
+  -I$(TAO_ROOT)/orbsvcs/orbsvcs/Sched
+
+Service_SOURCES = \
+  Consumer.cpp \
+  Service.cpp \
+  Supplier.cpp \
+  Consumer.h \
+  Supplier.h
+
+Service_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTKokyuEvent.la \
+  $(ACE_BUILDDIR)/Kokyu/libKokyu.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif BUILD_CORBA_MESSAGING
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am b/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am
new file mode 100644
index 00000000000..1f85d98f452
--- /dev/null
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am
@@ -0,0 +1,64 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
+
+
+## Makefile.RtEC_MCast.am
+
+if BUILD_CORBA_MESSAGING
+
+noinst_PROGRAMS = MCast
+
+MCast_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs
+
+MCast_SOURCES = \
+  AddrServer.cpp \
+  Consumer.cpp \
+  MCast.cpp \
+  Supplier.cpp \
+  AddrServer.h \
+  Consumer.h \
+  Supplier.h
+
+MCast_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif BUILD_CORBA_MESSAGING
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/examples/RtEC/Makefile.am b/TAO/orbsvcs/examples/RtEC/Makefile.am
new file mode 100644
index 00000000000..3e45d927786
--- /dev/null
+++ b/TAO/orbsvcs/examples/RtEC/Makefile.am
@@ -0,0 +1,17 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+SUBDIRS = \
+        IIOPGateway \
+        Kokyu \
+        MCast \
+        Schedule \
+        Simple
+
diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am b/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am
new file mode 100644
index 00000000000..d4b3c2e8f48
--- /dev/null
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am
@@ -0,0 +1,63 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
+
+
+## Makefile.RtEC_Schedule.am
+
+if BUILD_CORBA_MESSAGING
+
+noinst_PROGRAMS = Service
+
+Service_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs
+
+Service_SOURCES = \
+  Consumer.cpp \
+  Service.cpp \
+  Supplier.cpp \
+  Consumer.h \
+  Schedule.h \
+  Supplier.h
+
+Service_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTSched.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif BUILD_CORBA_MESSAGING
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am b/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am
new file mode 100644
index 00000000000..904b8f97d78
--- /dev/null
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am
@@ -0,0 +1,128 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
+
+noinst_PROGRAMS =
+
+## Makefile.RtEC_Simple_Consumer.am
+
+if BUILD_CORBA_MESSAGING
+
+noinst_PROGRAMS += Consumer
+
+Consumer_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs
+
+Consumer_SOURCES = \
+  Consumer.cpp \
+  Consumer.h
+
+Consumer_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif BUILD_CORBA_MESSAGING
+
+## Makefile.RtEC_Simple_Service.am
+
+if BUILD_CORBA_MESSAGING
+
+noinst_PROGRAMS += Service
+
+Service_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs
+
+Service_SOURCES = \
+  Service.cpp \
+  Consumer.h \
+  Supplier.h
+
+Service_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif BUILD_CORBA_MESSAGING
+
+## Makefile.RtEC_Simple_Supplier.am
+
+if BUILD_CORBA_MESSAGING
+
+noinst_PROGRAMS += Supplier
+
+Supplier_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs
+
+Supplier_SOURCES = \
+  Supplier.cpp \
+  Supplier.h
+
+Supplier_LDADD = \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif BUILD_CORBA_MESSAGING
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/examples/Security/Makefile.am b/TAO/orbsvcs/examples/Security/Makefile.am
new file mode 100644
index 00000000000..e65ff9e291b
--- /dev/null
+++ b/TAO/orbsvcs/examples/Security/Makefile.am
@@ -0,0 +1,13 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+SUBDIRS = \
+        Send_File
+
diff --git a/TAO/orbsvcs/examples/Security/Send_File/Makefile.am b/TAO/orbsvcs/examples/Security/Send_File/Makefile.am
new file mode 100644
index 00000000000..d23b32ae6e9
--- /dev/null
+++ b/TAO/orbsvcs/examples/Security/Send_File/Makefile.am
@@ -0,0 +1,137 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
+TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_ROOT = $(top_srcdir)
+
+## Makefile.Security_Send_File_Client.am
+
+BUILT_SOURCES = \
+  testC.cpp \
+  testC.h \
+  testC.inl \
+  testS.cpp \
+  testS.h \
+  testS.inl \
+  testS_T.cpp \
+  testS_T.h \
+  testS_T.inl
+
+CLEANFILES = \
+  test-stamp \
+  testC.cpp \
+  testC.h \
+  testC.inl \
+  testS.cpp \
+  testS.h \
+  testS.inl \
+  testS_T.cpp \
+  testS_T.h \
+  testS_T.inl
+
+testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
+
+test-stamp: $(srcdir)/test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
+	@touch $@
+
+noinst_PROGRAMS = client
+
+client_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR)
+
+client_SOURCES = \
+  client.cpp \
+  testC.cpp \
+  testS.cpp \
+  testC.h \
+  testC.inl \
+  testS.h \
+  testS_T.h \
+  testS_T.inl
+
+client_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+## Makefile.Security_Send_File_Server.am
+
+BUILT_SOURCES += \
+  testC.cpp \
+  testC.h \
+  testC.inl \
+  testS.cpp \
+  testS.h \
+  testS.inl \
+  testS_T.cpp \
+  testS_T.h \
+  testS_T.inl
+
+CLEANFILES += \
+  test-stamp \
+  testC.cpp \
+  testC.h \
+  testC.inl \
+  testS.cpp \
+  testS.h \
+  testS.inl \
+  testS_T.cpp \
+  testS_T.h \
+  testS_T.inl
+
+testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
+
+test-stamp: $(srcdir)/test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
+	@touch $@
+
+noinst_PROGRAMS += server
+
+server_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR)
+
+server_SOURCES = \
+  server.cpp \
+  testC.cpp \
+  testS.cpp \
+  test_i.cpp \
+  testC.h \
+  testC.inl \
+  testS.h \
+  testS_T.h \
+  testS_T.inl \
+  test_i.h \
+  test_i.i
+
+server_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am
index 6654b2d9b9a..a1d68006697 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Makefile.am
@@ -14,10 +14,10 @@ pkgconfigdir = @libdir@/pkgconfig
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_ROOT = $(top_srcdir)
+
 
 ## Makefile.CosNaming_IDL.am
 
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/Makefile.am b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/Makefile.am
index 2cc8407ef31..a655165d7b4 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/Makefile.am
@@ -1,4 +1,13 @@
 ##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         RPS
+
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am
index a9fed19e959..c057a10c9a7 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am
@@ -6,15 +6,15 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_ROOT = $(top_srcdir)
+
 noinst_PROGRAMS =
 
 ## Makefile.LoadBalancing_Performance_IDL.am
@@ -95,6 +95,7 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
@@ -145,6 +146,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/Makefile.am b/TAO/orbsvcs/performance-tests/LoadBalancing/Makefile.am
index 1b09ce8933a..208beaea6b2 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/Makefile.am
@@ -1,4 +1,12 @@
 ##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         LBPerf
diff --git a/TAO/orbsvcs/performance-tests/Makefile.am b/TAO/orbsvcs/performance-tests/Makefile.am
index 14a144e6940..5894891929f 100644
--- a/TAO/orbsvcs/performance-tests/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/Makefile.am
@@ -1,4 +1,12 @@
 ##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         LoadBalancing \
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am
index 9d51c5d3b54..f5d3f7f311f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -14,6 +14,7 @@ TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
 
+## Makefile.Colocated_Roundtrip.am
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
@@ -28,14 +29,13 @@ driver_CPPFLAGS = \
   -I$(TAO_BUILDDIR) \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib \
-  -I../lib
+  -I$(srcdir)/../lib
 
 driver_SOURCES = \
   driver.cpp
 
 driver_LDADD = \
-  ../lib/libTAO_RTEC_Perf.la \
+  $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
@@ -50,6 +50,7 @@ driver_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am
index a0035fc94e0..77af854fa9f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -37,7 +37,7 @@ client_SOURCES = \
   client.cpp
 
 client_LDADD = \
-  ../lib/libTAO_RTEC_Perf.la \
+  $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
@@ -52,6 +52,7 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
@@ -81,7 +82,7 @@ server_SOURCES = \
   server.cpp
 
 server_LDADD = \
-  ../lib/libTAO_RTEC_Perf.la \
+  $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
@@ -96,6 +97,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Makefile.am
index 4d656f1f335..6aae28f7b48 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Makefile.am
@@ -1,4 +1,12 @@
 ##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         lib \
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am
index 0438a543106..8bcaa120081 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -72,8 +72,7 @@ client_CPPFLAGS = \
   -I$(TAO_BUILDDIR) \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib \
-  -I../lib
+  -I$(srcdir)/../lib
 
 client_SOURCES = \
   TestC.cpp \
@@ -81,7 +80,7 @@ client_SOURCES = \
   Roundtrip.h
 
 client_LDADD = \
-  ../lib/libTAO_RTEC_Perf.la \
+  $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
@@ -96,6 +95,7 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
@@ -118,8 +118,7 @@ server_CPPFLAGS = \
   -I$(TAO_BUILDDIR) \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib \
-  -I../lib
+  -I$(srcdir)/../lib
 
 server_SOURCES = \
   Roundtrip.cpp \
@@ -129,7 +128,7 @@ server_SOURCES = \
   Roundtrip.h
 
 server_LDADD = \
-  ../lib/libTAO_RTEC_Perf.la \
+  $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
@@ -144,6 +143,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am
index 34f271c1b4e..4a193e23a1a 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -72,8 +72,7 @@ client_CPPFLAGS = \
   -I$(TAO_BUILDDIR) \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib \
-  -I../lib
+  -I$(srcdir)/../lib
 
 client_SOURCES = \
   Callback.cpp \
@@ -83,7 +82,7 @@ client_SOURCES = \
   Callback.h
 
 client_LDADD = \
-  ../lib/libTAO_RTEC_Perf.la \
+  $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
@@ -98,6 +97,7 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
@@ -120,8 +120,7 @@ server_CPPFLAGS = \
   -I$(TAO_BUILDDIR) \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib \
-  -I../lib
+  -I$(srcdir)/../lib
 
 server_SOURCES = \
   Session.cpp \
@@ -133,7 +132,7 @@ server_SOURCES = \
   Session_Factory.h
 
 server_LDADD = \
-  ../lib/libTAO_RTEC_Perf.la \
+  $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
@@ -148,6 +147,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am
index b9f6add518d..f6e7e5aae07 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -30,14 +30,13 @@ client_CPPFLAGS = \
   -I$(TAO_BUILDDIR) \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib \
-  -I../lib
+  -I$(srcdir)/../lib
 
 client_SOURCES = \
   client.cpp
 
 client_LDADD = \
-  ../lib/libTAO_RTEC_Perf.la \
+  $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
@@ -52,6 +51,7 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
@@ -74,14 +74,13 @@ server_CPPFLAGS = \
   -I$(TAO_BUILDDIR) \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib \
-  -I../lib
+  -I$(srcdir)/../lib
 
 server_SOURCES = \
   server.cpp
 
 server_LDADD = \
-  ../lib/libTAO_RTEC_Perf.la \
+  $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
@@ -96,6 +95,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am
index 0e57abf1f16..15506aebe5e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -30,14 +30,13 @@ client_CPPFLAGS = \
   -I$(TAO_BUILDDIR) \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib \
-  -I../lib
+  -I$(srcdir)/../lib
 
 client_SOURCES = \
   client.cpp
 
 client_LDADD = \
-  ../lib/libTAO_RTEC_Perf.la \
+  $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
@@ -52,6 +51,7 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
@@ -74,14 +74,13 @@ server_CPPFLAGS = \
   -I$(TAO_BUILDDIR) \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../lib \
-  -I../lib
+  -I$(srcdir)/../lib
 
 server_SOURCES = \
   server.cpp
 
 server_LDADD = \
-  ../lib/libTAO_RTEC_Perf.la \
+  $(TAO_BUILDDIR)/orbsvcs/performance-tests/RTEvent/lib/libTAO_RTEC_Perf.la \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTCORBAEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
@@ -96,6 +95,7 @@ server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am
index fdc85899f18..032ea68796c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am
@@ -6,16 +6,17 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_ROOT = $(top_srcdir)
+
 
+## Makefile.RTEC_Perf.am
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am
index 8bf1b60334e..e82e1a6dfb1 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am
index aedbee83095..dc231d1e091 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am
index 1ccbdb0d158..6fd64befbb9 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am
index b2a49c5be6f..b3189a2db61 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am
index 13acdafc5f5..aaafa1ae1f0 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/AVStreams/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Makefile.am
index e6bc25858b0..aec144e3e5e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Asynch_Three_Stage \
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am
index 5c8784748f7..5c76b7a2a63 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am
index e025da06b15..530a667e965 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am
index ce0e908934c..2f937ebaf28 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am
index bb8aa7a8ad9..2a113649e1d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am
index 676cfc94657..fe79de1bd83 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am
index 74ec6847a33..177bb2529c8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am
index 96346ff3441..81b5d08cd5c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am
index 325e5280f52..9ff7081788e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am
index b2448e687b8..9991f5eec28 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am b/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am
index cdb0859a78d..c83ebf0accb 100644
--- a/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am
+++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/Makefile.am
@@ -6,15 +6,16 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_ROOT = $(top_srcdir)
+
+## Makefile.BiDirCORBALOC_Server.am
 
 BUILT_SOURCES = \
   TimeModuleC.cpp \
diff --git a/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am
index fcc3bf38bc1..85443a6b15b 100644
--- a/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.am
@@ -6,13 +6,14 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
+## Makefile.Bug_1334_client.am
 
 noinst_PROGRAMS = client
 
diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.am
index a4f24e436e7..f3e6efbe608 100644
--- a/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_1393_Regression/Makefile.am
@@ -6,13 +6,14 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
+## Makefile.Bug_1393_Regression_Client.am
 
 noinst_PROGRAMS = client
 
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am
index 940bc26ff64..8f7c06ae4df 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am
@@ -6,15 +6,14 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_ROOT = $(top_srcdir)
 
 ## Makefile.Bug_1395_Regression_IDL.am
 
diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am
index 1a367a1057d..93b6484e6ed 100644
--- a/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -14,6 +14,7 @@ TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
 
+## Makefile.Bug_1630_testclient.am
 
 if !BUILD_MINIMUM_CORBA
 
diff --git a/TAO/orbsvcs/tests/Concurrency/Makefile.am b/TAO/orbsvcs/tests/Concurrency/Makefile.am
index d4c356aff60..76eaee8c0fc 100644
--- a/TAO/orbsvcs/tests/Concurrency/Makefile.am
+++ b/TAO/orbsvcs/tests/Concurrency/Makefile.am
@@ -6,13 +6,14 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
+## Makefile.CC_client.am
 
 noinst_PROGRAMS = CC_client
 
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am
index 1ff66ea3452..645efe41c5f 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -38,7 +38,7 @@ Disconnect_SOURCES = \
   Random.h
 
 Disconnect_LDADD = \
-  ../lib/libCECTests.la \
+  $(top_builddir)/orbsvcs/tests/CosEvent/lib/libCECTests.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
@@ -81,7 +81,7 @@ MT_Disconnect_SOURCES = \
   MT_Disconnect.h
 
 MT_Disconnect_LDADD = \
-  ../lib/libCECTests.la \
+  $(top_builddir)/orbsvcs/tests/CosEvent/lib/libCECTests.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
@@ -125,7 +125,7 @@ Pull_Push_Event_SOURCES = \
   Random.h
 
 Pull_Push_Event_LDADD = \
-  ../lib/libCECTests.la \
+  $(top_builddir)/orbsvcs/tests/CosEvent/lib/libCECTests.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
@@ -169,7 +169,7 @@ Push_Event_SOURCES = \
   Random.h
 
 Push_Event_LDADD = \
-  ../lib/libCECTests.la \
+  $(top_builddir)/orbsvcs/tests/CosEvent/lib/libCECTests.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
@@ -212,7 +212,7 @@ Random_SOURCES = \
   Random.h
 
 Random_LDADD = \
-  ../lib/libCECTests.la \
+  $(top_builddir)/orbsvcs/tests/CosEvent/lib/libCECTests.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
@@ -256,7 +256,7 @@ Shutdown_SOURCES = \
   Random.h
 
 Shutdown_LDADD = \
-  ../lib/libCECTests.la \
+  $(top_builddir)/orbsvcs/tests/CosEvent/lib/libCECTests.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Serv.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
diff --git a/TAO/orbsvcs/tests/CosEvent/Makefile.am b/TAO/orbsvcs/tests/CosEvent/Makefile.am
index 9ed656cf82c..23c08080066 100644
--- a/TAO/orbsvcs/tests/CosEvent/Makefile.am
+++ b/TAO/orbsvcs/tests/CosEvent/Makefile.am
@@ -1,4 +1,12 @@
 ##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         lib \
diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am b/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am
index e93b44d2338..140039c09b1 100644
--- a/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am
+++ b/TAO/orbsvcs/tests/CosEvent/lib/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -14,6 +14,7 @@ TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
 
+## Makefile.CosEvent_Test_Lib.am
 
 if !BUILD_MINIMUM_CORBA
 
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am
index 3a1fcd6080f..04c290e9c0a 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -16,14 +16,12 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
-CLEANFILES =
-BUILT_SOURCES =
 
-## Makefile.ECM_Consumer.am
+## Makefile.EC_Custom_Marshal_IDL.am
 
 if BUILD_CORBA_MESSAGING
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   dataC.cpp \
   dataC.h \
   dataC.inl \
@@ -34,7 +32,7 @@ BUILT_SOURCES += \
   dataS_T.h \
   dataS_T.inl
 
-CLEANFILES += \
+CLEANFILES = \
   data-stamp \
   dataC.cpp \
   dataC.h \
@@ -52,6 +50,13 @@ data-stamp: $(srcdir)/data.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/data.idl
 	@touch $@
 
+
+endif BUILD_CORBA_MESSAGING
+
+## Makefile.ECM_Consumer.am
+
+if BUILD_CORBA_MESSAGING
+
 noinst_PROGRAMS += ECM_Consumer
 
 ECM_Consumer_CPPFLAGS = \
@@ -66,14 +71,8 @@ ECM_Consumer_SOURCES = \
   ECM_Consumer.cpp \
   ECM_Data.cpp \
   dataC.cpp \
-  dataS.cpp \
   ECM_Consumer.h \
-  ECM_Data.h \
-  dataC.h \
-  dataC.inl \
-  dataS.h \
-  dataS_T.h \
-  dataS_T.inl
+  ECM_Data.h
 
 ECM_Consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
@@ -97,35 +96,6 @@ endif BUILD_CORBA_MESSAGING
 
 if BUILD_CORBA_MESSAGING
 
-BUILT_SOURCES += \
-  dataC.cpp \
-  dataC.h \
-  dataC.inl \
-  dataS.cpp \
-  dataS.h \
-  dataS.inl \
-  dataS_T.cpp \
-  dataS_T.h \
-  dataS_T.inl
-
-CLEANFILES += \
-  data-stamp \
-  dataC.cpp \
-  dataC.h \
-  dataC.inl \
-  dataS.cpp \
-  dataS.h \
-  dataS.inl \
-  dataS_T.cpp \
-  dataS_T.h \
-  dataS_T.inl
-
-dataC.cpp dataC.h dataC.inl dataS.cpp dataS.h dataS.inl dataS_T.cpp dataS_T.h dataS_T.inl: data-stamp
-
-data-stamp: $(srcdir)/data.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/data.idl
-	@touch $@
-
 noinst_PROGRAMS += ECM_Supplier
 
 ECM_Supplier_CPPFLAGS = \
@@ -142,12 +112,7 @@ ECM_Supplier_SOURCES = \
   dataC.cpp \
   dataS.cpp \
   ECM_Data.h \
-  ECM_Supplier.h \
-  dataC.h \
-  dataC.inl \
-  dataS.h \
-  dataS_T.h \
-  dataS_T.inl
+  ECM_Supplier.h
 
 ECM_Supplier_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am b/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am
index c9a97a6514a..0a53aee46bb 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -14,6 +14,7 @@ TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
 
+## Makefile.EC_MT_Mcast.am
 
 if BUILD_CORBA_MESSAGING
 
diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile.am b/TAO/orbsvcs/tests/EC_Mcast/Makefile.am
index 8d81ac71db0..c32227f6770 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/Makefile.am
+++ b/TAO/orbsvcs/tests/EC_Mcast/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -14,6 +14,7 @@ TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
 
+## Makefile.EC_Mcast.am
 
 if BUILD_CORBA_MESSAGING
 
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile.am b/TAO/orbsvcs/tests/EC_Multiple/Makefile.am
index 2a7aaae7cee..ad74286d635 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Makefile.am
+++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -14,6 +14,7 @@ TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
 
+## Makefile.EC_Multiple.am
 
 if BUILD_CORBA_MESSAGING
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile.am b/TAO/orbsvcs/tests/EC_Throughput/Makefile.am
index 921204ca91f..6b0948a4864 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/Makefile.am
+++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile.am b/TAO/orbsvcs/tests/Event/Basic/Makefile.am
index 45e396da80a..0bfc80aa48a 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Basic/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -35,7 +35,7 @@ Atomic_Reconnect_SOURCES = \
   Atomic_Reconnect.h
 
 Atomic_Reconnect_LDADD = \
-  ../lib/libECTests.la \
+  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
@@ -73,7 +73,7 @@ BCast_SOURCES = \
   BCast.h
 
 BCast_LDADD = \
-  ../lib/libECTests.la \
+  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
@@ -119,7 +119,7 @@ Bitmask_SOURCES = \
   Shutdown.h
 
 Bitmask_LDADD = \
-  ../lib/libECTests.la \
+  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
@@ -165,7 +165,7 @@ Complex_SOURCES = \
   Shutdown.h
 
 Complex_LDADD = \
-  ../lib/libECTests.la \
+  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
@@ -203,7 +203,7 @@ Control_SOURCES = \
   Control.h
 
 Control_LDADD = \
-  ../lib/libECTests.la \
+  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
@@ -249,7 +249,7 @@ Disconnect_SOURCES = \
   Shutdown.h
 
 Disconnect_LDADD = \
-  ../lib/libECTests.la \
+  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
@@ -295,7 +295,7 @@ Gateway_SOURCES = \
   Shutdown.h
 
 Gateway_LDADD = \
-  ../lib/libECTests.la \
+  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
@@ -333,7 +333,7 @@ MT_Disconnect_SOURCES = \
   MT_Disconnect.h
 
 MT_Disconnect_LDADD = \
-  ../lib/libECTests.la \
+  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
@@ -379,7 +379,7 @@ Negation_SOURCES = \
   Shutdown.h
 
 Negation_LDADD = \
-  ../lib/libECTests.la \
+  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
@@ -417,7 +417,7 @@ Observer_SOURCES = \
   Observer.h
 
 Observer_LDADD = \
-  ../lib/libECTests.la \
+  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
@@ -455,7 +455,7 @@ Random_SOURCES = \
   Random.h
 
 Random_LDADD = \
-  ../lib/libECTests.la \
+  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
@@ -493,7 +493,7 @@ Reconnect_SOURCES = \
   Reconnect.h
 
 Reconnect_LDADD = \
-  ../lib/libECTests.la \
+  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
@@ -531,7 +531,7 @@ Shutdown_SOURCES = \
   Shutdown.h
 
 Shutdown_LDADD = \
-  ../lib/libECTests.la \
+  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
@@ -577,7 +577,7 @@ Timeout_SOURCES = \
   Shutdown.h
 
 Timeout_LDADD = \
-  ../lib/libECTests.la \
+  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
@@ -623,7 +623,7 @@ Wildcard_SOURCES = \
   Shutdown.h
 
 Wildcard_LDADD = \
-  ../lib/libECTests.la \
+  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
diff --git a/TAO/orbsvcs/tests/Event/Makefile.am b/TAO/orbsvcs/tests/Event/Makefile.am
index 55abb8e0d7d..cc11c3318df 100644
--- a/TAO/orbsvcs/tests/Event/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Makefile.am
@@ -1,4 +1,12 @@
 ##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Mcast \
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am
index 49be4261ae9..371db182d37 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -14,6 +14,7 @@ TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
 
+## Makefile.ECMcastTests_lib.am
 
 if BUILD_CORBA_MESSAGING
 
@@ -33,6 +34,7 @@ libECMcastTests_la_SOURCES = \
   Gateway_EC.cpp
 
 noinst_HEADERS = \
+  ECMcastTests_export.h \
   EC_Wrapper.h \
   Gateway_EC.h
 
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am
index ec6674ee779..4056db11b5f 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -35,7 +35,7 @@ consumer_SOURCES = \
   Constants.h
 
 consumer_LDADD = \
-  ../Common/libECMcastTests.la \
+  $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
@@ -72,7 +72,7 @@ gateway_ec_SOURCES = \
   Constants.h
 
 gateway_ec_LDADD = \
-  ../Common/libECMcastTests.la \
+  $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
@@ -109,7 +109,7 @@ supplier_SOURCES = \
   Constants.h
 
 supplier_LDADD = \
-  ../Common/libECMcastTests.la \
+  $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Makefile.am
index a25e5b6db1c..86f91b490ee 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Mcast/Makefile.am
@@ -1,7 +1,16 @@
 ##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         Common \
         Complex \
         Simple \
         Two_Way
+
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am
index 0a14f5133d7..80709140dcb 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -35,7 +35,7 @@ consumer_SOURCES = \
   Constants.h
 
 consumer_LDADD = \
-  ../Common/libECMcastTests.la \
+  $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
@@ -72,7 +72,7 @@ gateway_ec_SOURCES = \
   Constants.h
 
 gateway_ec_LDADD = \
-  ../Common/libECMcastTests.la \
+  $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
@@ -109,7 +109,7 @@ supplier_SOURCES = \
   Constants.h
 
 supplier_LDADD = \
-  ../Common/libECMcastTests.la \
+  $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am
index 732fc34a51b..9ed902fb367 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -35,7 +35,7 @@ application_SOURCES = \
   Constants.h
 
 application_LDADD = \
-  ../Common/libECMcastTests.la \
+  $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
@@ -72,7 +72,7 @@ gateway_ec_SOURCES = \
   Constants.h
 
 gateway_ec_LDADD = \
-  ../Common/libECMcastTests.la \
+  $(top_builddir)/orbsvcs/tests/Event/Mcast/Common/libECMcastTests.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile.am b/TAO/orbsvcs/tests/Event/Performance/Makefile.am
index 7b3fb1e7370..22889225457 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Performance/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -35,7 +35,7 @@ Connect_SOURCES = \
   Connect.h
 
 Connect_LDADD = \
-  ../lib/libECTests.la \
+  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
@@ -73,7 +73,7 @@ Inversion_SOURCES = \
   Inversion.h
 
 Inversion_LDADD = \
-  ../lib/libECTests.la \
+  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
@@ -112,7 +112,7 @@ Latency_SOURCES = \
 
 Latency_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  ../lib/libECTests.la \
+  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
@@ -154,7 +154,7 @@ Latency_Server_SOURCES = \
 
 Latency_Server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
-  ../lib/libECTests.la \
+  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
@@ -192,7 +192,7 @@ Throughput_SOURCES = \
   Throughput.h
 
 Throughput_LDADD = \
-  ../lib/libECTests.la \
+  $(top_builddir)/orbsvcs/tests/Event/lib/libECTests.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
diff --git a/TAO/orbsvcs/tests/Event/lib/Makefile.am b/TAO/orbsvcs/tests/Event/lib/Makefile.am
index 66b6435046c..267242ae0ba 100644
--- a/TAO/orbsvcs/tests/Event/lib/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/lib/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -14,6 +14,7 @@ TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
 
+## Makefile.Event_Test_Lib.am
 
 if BUILD_CORBA_MESSAGING
 
diff --git a/TAO/orbsvcs/tests/FT_App/Makefile.am b/TAO/orbsvcs/tests/FT_App/Makefile.am
index 398f882bc04..bcac5e28358 100644
--- a/TAO/orbsvcs/tests/FT_App/Makefile.am
+++ b/TAO/orbsvcs/tests/FT_App/Makefile.am
@@ -1,19 +1,32 @@
 ##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
-ACE_ROOT = $(top_srcdir)/..
 ACE_BUILDDIR = $(top_builddir)/..
-TAO_ROOT = $(top_srcdir)
+ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
-
 TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_ROOT = $(top_srcdir)
+
+noinst_PROGRAMS =
+CLEANFILES =
+BUILT_SOURCES =
 
-## Makefile.FT_App_Analyzer.am 
+## Makefile.FT_App_Analyzer.am
 
 if BUILD_ACE_UUID
+if BUILD_CORBA_MESSAGING
+if BUILD_INTERCEPTORS
 if !BUILD_MINIMUM_CORBA
 
-noinst_PROGRAMS = ft_analyzer
+noinst_PROGRAMS += ft_analyzer
 
 ft_analyzer_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -36,55 +49,61 @@ ft_analyzer_SOURCES = \
 ft_analyzer_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_INTERCEPTORS
+endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
-## Makefile.FT_App_Server.am 
+## Makefile.FT_App_Server.am
 
 if BUILD_ACE_UUID
+if BUILD_CORBA_MESSAGING
+if BUILD_INTERCEPTORS
 if !BUILD_MINIMUM_CORBA
 
-BUILT_SOURCES = \
-  FT_TestReplicaS_T.cpp \
-  FT_TestReplicaC.inl \
-  FT_TestReplicaS.inl \
-  FT_TestReplicaS_T.inl \
+BUILT_SOURCES += \
   FT_TestReplicaC.cpp \
-  FT_TestReplicaS.cpp \
   FT_TestReplicaC.h \
-  FT_TestReplicaS.h \
-  FT_TestReplicaS_T.h
-
-CLEANFILES = \
-  FT_TestReplicaS_T.cpp \
   FT_TestReplicaC.inl \
+  FT_TestReplicaS.cpp \
+  FT_TestReplicaS.h \
   FT_TestReplicaS.inl \
-  FT_TestReplicaS_T.inl \
+  FT_TestReplicaS_T.cpp \
+  FT_TestReplicaS_T.h \
+  FT_TestReplicaS_T.inl
+
+CLEANFILES += \
+  FT_TestReplica-stamp \
   FT_TestReplicaC.cpp \
-  FT_TestReplicaS.cpp \
   FT_TestReplicaC.h \
+  FT_TestReplicaC.inl \
+  FT_TestReplicaS.cpp \
   FT_TestReplicaS.h \
+  FT_TestReplicaS.inl \
+  FT_TestReplicaS_T.cpp \
   FT_TestReplicaS_T.h \
-  FT_TestReplica-stamp
+  FT_TestReplicaS_T.inl
 
-FT_TestReplicaS_T.cpp FT_TestReplicaC.inl FT_TestReplicaS.inl FT_TestReplicaS_T.inl FT_TestReplicaC.cpp FT_TestReplicaS.cpp FT_TestReplicaC.h FT_TestReplicaS.h FT_TestReplicaS_T.h: FT_TestReplica-stamp
+FT_TestReplicaC.cpp FT_TestReplicaC.h FT_TestReplicaC.inl FT_TestReplicaS.cpp FT_TestReplicaS.h FT_TestReplicaS.inl FT_TestReplicaS_T.cpp FT_TestReplicaS_T.h FT_TestReplicaS_T.inl: FT_TestReplica-stamp
 
 FT_TestReplica-stamp: $(srcdir)/FT_TestReplica.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/FT_TestReplica.idl
@@ -109,37 +128,73 @@ ft_replica_SOURCES = \
   FT_TestReplica_i.cpp \
   FT_ReplicaFactory_i.h \
   FT_TestReplicaC.h \
+  FT_TestReplicaC.inl \
   FT_TestReplicaS.h \
   FT_TestReplicaS_T.h \
-  FT_TestReplica_i.h \
-  FT_TestReplicaC.inl \
-  FT_TestReplicaS.inl \
-  FT_TestReplicaS_T.inl
+  FT_TestReplicaS_T.inl \
+  FT_TestReplica_i.h
 
 ft_replica_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_INTERCEPTORS
+endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
-## Makefile.FT_App_Client.am 
+## Makefile.FT_App_Client.am
 
 if BUILD_ACE_UUID
+if BUILD_CORBA_MESSAGING
+if BUILD_INTERCEPTORS
 if !BUILD_MINIMUM_CORBA
 
+BUILT_SOURCES += \
+  FT_TestReplicaC.cpp \
+  FT_TestReplicaC.h \
+  FT_TestReplicaC.inl \
+  FT_TestReplicaS.cpp \
+  FT_TestReplicaS.h \
+  FT_TestReplicaS.inl \
+  FT_TestReplicaS_T.cpp \
+  FT_TestReplicaS_T.h \
+  FT_TestReplicaS_T.inl
+
+CLEANFILES += \
+  FT_TestReplica-stamp \
+  FT_TestReplicaC.cpp \
+  FT_TestReplicaC.h \
+  FT_TestReplicaC.inl \
+  FT_TestReplicaS.cpp \
+  FT_TestReplicaS.h \
+  FT_TestReplicaS.inl \
+  FT_TestReplicaS_T.cpp \
+  FT_TestReplicaS_T.h \
+  FT_TestReplicaS_T.inl
+
+FT_TestReplicaC.cpp FT_TestReplicaC.h FT_TestReplicaC.inl FT_TestReplicaS.cpp FT_TestReplicaS.h FT_TestReplicaS.inl FT_TestReplicaS_T.cpp FT_TestReplicaS_T.h FT_TestReplicaS_T.inl: FT_TestReplica-stamp
+
+FT_TestReplica-stamp: $(srcdir)/FT_TestReplica.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/FT_TestReplica.idl
+	@touch $@
+
 noinst_PROGRAMS += ft_client
 
 ft_client_CPPFLAGS = \
@@ -156,34 +211,41 @@ ft_client_SOURCES = \
   FT_TestReplicaC.cpp \
   FT_TestReplicaS.cpp \
   FT_TestReplicaC.h \
+  FT_TestReplicaC.inl \
   FT_TestReplicaS.h \
   FT_TestReplicaS_T.h \
-  FT_TestReplicaC.inl \
-  FT_TestReplicaS.inl \
   FT_TestReplicaS_T.inl
 
 ft_client_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_INTERCEPTORS
+endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
-## Makefile.FT_App_Creator.am 
+## Makefile.FT_App_Creator.am
 
 if BUILD_ACE_UUID
+if BUILD_CORBA_MESSAGING
+if BUILD_INTERCEPTORS
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += ft_create
@@ -206,25 +268,33 @@ ft_create_SOURCES = \
 ft_create_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_INTERCEPTORS
+endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
-## Makefile.FT_App_FactoryRegistry.am 
+## Makefile.FT_App_FactoryRegistry.am
 
 if BUILD_ACE_UUID
+if BUILD_CORBA_MESSAGING
+if BUILD_INTERCEPTORS
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += ft_registry
@@ -244,25 +314,33 @@ ft_registry_SOURCES = \
 ft_registry_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_INTERCEPTORS
+endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
-## Makefile.FT_App_FaultConsumer.am 
+## Makefile.FT_App_FaultConsumer.am
 
 if BUILD_ACE_UUID
+if BUILD_CORBA_MESSAGING
+if BUILD_INTERCEPTORS
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += ft_fault_consumer
@@ -285,29 +363,35 @@ ft_fault_consumer_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/FT_ReplicationManager/libTAO_ReplicationManagerLib.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_INTERCEPTORS
+endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
-## Makefile.FT_App_Notifier.am 
+## Makefile.FT_App_Notifier.am
 
 if BUILD_ACE_UUID
+if BUILD_CORBA_MESSAGING
+if BUILD_INTERCEPTORS
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += ft_notifier
@@ -329,25 +413,33 @@ ft_notifier_SOURCES = \
 ft_notifier_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_INTERCEPTORS
+endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
-## Makefile.FT_App_RMController.am 
+## Makefile.FT_App_RMController.am
 
 if BUILD_ACE_UUID
+if BUILD_CORBA_MESSAGING
+if BUILD_INTERCEPTORS
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += replmgr_controller
@@ -376,24 +468,32 @@ replmgr_controller_SOURCES = \
 replmgr_controller_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_INTERCEPTORS
+endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
 ## Clean up template repositories, etc.
 clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
 	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am
index f3d1847263b..7810dce124f 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am
@@ -1,47 +1,59 @@
 ##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
-ACE_ROOT = $(top_srcdir)/..
 ACE_BUILDDIR = $(top_builddir)/..
-TAO_ROOT = $(top_srcdir)
+ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
-
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(top_builddir)/TAO_IDL/tao_idl
+TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_ROOT = $(top_srcdir)
+
+noinst_PROGRAMS =
+CLEANFILES =
+BUILT_SOURCES =
 
-## Makefile.GroupRef_Manipulation_Client.am 
+## Makefile.GroupRef_Manipulation_Client.am
 
 if BUILD_ACE_UUID
+if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
 if !BUILD_MINIMUM_CORBA
 
-BUILT_SOURCES = \
-  testS_T.cpp \
-  testC.inl \
-  testS.inl \
-  testS_T.inl \
+BUILT_SOURCES += \
   testC.cpp \
   testC.h \
-  testS.h \
-  testS_T.h
-
-CLEANFILES = \
-  testS_T.cpp \
   testC.inl \
+  testS.h \
   testS.inl \
-  testS_T.inl \
+  testS_T.cpp \
+  testS_T.h \
+  testS_T.inl
+
+CLEANFILES += \
+  test-stamp \
   testC.cpp \
   testC.h \
+  testC.inl \
   testS.h \
+  testS.inl \
+  testS_T.cpp \
   testS_T.h \
-  test-stamp
+  testS_T.inl
 
-testS_T.cpp testC.inl testS.inl testS_T.inl testC.cpp testC.h testS.h testS_T.h: test-stamp
+testC.cpp testC.h testC.inl testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
 
 test-stamp: $(srcdir)/test.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -DCORBA3 -I$(TAO_ROOT) $(srcdir)/test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -DCORBA3 $(srcdir)/test.idl
 	@touch $@
 
-noinst_PROGRAMS = client
+noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -55,32 +67,69 @@ client_SOURCES = \
   client.cpp \
   testC.cpp \
   testC.h \
-  testS_T.h \
   testC.inl \
+  testS.h \
+  testS_T.h \
   testS_T.inl
 
 client_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
 endif BUILD_INTERCEPTORS
+endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
-## Makefile.GroupRef_Manipulation_Server.am 
+## Makefile.GroupRef_Manipulation_Server.am
 
 if BUILD_ACE_UUID
+if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
 if !BUILD_MINIMUM_CORBA
 
+BUILT_SOURCES += \
+  testC.cpp \
+  testC.h \
+  testC.inl \
+  testS.cpp \
+  testS.h \
+  testS.inl \
+  testS_T.cpp \
+  testS_T.h \
+  testS_T.inl
+
+CLEANFILES += \
+  test-stamp \
+  testC.cpp \
+  testC.h \
+  testC.inl \
+  testS.cpp \
+  testS.h \
+  testS.inl \
+  testS_T.cpp \
+  testS_T.h \
+  testS_T.inl
+
+testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
+
+test-stamp: $(srcdir)/test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -DCORBA3 $(srcdir)/test.idl
+	@touch $@
+
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -101,32 +150,38 @@ server_SOURCES = \
   Server_ORBInitializer.h \
   Server_Request_Interceptor.h \
   testC.h \
+  testC.inl \
   testS.h \
   testS_T.h \
-  test_i.h \
-  testC.inl \
-  testS.inl \
-  testS_T.inl
+  testS_T.inl \
+  test_i.h
 
 server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
 endif BUILD_INTERCEPTORS
+endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
 ## Clean up template repositories, etc.
 clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
 	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am
index 3070cdc2167..a1e396d05c7 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am
@@ -1,46 +1,59 @@
 ##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
-ACE_ROOT = $(top_srcdir)/..
 ACE_BUILDDIR = $(top_builddir)/..
-TAO_ROOT = $(top_srcdir)
+ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
-
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(top_builddir)/TAO_IDL/tao_idl
+TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
+TAO_ROOT = $(top_srcdir)
+
+noinst_PROGRAMS =
+CLEANFILES =
+BUILT_SOURCES =
 
-## Makefile.FaultTolerance_IOGR_Manager.am 
+## Makefile.FaultTolerance_IOGR_Manager.am
 
 if BUILD_ACE_UUID
+if BUILD_CORBA_MESSAGING
+if BUILD_INTERCEPTORS
 if !BUILD_MINIMUM_CORBA
 
-BUILT_SOURCES = \
-  testS_T.cpp \
-  testC.inl \
-  testS.inl \
-  testS_T.inl \
+BUILT_SOURCES += \
   testC.cpp \
   testC.h \
-  testS.h \
-  testS_T.h
-
-CLEANFILES = \
-  testS_T.cpp \
   testC.inl \
+  testS.h \
   testS.inl \
-  testS_T.inl \
+  testS_T.cpp \
+  testS_T.h \
+  testS_T.inl
+
+CLEANFILES += \
+  test-stamp \
   testC.cpp \
   testC.h \
+  testC.inl \
   testS.h \
+  testS.inl \
+  testS_T.cpp \
   testS_T.h \
-  test-stamp
+  testS_T.inl
 
-testS_T.cpp testC.inl testS.inl testS_T.inl testC.cpp testC.h testS.h testS_T.h: test-stamp
+testC.cpp testC.h testC.inl testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
 
 test-stamp: $(srcdir)/test.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/test.idl
 	@touch $@
 
-noinst_PROGRAMS = Manager
+noinst_PROGRAMS += Manager
 
 Manager_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -55,30 +68,69 @@ Manager_SOURCES = \
   testC.cpp \
   Manager.h \
   testC.h \
-  testS_T.h \
   testC.inl \
+  testS.h \
+  testS_T.h \
   testS_T.inl
 
 Manager_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_INTERCEPTORS
+endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
-## Makefile.FaultTolerance_IOGR_Server.am 
+## Makefile.FaultTolerance_IOGR_Server.am
 
 if BUILD_ACE_UUID
+if BUILD_CORBA_MESSAGING
+if BUILD_INTERCEPTORS
 if !BUILD_MINIMUM_CORBA
 
+BUILT_SOURCES += \
+  testC.cpp \
+  testC.h \
+  testC.inl \
+  testS.cpp \
+  testS.h \
+  testS.inl \
+  testS_T.cpp \
+  testS_T.h \
+  testS_T.inl
+
+CLEANFILES += \
+  test-stamp \
+  testC.cpp \
+  testC.h \
+  testC.inl \
+  testS.cpp \
+  testS.h \
+  testS.inl \
+  testS_T.cpp \
+  testS_T.h \
+  testS_T.inl
+
+testC.cpp testC.h testC.inl testS.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
+
+test-stamp: $(srcdir)/test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/test.idl
+	@touch $@
+
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -95,31 +147,38 @@ server_SOURCES = \
   testS.cpp \
   test_i.cpp \
   testC.h \
+  testC.inl \
   testS.h \
   testS_T.h \
-  test_i.h \
-  testC.inl \
-  testS.inl \
-  testS_T.inl
+  testS_T.inl \
+  test_i.h
 
 server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_INTERCEPTORS
+endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
 ## Clean up template repositories, etc.
 clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
 	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am
index f0852efee56..bc20626bce5 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am
@@ -1,13 +1,24 @@
 ##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
-ACE_ROOT = $(top_srcdir)/..
 ACE_BUILDDIR = $(top_builddir)/..
-TAO_ROOT = $(top_srcdir)
+ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
+
 
-## Makefile.IOGRTest.am 
+## Makefile.IOGRTest.am
 
 if BUILD_ACE_UUID
+if BUILD_CORBA_MESSAGING
+if BUILD_INTERCEPTORS
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = IOGRTest
@@ -24,23 +35,31 @@ IOGRTest_SOURCES = \
   IOGRTest.cpp
 
 IOGRTest_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
+endif BUILD_INTERCEPTORS
+endif BUILD_CORBA_MESSAGING
 endif BUILD_ACE_UUID
 
 ## Clean up template repositories, etc.
 clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -f gcctemp.c gcctemp so_locations
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
 	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/tests/FaultTolerance/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/Makefile.am
index c795a8c0d13..fb53dddc289 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/Makefile.am
+++ b/TAO/orbsvcs/tests/FaultTolerance/Makefile.am
@@ -1,4 +1,12 @@
 ##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         GroupRef_Manipulation \
diff --git a/TAO/orbsvcs/tests/FtRtEvent/Makefile.am b/TAO/orbsvcs/tests/FtRtEvent/Makefile.am
index 378a9adc56c..3aff623247d 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/Makefile.am
+++ b/TAO/orbsvcs/tests/FtRtEvent/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -40,6 +40,7 @@ consumer_SOURCES = \
 consumer_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTRT_ClientORB.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FtRtEvent.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
@@ -48,10 +49,13 @@ consumer_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
@@ -85,6 +89,7 @@ supplier_SOURCES = \
 supplier_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTRT_ClientORB.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FtRtEvent.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
@@ -93,10 +98,13 @@ supplier_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc b/TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc
index d14b6e2b0f6..981b180e88a 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/HTIOP_BiDirectional.mpc
@@ -2,28 +2,34 @@
 //
 // $Id$
 
-project(*Server): taoexe, portableserver, bidir_giop {
+project(*idl): taoidldefaults {
   IDL_Files {
     test.idl
   }
 
+  custom_only = 1
+}
+
+project(*Server): taoexe, portableserver, bidir_giop {
+  after += *idl
   Source_Files {
     testC.cpp
     testS.cpp
     test_i.cpp
     server.cpp
   }
-}
-
-project(*Client): taoexe, portableserver, minimum_corba, bidir_giop {
   IDL_Files {
-    test.idl
   }
+}
 
+project(*Client): taoexe, portableserver, minimum_corba, bidir_giop {
+  after += *idl
   Source_Files {
     testC.cpp
     testS.cpp
     test_i.cpp
     client.cpp
   }
+  IDL_Files {
+  }
 }
diff --git a/TAO/orbsvcs/tests/Makefile.am b/TAO/orbsvcs/tests/Makefile.am
index 130539cddb0..ba2c76361cb 100644
--- a/TAO/orbsvcs/tests/Makefile.am
+++ b/TAO/orbsvcs/tests/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         AVStreams \
@@ -15,6 +15,7 @@ SUBDIRS = \
         Bug_1393_Regression \
         Bug_1395_Regression \
         Bug_1630_Regression \
+        Bug_2137_Regression \
         Concurrency \
         CosEvent \
         EC_Custom_Marshal \
@@ -25,26 +26,24 @@ SUBDIRS = \
         Event \
         FT_App \
         FaultTolerance \
-        FtRtEvent
-
-#        HTIOP \
-#        IOR_MCast \
-#        ImplRepo \
-#        InterfaceRepo \
-#        Interoperable_Naming \
-#        LoadBalancing \
-#        Log \
-#        Miop \
-#        Notify \
-#        Property \
-#        RTCosScheduling \
-#        Redundant_Naming \
-#        Sched \
-#        Sched_Conf \
-#        Security \
-#        Simple_Naming \
-#        Time \
-#        Trading \
-#        ior_corbaname \
-#        tests_svc_loader
+        FtRtEvent \
+        HTIOP \
+        IOR_MCast \
+        ImplRepo \
+        InterfaceRepo \
+        Interoperable_Naming \
+        LoadBalancing \
+        Log \
+        Miop \
+        Notify \
+        Property \
+        Redundant_Naming \
+        Sched \
+        Sched_Conf \
+        Security \
+        Simple_Naming \
+        Time \
+        Trading \
+        ior_corbaname \
+        tests_svc_loader
 
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc b/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc
index 0aa66ee8f36..db65b9d4bf6 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc
@@ -1,22 +1,36 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl): taoidldefaults {
+  IDL_Files {
+    go.idl
+  }
+  custom_only = 1
+}
+
 project(*Ntf Struct Supp): notifytest {
   exename = Structured_Supplier
 
+  after += *idl
   Source_Files {
     Structured_Supplier.cpp
+    goS.cpp
+    goC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*Ntf Struct Cons): notifytest {
   exename = Structured_Consumer
 
+  after += *idl
   Source_Files {
     goC.cpp
     common.cpp
     Notify_Structured_Push_Consumer.cpp
     Structured_Consumer.cpp
   }
+  IDL_Files {
+  }
 }
-
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc b/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc
index e9bfd75204b..d2d18f86ace 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc
@@ -1,41 +1,64 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl): taoidldefaults {
+  IDL_Files {
+    go.idl
+  }
+  custom_only = 1
+}
+
 project(*Ntf Struct Supp): notifytest {
   exename = Structured_Supplier
 
+  after += *idl
   Source_Files {
     Structured_Supplier.cpp
+    goS.cpp
+    goC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*Ntf Struct Cons): notifytest {
   exename = Structured_Consumer
 
+  after += *idl
   Source_Files {
     goC.cpp
     common.cpp
     Notify_Structured_Push_Consumer.cpp
     Structured_Consumer.cpp
   }
+  IDL_Files {
+  }
 }
 
 project(*Ntf Seq Supp): notifytest {
   exename = Sequence_Supplier
 
+  after += *idl
   Source_Files {
     Sequence_Supplier.cpp
+    goS.cpp
+    goC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*Ntf Seq Cons): notifytest {
   exename = Sequence_Consumer
 
+  after += *idl
   Source_Files {
     goC.cpp
     common.cpp
     Notify_Sequence_Push_Consumer.cpp
     Sequence_Consumer.cpp
   }
+  IDL_Files {
+  }
 }
 
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc b/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc
index 5fb5737f5c8..7a7aa3a1a27 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc
@@ -1,21 +1,35 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl): taoidldefaults {
+  IDL_Files {
+    go.idl
+  }
+  custom_only = 1
+}
+
 project(*Ntf Struct Supp): notifytest {
   exename = Structured_Supplier
 
+  after += *idl
   Source_Files {
     Structured_Supplier.cpp
+    goS.cpp
+    goC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*Ntf Struct Cons): notifytest {
   exename = Structured_Consumer
 
+  after += *idl
   Source_Files {
     goC.cpp
     Notify_Structured_Push_Consumer.cpp
     Structured_Consumer.cpp
   }
+  IDL_Files {
+  }
 }
-
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc b/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc
index e9bfd75204b..3a3553e3753 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc
@@ -1,41 +1,63 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl): taoidldefaults {
+  IDL_Files {
+    go.idl
+  }
+  custom_only = 1
+}
+
 project(*Ntf Struct Supp): notifytest {
   exename = Structured_Supplier
 
+  after += *idl
   Source_Files {
     Structured_Supplier.cpp
+    goS.cpp
+    goC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*Ntf Struct Cons): notifytest {
   exename = Structured_Consumer
 
+  after += *idl
   Source_Files {
     goC.cpp
     common.cpp
     Notify_Structured_Push_Consumer.cpp
     Structured_Consumer.cpp
   }
+  IDL_Files {
+  }
 }
 
 project(*Ntf Seq Supp): notifytest {
   exename = Sequence_Supplier
 
+  after += *idl
   Source_Files {
     Sequence_Supplier.cpp
+    goS.cpp
+    goC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*Ntf Seq Cons): notifytest {
   exename = Sequence_Consumer
 
+  after += *idl
   Source_Files {
     goC.cpp
     common.cpp
     Notify_Sequence_Push_Consumer.cpp
     Sequence_Consumer.cpp
   }
+  IDL_Files {
+  }
 }
-
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc
index a56d81fe6fc..4d74cfe0ffe 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc
@@ -1,22 +1,36 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl): taoidldefaults {
+  IDL_Files {
+    go.idl
+  }
+  custom_only = 1
+}
+
 project(*Ntf Seq Supp): notifytest {
   exename = Sequence_Supplier
 
+  after += *idl
   Source_Files {
     Sequence_Supplier.cpp
+    goS.cpp
+    goC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*Ntf Seq Cons): notifytest {
   exename = Sequence_Consumer
 
+  after += *idl
   Source_Files {
     goC.cpp
     common.cpp
     Notify_Sequence_Push_Consumer.cpp
     Sequence_Consumer.cpp
   }
+  IDL_Files {
+  }
 }
-
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Seq_Multi_Filter.mpc b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Seq_Multi_Filter.mpc
index a56d81fe6fc..e8363ad7659 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Seq_Multi_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Seq_Multi_Filter.mpc
@@ -1,22 +1,37 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl) : taoidldefaults {
+  IDL_Files {
+    go.idl
+  }
+  custom_only = 1
+}
+
 project(*Ntf Seq Supp): notifytest {
   exename = Sequence_Supplier
 
+  after += *idl
   Source_Files {
     Sequence_Supplier.cpp
+    goS.cpp
+    goC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*Ntf Seq Cons): notifytest {
   exename = Sequence_Consumer
 
+  after += *idl
   Source_Files {
     goC.cpp
     common.cpp
     Notify_Sequence_Push_Consumer.cpp
     Sequence_Consumer.cpp
   }
+  IDL_Files {
+  }
 }
 
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc b/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc
index 88f7038b442..76ff20df96e 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Struct_Filter.mpc
@@ -1,21 +1,35 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl) : taoidldefaults {
+  IDL_Files {
+    go.idl
+  }
+  custom_only = 1
+}
+
 project(*Ntf Struct Supp): notifytest {
   exename = Structured_Supplier
 
+  after += *idl
   Source_Files {
     Structured_Supplier.cpp
+    goS.cpp
+    goC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*Ntf Struct Cons): notifytest {
   exename = Structured_Consumer
 
+  after += *idl
   Source_Files {
     goC.cpp
     Notify_Push_Consumer.cpp
     Structured_Consumer.cpp
   }
+  IDL_Files {
+  }
 }
-
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc
index 4d276c66aaf..a7e74492d15 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Struct_Multi_Filter.mpc
@@ -1,22 +1,37 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl) : taoidldefaults {
+  IDL_Files {
+    go.idl
+  }
+  custom_only = 1
+}
+
 project(*Ntf Struct Supp): notifytest {
   exename = Structured_Supplier
 
+  after += *idl
   Source_Files {
     Notify_Push_Supplier.cpp
     Structured_Supplier.cpp
+    goS.cpp
+    goC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*Ntf Struct Cons): notifytest {
   exename = Structured_Consumer
 
+  after += *idl
   Source_Files {
     goC.cpp
     Notify_Push_Consumer.cpp
     Structured_Consumer.cpp
   }
+  IDL_Files {
+  }
 }
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc
index 0c726ed4014..bd3d85ca6cd 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc
@@ -1,12 +1,26 @@
 // $Id$
+
+project(*idl): taoidldefaults, minimum_corba {
+  IDL_Files {
+    go.idl
+  }
+  custom_only = 1
+}
+  
 project(*Ntf Perf Struct Supp): notifytest, minimum_corba {
+  after += *idl
   exename = Structured_Supplier
   Source_Files {
     Structured_Supplier.cpp
+    goS.cpp
+    goC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*Ntf Perf Struct Cons): notifytest, minimum_corba {
+  after += *idl
   exename = Structured_Consumer
   Source_Files {
     goC.cpp
@@ -14,16 +28,24 @@ project(*Ntf Perf Struct Cons): notifytest, minimum_corba {
     Notify_Structured_Push_Consumer.cpp
     Structured_Consumer.cpp
   }
+  IDL_Files {
+  }
 }
 
 project(*Ntf Perf Seq Supp): notifytest, minimum_corba {
+  after += *idl
   exename = Sequence_Supplier
   Source_Files {
     Sequence_Supplier.cpp
+    goS.cpp
+    goC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*notify perf Sequence Consumer): notifytest, minimum_corba {
+  after += *idl
   exename = Sequence_Consumer
   Source_Files {
     goC.cpp
@@ -31,5 +53,7 @@ project(*notify perf Sequence Consumer): notifytest, minimum_corba {
     Notify_Sequence_Push_Consumer.cpp
     Sequence_Consumer.cpp
   }
+  IDL_Files {
+  }
 }
 
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc b/TAO/orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc
index 4187c7790e1..2b128347974 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/Secure_BiDir.mpc
@@ -1,17 +1,33 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl): taoidldefaults {
+  IDL_Files {
+    test.idl
+  }
+  custom_only = 1
+}
+
 project(*SSL Server): taoexe, portableserver, minimum_corba, bidir_giop {
+  after += *idl
   Source_Files {
     test_i.cpp
+    testS.cpp
+    testC.cpp
     server.cpp
   }
+  IDL_Files {
+  }
 }
 
 project(*SSL Client): taoexe, portableserver, minimum_corba, bidir_giop {
+  after += *idl
   Source_Files {
     test_i.cpp
+    testS.cpp
+    testC.cpp
     client.cpp
   }
+  IDL_Files {
+  }
 }
-
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc b/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc
index a8adf63cf92..c5089718b4d 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc
+++ b/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc
@@ -1,17 +1,34 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl): taoidldefaults {
+  IDL_Files {
+    TX_Object.idl
+  }
+  custom_only = 1
+}
+
 project(*security client): taoclient, anytypecode, ssl {
+  after += *idl
+
   Source_Files {
     TX_ObjectC.cpp
     client.cpp
   }
+  IDL_Files {
+  }
 }
 
 project(*security server): taoserver, ssl {
+  after += *idl
+
   Source_Files {
     TX_Object_i.cpp
+    TX_ObjectS.cpp
+    TX_ObjectC.cpp
     server.cpp
   }
+  IDL_Files {
+  }
 }
 
diff --git a/TAO/orbsvcs/tests/Security/Callback/Callback.mpc b/TAO/orbsvcs/tests/Security/Callback/Callback.mpc
index 0b7c86e6859..e2a379ae985 100644
--- a/TAO/orbsvcs/tests/Security/Callback/Callback.mpc
+++ b/TAO/orbsvcs/tests/Security/Callback/Callback.mpc
@@ -1,11 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(*security server): taoexe, portableserver, ssl {
+project(*idl): taoidldefaults {
   IDL_Files {
     server.idl
     client.idl
   }
+  custom_only = 1
+}
+
+project(*security server): taoexe, portableserver, ssl {
+  after += *idl
+
+  IDL_Files {
+  }
 
   Source_Files {
     clientC.cpp
@@ -17,9 +25,9 @@ project(*security server): taoexe, portableserver, ssl {
 }
 
 project(*security client): taoexe, portableserver, ssl {
+  after += *idl
+
   IDL_Files {
-    server.idl
-    client.idl
   }
 
   Source_Files {
@@ -30,4 +38,3 @@ project(*security client): taoexe, portableserver, ssl {
     client.cpp
   }
 }
-
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc b/TAO/orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc
index ead77db2fb1..e2bc144527e 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/Security_Crash_Test.mpc
@@ -1,16 +1,31 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl): taoidldefaults {
+  IDL_Files {
+    test.idl
+  }
+  custom_only = 1
+}
+
 project(*server): taoexe, portableserver, ssliop {
+  after += *idl
   Source_Files {
-    test_i.cpp
     server.cpp
+    test_i.cpp
+    testS.cpp
+    testC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*client): taoexe, portableserver, ssliop {
+  after += *idl
   Source_Files {
     client.cpp
+    testC.cpp
+  }
+  IDL_Files {
   }
 }
-
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc
index 1ab4d83b7e1..73d1d3af653 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/MT_IIOP_SSL.mpc
@@ -1,19 +1,33 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl) : taoidldefaults {
+  IDL_Files {
+    test.idl
+  }
+  custom_only = 1
+}
+
 project(*security server): orbsvcslib, portableserver, ssl, ssliop {
+  after += *idl
   Source_Files {
     Server_Worker.cpp
     test_i.cpp
     server.cpp
+    testS.cpp
+    testC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*security client): orbsvcslib {
+  after += *idl
   Source_Files {
     testC.cpp
     Client_Worker.cpp
     client.cpp
   }
+  IDL_Files {
+  }
 }
-
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc b/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc
index 187ce8a2f7b..89b98f15054 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc
@@ -1,17 +1,31 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl) : taoidldefaults {
+  IDL_Files {
+    Foo.idl
+  }
+  custom_only = 1
+}
+
 project(*security server): taoexe, portableserver, orbsvcslib, security, ssliop {
+  after += *idl
   Source_Files {
     Foo_i.cpp
+    FooS.cpp
+    FooC.cpp
     server.cpp
   }
+  IDL_Files {
+  }
 }
 
 project(*security client): taoexe, orbsvcslib, security {
+  after += *idl
   Source_Files {
     FooC.cpp
     client.cpp
   }
+  IDL_Files {
+  }
 }
-
diff --git a/TAO/performance-tests/Sequence_Latency/DII/DII.mpc b/TAO/performance-tests/Sequence_Latency/DII/DII.mpc
index 92392fd29ac..00af70b526f 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/DII.mpc
+++ b/TAO/performance-tests/Sequence_Latency/DII/DII.mpc
@@ -1,20 +1,35 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl): taoidldefaults, strategies, minimum_corba {
+  IDL_Files {
+    Test.idl
+  }
+  custom_only = 1
+}
+
 project(* sequence server): taoserver, strategies, minimum_corba {
+  after += *idl
 
+  exename = server
   Source_Files {
     Roundtrip.cpp
     server.cpp
+    TestS.cpp
+    TestC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(* sequence client): taoserver, strategies, dynamicinterface, minimum_corba {
-  exename  = client
+  after += *idl
 
+  exename = client
   Source_Files {
     TestC.cpp
     client.cpp
   }
+  IDL_Files {
+  }
 }
-
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
index f0b080a54e7..9263b8a9625 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
+++ b/TAO/performance-tests/Sequence_Latency/DSI/DSI.mpc
@@ -1,16 +1,31 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl): taoidldefaults, strategies, minimum_corba {
+  IDL_Files {
+    Test.idl
+  }
+  custom_only = 1
+}
+
 project(*sequence server) : taoserver, strategies, dynamicinterface, minimum_corba {
+  after += *idl
   Source_Files {
     Roundtrip.cpp
     server.cpp
+    TestS.cpp
+    TestC.cpp
+  }
+  IDL_Files {
   }
 }
 project(*sequence client): taoclient, strategies, minimum_corba {
+  after += *idl
   Source_Files {
     TestC.cpp
     client.cpp
   }
+  IDL_Files {
+  }
 }
 
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
index 92392fd29ac..68a61959e64 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
@@ -1,20 +1,36 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl): taoidldefaults, strategies, minimum_corba {
+  IDL_Files {
+    Test.idl
+  }
+  custom_only = 1
+}
+
 project(* sequence server): taoserver, strategies, minimum_corba {
+  after += *idl
 
+  exename = server
   Source_Files {
     Roundtrip.cpp
     server.cpp
+    TestS.cpp
+    TestC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(* sequence client): taoserver, strategies, dynamicinterface, minimum_corba {
-  exename  = client
+  after += *idl
 
+  exename = client
   Source_Files {
     TestC.cpp
     client.cpp
   }
+  IDL_Files {
+  }
 }
 
diff --git a/TAO/utils/Makefile.am b/TAO/utils/Makefile.am
index 75091ca2cec..401776d9b02 100644
--- a/TAO/utils/Makefile.am
+++ b/TAO/utils/Makefile.am
@@ -1,5 +1,14 @@
 ##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 SUBDIRS = \
         catior \
         nslist
+
diff --git a/TAO/utils/catior/Makefile.am b/TAO/utils/catior/Makefile.am
index 6b173c8ae19..628ec431bcd 100644
--- a/TAO/utils/catior/Makefile.am
+++ b/TAO/utils/catior/Makefile.am
@@ -2,19 +2,23 @@
 ##
 ## $Id$
 ##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-bin_PROGRAMS =
 
 ## Makefile.catior.am
 
 if BUILD_RT_CORBA
 
-bin_PROGRAMS += catior
+bin_PROGRAMS = catior
 
 catior_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -27,6 +31,9 @@ catior_SOURCES = \
 
 catior_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
diff --git a/TAO/utils/nslist/Makefile.am b/TAO/utils/nslist/Makefile.am
index 1a208b23065..388ae55d5bd 100644
--- a/TAO/utils/nslist/Makefile.am
+++ b/TAO/utils/nslist/Makefile.am
@@ -2,6 +2,11 @@
 ##
 ## $Id$
 ##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -25,6 +30,7 @@ nsadd_SOURCES = \
 
 nsadd_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
@@ -45,6 +51,7 @@ nsdel_SOURCES = \
 
 nsdel_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
@@ -65,6 +72,7 @@ nslist_SOURCES = \
 
 nslist_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la