restart work sa branch

925 files changed, 16978 insertions, 14062 deletions

diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html
index 3edb65ad76c..18f7c8e9e01 100644
--- a/ACE/ACE-INSTALL.html
+++ b/ACE/ACE-INSTALL.html
@@ -281,12 +281,12 @@ The following sections explain how to build ACE on:
 <hr align="left" width="50%">
 <h2><a name="unix">Building and Installing ACE on UNIX</a></h2>
 
-As of ACE 6.1, you can building ACE on
+As of ACE 6.0.6, you can building ACE on
 UNIX with:
 <ol>
   <li><a href="#unix_traditional">Traditional ACE/GNU Make Configuration</a></li>
 </ol>
-The <a href="#win32">build process for Windows</a> is different from both of
+The <a href="#win32">build process for Windows</a> is different from 
 the UNIX methods.
 
 <h3><a name="unix_traditional">Using the Traditional ACE/GNU Configuration</a></h3>
@@ -625,42 +625,11 @@ card.  This is one method:
       MS Loopback Adapter<p>
 </p></li></a></ol>
 
-<a name="win32nonic"><b>WIN32 ALPHA CONFIGURATIONS</b>
-
-</a><p><a name="win32nonic">The project files for Visual C++ no longer contain any configurations
-targetted to Windows NT on the DEC Alpha.  Below are the steps needed to
-recreate the Alpha configurations:</a></p>
-
-<ol>
-<a name="win32nonic">  <li>Load the project on the Alpha machine.
-  </li><li>Go to the Build menu and then select Configurations.
-  </li><li>Select the project that you want to convert.
-  </li><li>Click on Add.
-  </li><li>Select the x86 configuration to "Copy settings from"
-      (either Debug or Release versions).
-  </li><li>Prepend "Alpha " to the beginning of the name under
-      "Configuration".
-  </li><li>Click OK.
-  </li><li>Close the "Configurations" window.
-  </li><li>Now go to the Project settings.
-  </li><li>For the General Settings, change the output directories to standard ACE
-      output directories. Intermediate Directories are "Debug" and
-          "Release" in most cases.  The Output Directories are blank,
-          except for Release versions of executables, in which it is also
-          "Release".
-  </li><li>For the C/C++ Settings, make sure that the Code Generation's runtime
-      library is set to "Multithreaded DLL" or "Debug Multithreaded
-          DLL".
-</li></a></ol>
-
-<p><a name="win32nonic"><b>Note:</b> MSVC 6 has a bug where if a .dsp is converted from version 5 to 6 on
-x86, the Alpha configuration can get corrupted.  This seems to happen when additional
-include or library directories are specified using backslashes instead of forward
-slashes.  If this occurs, the easiest way to fix it is to recreate it.</a></p>
-
 <hr align="left" width="50%"><p>&nbsp;</p>
 <h3><a name="codegear">Building and Installing ACE on Windows with Embarcadero C++</a></h3>
 
+<b>The Embarcadero C++ port is not maintained anymore due to lack of funding.</b><p>
+
 If you are building for a machine without a network card, you may want
 to check <a href="#win32nonic">here</a> first. <p>
 
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index ddc41b52d64..4aa52979fbd 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,1458 +1,58 @@
-Sat Oct 22 02:06:37 UTC 2011  Abdullah Sowayan  <sowayan@gmail.com>
+Mon Dec  5 22:23:25 UTC 2011  Steve Huston  <shuston@riverace.com>
 
-        * include/makeinclude/platform_macosx_common.GNU:
+        * ace/DLL.h:
+        * ace/DLL_Manager.h: Corrected and expanded the descriptions of how
+          DLL/library names are handled, decorated, and located.
 
-          Added missing:
-          DCCFLAGS += -g
+Mon Dec  5 20:16:51 UTC 2011  Steve Huston  <shuston@riverace.com>
 
-          From the file. Thanks to William R. Otte  <wotte@dre.vanderbilt.edu>
-          for pointing this out.
+        * ace/Atomic_Op.{h inl}:
+        * ace/Atomic_Op_T.{h inl}:
+        * ace/Atomic_Op_GCC_T.{h inl}:
+          Added new method TYPE exchange (TYPE newval) which exchanges the
+          ACE_Atomic_Op's value with the specified new value. Thanks to John
+          Lilley for contributing this addition.
 
-Fri Oct 21 23:35:30 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+        * tests/Atomic_Op_Test.cpp: Added test for exchange().
 
-        * ace/Time_Value.inl:
+        * NEWS: Added description of the new exchange() method.
 
-          Changed the operator comparing __builtin_constant_p to be a
-          bitwise (&) instead oflogical and (&&) to address a warning from the
-          LLVM compiler.  In this case, the result of the two operators is
-          logically equivalent.  Thanks to Abdullah Sowayan <sowayan@gmail.com>
-          for reporting the issue.
+Mon Dec  5 12:27:54 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Fri Oct 21 11:26:49 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * examples/Misc/test_trace.cpp:
-          Fixed compile issue in case all logging is turned off.
-
-Thu Oct 20 10:41:44 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/Download.html:
-          Added links to the OBS projects, thanks to John Fletcher for providing
-          this update
-
-Tue Oct 20 09:30:13 UTC 2011  Martin Corino  <mcorino@remedy.nl>
-
-        Merged changes from Remedy work branch.
-
-        === start changelog ===
-
-        Tue Oct 18 09:23:13 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
-                * bin/MakeProjectCreator/config/global.features:
-                Add ccm_direct_collocation
-
-        Wed Oct 12 13:08:13 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * bin/MakeProjectCreator/config/crosscompile.mpb:
-                  Fixed install issues.
-
-                * bin/mwc.pl:
-                  Removed unnecessary STDERR.
-
-        === end changelog ===
-
-Thu Oct 20 06:57:38 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * *.*:
-          Removed autoconf support due to lack of resources/funding to
-          get autoconf really working. It now only causes confusions and
-          not working configurations for users.
-
-Wed Oct 19 19:13:38 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * bin/MakeProjectCreator/config/global.features:
-          disable openmp by default.
-
-        * include/makeinclude/platform_clang_common.GNU:
-        * include/makeinclude/platform_g++_common.GNU:
-          add flags for openmp.
-
-Wed Oct 19 09:56:20 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * rpmbuild/ace-tao.spec:
-          Removed not needed setting of inline
-
-Mon Oct 17 20:40:35 UTC 2011  Abdul Sowayan  <sowayan@gmail.com>
-
-        * include/makeinclude/platform_macosx_iOS.GNU:
-
-          Minor enhancements to this file to make ACE/TAO compile again.
-
-Sat Oct 15 00:57:11 UTC 2011  Abdullah Sowayan  <sowayan@gmail.com>
-
-        * ace/config-macosx-lion.h:
-        * include/makeinclude/platform_macosx_lion.GNU:
-
-          Minor enhancements to the files above.
-
-Mon Oct 10 12:13:52 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * protocols/ace/INet/ClientRequestHandler.h:
-        * protocols/ace/INet/HTTP_ClientRequestHandler.h:
-        * protocols/ace/INet/URLBase.h:
-          Always export, should solve SLE9 issues
-
-Mon Oct 10 11:16:58 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/Download.html:
-          Make x.0.5 public
-
-Mon Oct 10 11:16:58 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/diff-builds-and-group-fixed-tests-only.sh:
-          Updated for next release
-
-        * bin/make_release.py:
-          Next time we don't ship vc8 anymore
-
-        * docs/bczar/bczar.html:
-          Make x.0.5 public
-
-        * etc/index.html:
-          Make x.0.5 public
-
-Mon Oct 10 08:48:51 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE version 6.0.5 released.
-
-Sat Oct  8 09:00:00 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * ACEXML/examples/SAXPrint/namespaces.xml:
-        * ACEXML/examples/SAXPrint/ns.svc.conf.xml:
-        * ACEXML/examples/SAXPrint/simple.svcconf.xml:
-        * ACEXML/examples/SAXPrint/svc.conf.xml:
-          XML does not allow anything before the xml-tag.
-
-Fri Oct  7 09:45:31 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * ACEXML/docs/TODO.txt:
-        * ACEXML/docs/bugs.txt:
-        * ASNMP/tests/run_tests.sh:
-          Fuzz
-
-Fri Oct  7 09:10:55 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * ACEXML/docs/readme.txt:
-        * ASNMP/README:
-        * Kokyu/README:
-        * bin/LabVIEW_RT/README:
-        * bin/PerlACE/README:
-        * contrib/FaCE/README:
-        * examples/C++NPv1/README:
-        * examples/C++NPv2/README:
-        * examples/IPC_SAP/SSL_SAP/README:
-        * examples/Semaphores/README:
-        * html/README:
-        * netsvcs/lib/README:
-        * performance-tests/README:
-        * performance-tests/RPC/README:
-        * performance-tests/Synch-Benchmarks/Perf_Test/README:
-        * performance-tests/Synch-Benchmarks/README:
-        * performance-tests/Synch-Benchmarks/Synch_Lib/README:
-        * performance-tests/TCP/README:
-        * performance-tests/TTCP/C/README:
-        * performance-tests/UDP/README:
-        * protocols/ace/HTBP/README:
-        * websvcs/README:
-          Fuzz: No id-tags. Also uniform way of declaring the Id-tags
-
-Fri Oct  7 07:48:32 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * ACEXML/examples/SAXPrint/broken.xml:
-        * ACEXML/examples/SAXPrint/namespaces.xml:
-        * ACEXML/examples/SAXPrint/ns.svc.conf.xml:
-        * ACEXML/examples/SAXPrint/simple.svcconf.xml:
-        * ACEXML/examples/SAXPrint/svc.conf.xml:
-        * Kokyu/tests/DSRT_MIF/svc.conf.xml:
-        * examples/ASX/CCM_App/svc.conf.xml:
-        * netsvcs/servers/svc.conf.xml:
-        * tests/Service_Config_Test.conf.xml:
-          Fuzz: No Id-tags.
-
-Thu Oct  6 12:01:30 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * netsvcs/README:
-        * netsvcs/clients/Logger/README:
-        * netsvcs/clients/README:
-        * netsvcs/clients/Tokens/README:
-        * netsvcs/clients/Tokens/collection/README:
-        * netsvcs/clients/Tokens/deadlock/README:
-        * netsvcs/clients/Tokens/invariant/README:
-        * netsvcs/clients/Tokens/manual/README:
-        * netsvcs/clients/Tokens/mutex/README:
-        * netsvcs/lib/README:
-        * netsvcs/servers/README:
-          Fuzz: trailing whitespaces, tab characters and ID strings
-
-Thu Oct  6 11:56:19 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * README:
-        * examples/Connection/non_blocking/README:
-        * examples/IPC_SAP/DEV_SAP/README:
-        * examples/IPC_SAP/SOCK_SAP/README:
-        * examples/IPC_SAP/SSL_SAP/README:
-        * examples/Log_Msg/Log_Msg_MFC/README:
-        * examples/Log_Msg/README:
-        * examples/Logger/README:
-        * examples/README:
-        * examples/Reactor/Ntalker/README:
-        * examples/Reactor/README:
-        * examples/Reactor/TP_Reactor/README:
-        * examples/Service_Configurator/Misc/README:
-        * examples/Synch/README:
-        * examples/System_V_IPC/README:
-        * examples/Timer_Queue/README:
-          Fuzz: trailing whitespaces, tab characters and ID strings
-
-Mon Oct  3 06:30:57 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Dev_Poll_Reactor.h:
-          Doxygen improvements
-
-Fri Sep 30 14:03:58 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/fuzz.pl:
-          Check more filetypes for id tag
-
-        * docs/bczar/bczar.html:
-          Added some more packages
-
-Thu Sep 29 01:58:23 UTC 2011  Abdullah Sowayan  <sowayan@gmail.com>
-
-        * include/makeinclude/platform_macosx_lion.GNU:
-
-          LLVM is the default compiler on Lion for now on.
-
-Fri Sep 23 12:45:47 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * bin/PerlACE/TestTarget.pm:
-        * bin/PerlACE/TestTarget_Android.pm:
-          Created a special method for the ADB timeout environment
-          variable.
-
-Fri Sep 23 09:25:04 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * bin/PerlACE/TestTarget_Android.pm:
-          Stop the script when an emulator times out.
-
-Wed Sep 14 07:54:28 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/PerlACE/TestTarget_Android.pm:
-          Adding of libpath is only needed for non static builds
-
-Tue Sep 13 08:12:40 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/TestTarget.pm:
-          Added DOC_TEST_DEFAULT, this controls the default platform
-          for all platform instead of defaulting to localhost
-
-Tue Sep 13 08:12:40 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/PerlACE/ProcessAndroid.pm:
-          Don't delete executable after each run
-
-Mon Sep 12 12:55:58 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * ACE-INSTALL.html:
-          Made some minor modification to the Android section.
-
-Mon Sep 12 11:16:53 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-android.h:
-          Android doesn't have icmp support
-
-        * docs/bczar/bczar.html:
-          Added telnet
-
-Sun Sep 11 18:11:08 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/PerlACE/ProcessAndroid.pm:
-          Don't copy any log files here, that has to be done in the test
-          script
-
-        * tests/run_test.pl:
-          Get the log file from the target before analyzing it
-
-Sun Sep 11 18:02:08 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/PerlACE/ProcessAndroid.pm:
-          Fixed executable method
-
-Fri Sep  9 21:34:26 UTC 2011  Adam Mitz  <mitza@ociweb.com>
-
-        * bin/PerlACE/Process_Win32.pm:
-
-          Fixed a bug introduced in the previous commit to this file:
-          Thu Sep  8 08:14:46 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-          The bug prevented any tests from running on Win32.
-
-Fri Sep  9 19:31:43 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/PerlACE/ProcessAndroid.pm:
-        * bin/PerlACE/TestTarget_Android.pm:
-          Added PutFile for the TestTarget
-
-Fri Sep  9 19:19:22 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/PerlACE/ProcessAndroid.pm:
-        * bin/PerlACE/TestTarget_Android.pm:
-          Don't copy all config files, if we need files on a target, the test
-          script should copy them
-
-Fri Sep  9 19:15:28 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/PerlACE/TestTarget_Android.pm:
-          Try to kill emulator and emulator-arm
-
-Fri Sep  9 11:26:45 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_android.GNU:
-          Android doesn't have rwho
-
-Fri Sep  9 07:19:00 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/CDR_Stream.h:
-          Doxygen changes
-
-        * include/makeinclude/platform_android.GNU:
-          Prevent flags being listed twice
-
-Thu Sep  8 17:48:53 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/OS_NS_stdlib.cpp:
-          Fixed compile warnings
-
-        * ace/OS_NS_Thread.inl:
-          Added check for ACE_LACKS_CONDATTR
-
-        * ace/Mem_Map.cpp:
-          When ACE_MMAP_NO_ZERO is defined, when the length if zero we
-          default to the pagesize
-
-Thu Sep  8 17:46:28 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-android.h:
-          Further cleanup and improvements
-
-Thu Sep  8 17:32:48 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/TP_Reactor.h:
-          Typo fixed
-
-        * ace/Process_Manager.cpp:
-          Layout changes
-
-        * ace/config-sunos5.5.h:
-          Removed old comment
-
-        * ace/Signal.h:
-          Doxygen cleanup
-
-        * ace/OS_NS_errno.inl:
-          Const changes
-
-        * ace/OS_NS_errno.h:
-          Only define ACE_ERRNO_TYPE when it is not defined yet, that way we
-          can just set it in config-android.h
-
-        * ace/config-android.h:
-          Cleanup and set various defines needed to get correct runtime
-          behavior
-
-        * bin/PerlACE/Process_VMS.pm:
-          Chorus support removal
-
-        * bin/PerlACE/README:
-          Layout changes
-
-        * include/makeinclude/platform_android.GNU:
-          Further cleanup
-
-Thu Sep  8 17:20:26 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_android.GNU:
-          Fixed warning about not recognized --version
-
-Thu Sep  8 17:16:26 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE-INSTALL.html:
-        * docs/bczar/bczar.html:
-          Another 32bit package for android
-
-        * include/makeinclude/platform_android.GNU:
-        * include/makeinclude/platform_android_linux.GNU:
-          Renamed to platform_android.GNU
-
-Thu Sep  8 13:20:55 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE-INSTALL.html:
-          Added another 32bit package for Android
-
-        * docs/bczar/bczar.html:
-          Added some packages
-
-Thu Sep  8 13:20:55 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE-INSTALL.html:
-          Documented which 32bit packages need to be installed on a 64bit
-          linux host for the Android port
-
-        * docs/bczar/bczar.html:
-          Added some packages
-
-Thu Sep  8 08:16:35 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Lib_Find.cpp:
-          Add support for ACE_DEFAULT_TEMP_DIR
-
-        * ace/MEM_Stream.h:
-          Added missing export include
-
-        * ace/OS_NS_unistd.cpp:
-          Added ACE_HAS_NONCONST_PWRITE
-
-        * ace/Select_Reactor_Base.cpp:
-          Layout change
-
-        * include/makeinclude/platform_android_linux.GNU:
-          Use ?= to make an override possible from platform_macros.GNU
-
-Thu Sep  8 08:14:46 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/PerlACE/ConfigList.pm:
-        * bin/PerlACE/Process.pm:
-        * bin/PerlACE/ProcessAndroid.pm:
-        * bin/PerlACE/ProcessLVRT.pm:
-        * bin/PerlACE/ProcessVX.pm:
-        * bin/PerlACE/ProcessVX_Unix.pm:
-        * bin/PerlACE/ProcessVX_Win32.pm:
-        * bin/PerlACE/ProcessWinCE.pm:
-        * bin/PerlACE/ProcessWinCE_Unix.pm:
-        * bin/PerlACE/Process_Unix.pm:
-        * bin/PerlACE/Process_VMS.pm:
-        * bin/PerlACE/Process_Win32.pm:
-        * bin/PerlACE/Run_Test.pm:
-        * bin/PerlACE/TestTarget.pm:
-        * bin/PerlACE/TestTarget_Android.pm:
-        * bin/PerlACE/TestTarget_LVRT.pm:
-        * bin/PerlACE/TestTarget_VxWorks.pm:
-        * bin/PerlACE/TestTarget_WinCE.pm:
-          Extensions to run automatically tests on an Android emulator
-
-Tue Sep  6 09:36:36 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * rpmbuild/ace-tao.spec:
-          Removed rnq option, that is now default, added versioned namespace
-          support
-
-Wed Aug 31 11:43:13 UTC 2011  Abdul Sowayan  <sowayan@gmail.com>
-
-        * include/makeinclude/platform_macosx_iOS.GNU:
-
-          Minor updates to this file to work with Mac OSX Lion (10.7)
-
-Wed Aug 31 11:33:39 UTC 2011  Abdul Sowayan  <sowayan@gmail.com>
-
-        * ace/config-macosx-iOS-hardware.h:
-        * ace/config-macosx-iOS-simulator.h:
-        * include/makeinclude/platform_macosx_iOS.GNU:
-
-          Renamed the files from iphone to iOS since this is what apple
-          calls the platform these days.
-
-        * ace/config-macosx-iphone-hardware.h:
-        * ace/config-macosx-iphone-simulator.h:
-        * include/makeinclude/platform_macosx_iphone.GNU:
-
-          Removed these files.
-
-Tue Aug 30 14:40:01 UTC 2011  Abdul Sowayan  <sowayan@gmail.com>
-
-        * include/makeinclude/platform_macosx_iphone.GNU:
-
-          Allow the user to specify the location of XCode. This is helpful
-          when there are multiple versions of XCode installed on the machine.
-          To specify the location of XCode, use XCODE_ROOT environment variable.
-          If XCODE_ROOT is not specified, the location of XCode is assumed to be
-          located at the default installation directory (which is /Developer).
-
-Fri Aug 26 16:02:13 UTC 2011  Abdul Sowayan  <sowayan@gmail.com>
-
-        * include/makeinclude/platform_macosx_iphone.GNU:
-
-          Switch the default compiler from GCC to Clang
-
-Fri Aug 26 15:59:19 UTC 2011  Abdul Sowayan  <sowayan@gmail.com>
-
-        * ace/config-macosx-iphone-hardware.h:
-        * ace/config-macosx-iphone-simulator.h:
-
-          Updated these files to use Mac OS-X Lion as the build host. Also, fixed
-          some minor typos.
-
-Wed Aug 24 13:06:17 UTC 2011  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Message_Block.cpp: Replaced the recursive version of
-          ACE_Message_Block::clone() with a non-recursive version to avoid
-          problems when there are large numbers of message blocks.  Thanks
-          to Andrew Metcalfe <andrew dot metcalfe at ccur dot com> for
-          reporting this and suggesting the fix, which was provided by
-          Eric Frias <efrias at syncad dot com>.
-
-Tue Aug 23 18:20:02 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * NEWS:
-          Prepared for next release
-
-        * bin/diff-builds-and-group-fixed-tests-only.sh:
-        * docs/Download.html:
-        * docs/bczar/bczar.html:
-        * etc/index.html:
-          Updated to make the new release public
-
-Tue Aug 23 19:01:44 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE version 6.0.4 released.
-
-Thu Aug 18 01:31:48 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Message_Block.cpp:
-
-          Reverted the change from Mon Aug 15 14:41:24 UTC 2011 Douglas
-          C. Schmidt <schmidt@dre.vanderbilt.edu>. This change caused a
-          regression failure that showed up on some of the TAO tests. We
-          can try reintroducing this patch after the upcoming release.
-
-Wed Aug 17 15:01:28 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ACE-INSTALL.html:
-
-          Fix typo in SYSROOT default example.
-
-Wed Aug 17 13:54:12 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Message_Block.cpp:
-
-          Unfuzz.
-
-Mon Aug 15 14:41:24 UTC 2011  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Message_Block.cpp: Replaced the recursive version of
-          ACE_Message_Block::clone() with a non-recursive version to avoid
-          problems when there are large numbers of message blocks.  Thanks
-          to Andrew Metcalfe <andrew dot metcalfe at ccur dot com> for
-          reporting this and suggesting the fix, which was provided by
-          Eric Frias <efrias at syncad dot com>.
-
-Sun Aug 14 10:44:32 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * rpmbuild/ace-tao.spec:
-          Added support for inline, thanks to Thomas Lockhart for providing
-          the patch
-
-Wed Aug 10 20:15:40 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ACE-INSTALL.html:
-        * NEWS:
-
-          Add a note about support for Android in the news, and add more
-          detail to the installation steps.
-
-Wed Aug 10 19:02:21 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ACE-INSTALL.html:
-
-          Updated the text related to installing for Android.
-
-        * include/makeinclude/platform_android_linux.GNU:
-
-          Added this file.
-
-        * include/makeinclude/platform_linux_android.GNU:
-
-          Removed this file.
-
-          Renamed the file to be consistent with others, now the name is
-          target platform first followed by the build-specific name. The
-          settings for cross compilation are now configured inside this
-          platform file, using some assumptions for architecture.
-
-          The build for the arm architecture works, but it looks like x86
-          still needs work by the NDK team, it was just added in their r6
-          release. I've submitted a bug report to the android team with a
-          suggested patch.
-
-Wed Aug 10 17:14:01 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-win32.h:
-          Removed one include too much
-
-Wed Aug 10 12:41:18 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-macros.h:
-          Enable ACE_HAS_REACTOR_NOTIFICATION_QUEUE by default, it gives
-          much better performance and also doesn't suffer the issue that them
-          reactor queue can get full
-
-Wed Aug 10 12:18:56 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Notification_Queue.inl:
-        * ace/Service_Config.h:
-          Layout changes
-
-Wed Aug 10 11:45:28 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-win32-common.h:
-        * ace/config-win32.h:
-          Moved define to the common file
-
-        * ace/config-win32-borland.h:
-          Removed support for C++ Builder, the port is broken and not maintained
-          for years.
-
-Tue Aug  9 17:28:15 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * debian/patches/series:
-          Updated because of removed files
-
-        * debian/patches/16-ace-inet-pkgconfig-files.diff:
-        * debian/patches/prevent_doxygen_ace_manpages.diff:
-          Removed these files, integrated into trunk
-
-Tue Aug  9 17:17:56 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/os_include/os_dlfcn.h:
-          Added if !defined checks around all defines in this file
-
-Mon Aug  8 21:46:01 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/OS_NS_time.inl:
-
-          Fix some inconsistencies in the new android-specific wrappers.
-
-        * ace/config-android.h:
-
-          Android does not supply std::wstring
-
-        * include/makeinclude/platform_linux_android.GNU:
-
-          The android supplied compiler gives a preemptive warning about
-          va_args mangling change, but I cannot find anything to change
-          in the ACE code, so I added the recommended warning suppressor.
-
-Thu Aug  4 22:11:26 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/config-android.h:
-
-          unfuzz.
-
-Thu Aug  4 15:03:16 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ACE-INSTALL.html:
-        * ace/OS_NS_Thread.cpp:
-        * ace/OS_NS_errno.h:
-        * ace/OS_NS_time.h:
-        * ace/OS_NS_time.inl:
-        * ace/config-linux.h:
-        * ace/config-android.h:
-        * include/makeinclude/platform_linux_android.GNU:
-
-          Added configuration files and minor changes to allow building
-          for Android using the Android Native Development Kit's standalone
-          tool chain. http://developer.android.com/sdk/ndk/index.html
-          Android is not a completely tested platform and automated testing
-          does not work for it currently. Thanks to Trevor Fields of OCI
-          for doing the heavy lifting on preparing these changes.
-
-        * examples/APG/ThreadManagement/Async_Cancel.cpp:
-        * examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp:
-        * examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.inl:
-        * examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.inl:
-        * examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp:
-        * examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp:
-
-          Add wrappers necessary to get them working with Android.
-
-        * tests/Thread_Attrs_Test.cpp:
-        * tests/test_config.h:
-
-          Minor changes for running tests on Android.
-
-Sun Jul 31 11:14:23 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/generate_doxygen.pl:
-          Don't generate man pages, not used
-
-        * debian/*:
-          Pull in latest version from debian packaging
-
-        * protocols/ace/INet/ACE_INet.pc.in:
-        * protocols/ace/INet/ACE_INet_SSL.pc.in:
-        * protocols/ace/INet/inet.mpc:
-        * protocols/ace/INet/inet_ssl.mpc:
-          Added pc.in files
-
-        * etc/ace_man.doxygen:
-          Removed this file.
-
-Sat Jul 30 13:11:43 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-windows.h:
-        * ace/config-win64.h:
-          Renamed win64.h to windows.h
-
-Sun Jul 24 04:27:10 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * examples/APG/Streams/Answerer.cpp:
-
-          Fuzz fixes.
-
-Sat Jul 23 22:37:24 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/config-win64.h:
-        * examples/APG/Timers/PCB.cpp:
-
-          Fuzz fixes.
-
-        * bin/fuzz.pl:
-
-          Enhanced the check for ACE_TRACE messages so that it works
-          correctly with class definitions such as those found in
-          examples/APG/ThreadPools/Futures.cpp.
-
-Fri Jul 22 12:29:59 UTC 2011  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Malloc_T.cpp: Fixed ACE_Dynamic_Cached_Allocator so that it
-          doesn't overflow.  Thanks to Qiao Zhiqiang <qiaozhiqiang at
-          leadcoretech dot com> for this fix.
-
-Fri Jul 22 12:27:16 UTC 2011  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * tests/Cached_Allocator_Test.cpp (run_main): Updated this test to
-          check that ACE_Dynamic_Cached_Allocator works properly.
-
-Wed Jul 20 23:52:46 UTC 2011  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/config-win64.h: Added this file to make it more clear how to
-          build ACE on a 64-bit Windows platform.  Thanks to Thomas Pauli
-          <thomas dot pauli at tu-dortmund dot de> for contributing this
-          fix.
-
-Mon Jul 18 11:44:16 UTC 2011  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * Happy Birthday to me ;-)
-
-Mon Jul 11 00:39:05 UTC 2011  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * examples/APG/ThreadPools/Futures.cpp (class Manager):
-        * examples/APG/Containers/Stacks.cpp (StackExample::run):
-        * examples/APG/Containers/Allocator.cpp (StackExample::run):
-        * examples/APG/Timers/PCB.cpp (PCB::handleClose): Fixed a mismatch in ACE_TRACE.
-
-Sat Jul  9 19:07:20 UTC 2011  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/RB_Tree.inl,
-          ace/Svc_Handler.cpp,
-          examples/APG/Active_Objects/AO.cpp,
-          examples/APG/Active_Objects/AO2.cpp,
-          examples/APG/Containers/Allocator.cpp,
-          examples/APG/Containers/DLList.cpp,
-          examples/APG/Containers/Hash_Map.cpp,
-          examples/APG/Containers/Hash_Map_Hash.cpp,
-          examples/APG/Containers/Map_Manager.cpp,
-          examples/APG/Containers/Map_Manager_Specialization.cpp,
-          examples/APG/Containers/Queues.cpp,
-          examples/APG/Containers/RB_Tree.cpp,
-          examples/APG/Containers/RB_Tree_Functors.cpp,
-          examples/APG/Containers/Sets.cpp,
-          examples/APG/Containers/Stacks.cpp,
-          examples/APG/Processes/Process_Manager_Death.cpp,
-          examples/APG/Processes/Process_Mutex.cpp,
-          examples/APG/Signals/SigAction.cpp,
-          examples/APG/Signals/SigHandler.cpp,
-          examples/APG/Signals/SigHandlers.cpp,
-          examples/APG/Streams/Answerer.cpp,
-          examples/APG/Streams/CommandStream.cpp,
-          examples/APG/Streams/CommandTask.cpp,
-          examples/APG/Streams/EndTask.h,
-          examples/APG/ThreadPools/Futures.cpp,
-          examples/APG/ThreadPools/LF_ThreadPool.cpp,
-          examples/APG/ThreadPools/Task_ThreadPool.cpp,
-          examples/APG/ThreadPools/ThreadPool.cpp,
-          examples/APG/Timers/Alarm.cpp,
-          examples/APG/Timers/CB.cpp,
-          examples/APG/Timers/PCB.cpp,
-          examples/APG/Timers/PTimerDispatcher.cpp,
-          examples/APG/Timers/Task.cpp,
-          examples/APG/Timers/TimerDispatcher.cpp,
-          examples/APG/Timers/Upcall.cpp,
-          examples/Reactor/TP_Reactor/ReadHandler.cpp,
-          examples/Timer_Queue/Custom_Handler.cpp,
-          netsvcs/lib/Name_Handler.cpp,
-          netsvcs/lib/Server_Logging_Handler_T.cpp,
-          netsvcs/lib/TS_Clerk_Handler.cpp,
-          netsvcs/lib/TS_Server_Handler.cpp,
-          tests/Bug_3878_Regression_Test.cpp,
-          tests/Thread_Timer_Queue_Adapter_Test.cpp: Fixed all the
-          ACE_TRACE statements similar to
-
-          ACE_TRACE( ACE_TEXT( "sometext" ) );
-
-          and
-
-          ACE_TRACE( "some"
-                     "text" );
-
-          to
-
-          ACE_TRACE( "sometext" );
-
-          Thanks to Espen Harlinn <espen at harlinn dot no> for this fix,
-          which fixes bugid 3976.
-
-Thu Jul  7 15:24:09 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Unbounded_Set_Ex.cpp:
-          Fixed compile error when ACE_HAS_DUMP is defined. This fixes bugzilla
-          3977, thanks to Ben Bronk <benjamin dot j dot bronk at lmco dot com>
-          for reporting this
-
-        * docs/bczar/bczar.html:
-          Added git
-
-Tue Jul  5 10:30:18 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/templates/gnu.mpd:
-          Removed cidlc, that got removed years ago
-
-Fri Jul  1 11:08:06 UTC 2011  Steve Huston  <shuston@riverace.com>
-
-        * tests/bug_3974_Regression_Test.cpp: Return the correct value from
-          the test. Thanks to Johnny for picking this up.
-
-Fri Jul  1 10:28:10 UTC 2011  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/config-freebsd.h:
-          Added missing ACE_HAS_XPG4_MULTIBYTE_CHAR. Should also resolve
-          CDR stream op compile problems.
-
-Fri Jul  1 10:01:54 UTC 2011  Olli Savia  <ops@iki.fi>
+        * ace/TTY_IO.h:
+          Doxygen fix
 
         * ace/config-linux.h:
-          Reverted __ACE_INLINE__ removal.
-
-Fri Jul  1 09:31:38 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-openvms.h:
-          Readded OpenVMS socket buffer size limit
-
-Fri Jul  1 08:46:30 UTC 2011  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/config-qnx.h:
-        * ace/config-sunos5.5.h:
-          Added ACE_LACKS_STD_WSTRING to remedy compile problems with new
-          CDR stream ops in TAO.
-
-Wed Jun 29 20:47:33 UTC 2011  Steve Huston  <shuston@riverace.com>
-
-        * ace/Select_Reactor_T.cpp:
-        * ace/TP_Reactor.cpp:
-        * ace/Dev_Poll_Reactor.cpp:
-        * ace/WFMO_Reactor.cpp:
-          In handle_events(), if returning -1 because the reactor isn't
-          ready to handle events, also set errno to ESHUTDOWN to tell the
-          caller why. Fixes Bugzilla #3974.
-
-        * tests/Bug_3974_Regression_Test.cpp:
-        * tests/tests.mpc:
-        * tests/run_test.lst:
-          New test for the above problem/fix.
-
-Wed Jun 29 10:38:02 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Thread_Manager.cpp:
-          Fixed compile error in some environments
-
-Wed Jun 29 07:56:54 UTC 2011  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/config-lynxos.h:
-          Added ACE_LACKS_STD_WSTRING to remedy compile problems with new
-          CDR stream ops in TAO.
-
-Thu Jun 23 14:51:19 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/CE_Screen_Output.h:
-        * ace/Log_Msg.cpp:
-        * netsvcs/clients/Logger/direct_logging.cpp:
-        * netsvcs/clients/Logger/indirect_logging.cpp:
-        * netsvcs/lib/Base_Optimizer.h:
-        * netsvcs/lib/Base_Optimizer.cpp:
-        * netsvcs/lib/Client_Logging_Handler.cpp:
-        * netsvcs/lib/Log_Message_Receiver.h:
-        * netsvcs/lib/Log_Message_Receiver.cpp:
-        * netsvcs/lib/Server_Logging_Handler.cpp:
-        * netsvcs/lib/Server_Logging_Handler_T.cpp:
-        * netsvcs/lib/TS_Clerk_Handler.cpp:
-        * netsvcs/lib/TS_Server_Handler.cpp:
-        * netsvcs/lib/Time_Request_Reply.cpp:
-        * netsvcs/lib/lib.mpc:
-        * netsvcs/servers/README:
-        * netsvcs/servers/main.cpp:
-          Layout and typo fixes
-
-Thu Jun 23 14:29:08 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/bczar/bczar.html:
-          libtool
-
-        * bin/diff-builds-and-group-fixed-tests-only.sh:
-        * docs/Download.html:
-          Make x.0.3 available
-
-Thu Jun 23 12:39:08 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * etc/*.doxygen
-          Disable html help, seems doxygen now disables the search option
-          when html help is enabled
-
-Thu Jun 23 13:46:08 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE version 6.0.3 released.
-
-Wed Jun 22 18:01:15 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * Basic_Types.h:
-        * CDR_Base.cpp:
-        * CDR_Base.h:
-        * config-win32-mingw.h:
-
-          Reverted all changes made related to support for long double
-          constants in IDL.
-
-Tue Jun 21 18:14:46 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ace/Basic_Types.h:
-
-          Fixed typo in ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII
-          decision tree. Thanks to Phil Mesnier <mesnier_p@ociweb.com>
-          for his help in connecting it to scoreboard warnings.
-
-Mon Jun 20 17:39:01 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ace/Basic_Types.h:
-
-          Another tweak to ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII's
-          logic aimed at warnings on FC6, FC8, FC12, and FC15.
-
-Mon Jun 20 17:17:26 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ace/config-win32-mingw.h:
-        * ace/Basic_Types.h:
-
-          - Moved the definition of ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII
-            to the MinGW config file.
-
-          - Added #define ACE_CDR_IMPLEMENT_WITH_NATIVE_DOUBLE 1 to
-            the MinGW config file, so that, for generated IDL long
-            double constants, the argument will agree with the
-            print format string. MinGW doesn't support long double
-            in the print format.
-
-Fri Jun 17 16:48:29 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ace/Basic_Types.h:
-
-          Another tweak to ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII's
-          conditional definition to eliminate warnings on FC12
-          and FC15.
-
-Fri Jun 17 12:48:31 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ace/Basic_Types.h:
-
-          Removed the 'L' from the version of
-          ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII targeted at MinGW
-          platforms. That platform apparently doesn't support that
-          part of the C print format spec.
-
-Thu Jun 16 13:31:16 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ace/Basic_Types.h:
-
-          Changed the logic of what ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII
-          expands to in order to eliminate warnings on FC6 and FC8.
-
-Wed Jun 15 13:10:40 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ace/Basic_Types.h:
-
-          Added a special version of ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII
-          for MinGW32, which seems to diverge from other platforms in how
-          it conforms to the printf print format.
-
-Fri Jun 10 19:05:30 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ace/Basic_Types.h:
-
-          Added #define of ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII
-          to make generation of a long double literal by the TAO IDL
-          compiler more portable.
-
-Fri Jun 10 12:58:49 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * ChangeLog:
-          Fuzz. Removed tab.
-
-Thu Jun  9 01:16:23 UTC 2011  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/RB_Tree.cpp: Fixed overly long ACE_TRACE string literals
-          that were split across lines.  Thanks to Espen Harlinn <espen at
-          harlinn dot no> for reporting this.
-
-Wed Jun  8 21:05:56 UTC 2011  Adam Mitz  <mitza@ociweb.com>
-
-        * bin/fuzz.pl:
-
-          Switch from cvs to svn for the -m option that checks only modified
-          files.  We haven't used cvs for some time now.
-
-Tue Jun  7 20:45:56 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/CDR_Base.h:
-
-          The inline function needs to be static to match the semantics of
-          a struct constructor when the environment has native long
-          doubles.
-
-Tue Jun  7 18:20:36 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ace/CDR_Base.h:
-
-          Added an inline function called LongDoubleAssign tha works
-          as an alternative to the struct constructor of the same
-          name when a 16-byte native long double exists and the struct
-          is not defined. Thanks again to Adam Mitz <mitza at ociweb dot com>
-          for the idea.
-
-Mon Jun  6 22:17:26 UTC 2011  Adam Mitz  <mitza@ociweb.com>
-
-        * ace/CDR_Base.h:
-
-          The struct just added by Jeff also needs the export macro.
-
-Mon Jun  6 19:51:27 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ace/CDR_Base.cpp:
-        * ace/CDR_Base.h:
-
-          Added a struct LongDoubleAssign which inherits from LongDouble,
-          and contains the assignment operator and constructors, as well
-          as a cast operator to LongDouble. This scheme allows generated
-          code to use the LongDouble struct (when no 16-byte native long
-          double exists) as a member in C++ unions, and to be initialized
-          (when it appears as a constant) with the default copy constructor
-          from LongDouble, converted from the supplied LongDoubleAssign,
-          which is in turn initialized from the rhs literal. Thanks to
-          Adam Mitz <mitza at ociweb dot com> for the LongDoubleAssign
-          suggestion to work around the C++ union restriction.
-
-Mon Jun  6 16:59:29 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/Download.html:
-          Fixed typo
-
-        * include/makeinclude/platform_g++_common.GNU:
-          Added support for c++0x, adding this to your platform_macros.GNU
-          enables the g++ c++0x extensions
-
-Mon Jun  6 13:44:14 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp:
-          Fixed gcc 4.6 warning.
-
-Fri Jun  3 18:46:50 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ace/CDR_Base.h:
-
-          Made the ACE_CDR::LongDouble struct constructor from native
-          long double explicit, which eliminates compiler ambiguities
-          when the struct's '==' and '!=' operators are used with
-          a native long double rhs.
-
-Wed Jun  1 19:30:44 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ace/CDR_Base.cpp:
-        * ace/CDR_Base.h:
-
-          To the struct ACE_CDR::LongDouble, used for platforms with
-          a native long double that isn't 16 bytes, added an
-          assignment operator and a constructor. The former is for
-          internal use by the IDL compiler, and the latter is for
-          code generation for long double constants. For types
-          using the non-native struct, a const declaration is
-          impossible to initialize by assignment to a literal,
-          so a constructor is generated instead.
-
-Wed Jun  1 10:17:33 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * bin/fuzz.pl:
-          Fixed typo.
-
-Wed Jun  1 05:53:10 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * examples/APG/Naming/Temperature_Monitor2.cpp:
-        * examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp:
-        * tests/Bug_3943_Regression_Test.cpp:
-        * tests/Proactor_UDP_Test.cpp:
-          Resolved gcc 4.6 warning: variable was set but not used.
-
-Tue May 31 09:16:33 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/Download.html:
-          OBS now stands for Open Build Service
-
-Tue May 31 07:13:01 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * ACEXML/examples/SAXPrint/main.cpp:
-          Fixed compile error.
-
-Mon May 30 18:44:55 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACEXML/examples/SAXPrint/main.cpp:
-          Fixed gcc 4.6 warning
-
-        * docs/bczar/bczar.html:
-          Added some more packages
-
-Fri May 27 14:44:01 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * tests/Bug_2653_Regression_Test.cpp:
-        * tests/Compiler_Features_12_Test.cpp:
-        * tests/Reference_Counted_Event_Handler_Test.cpp:
-          Resolved gcc 4.6 warning: variable was set but not used.
-
-Fri May 27 09:49:56 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp:
-          Made changes to satisfy Coverity and the GNU 4.6 gcc compiler.
-          fgets returns a void*. This is stored in dummy. We use
-          ACE_UNUSED_ARG to fool the 4.6 gcc compiler.
-
-Thu May 26 14:27:50 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp:
-          Resolved gcc 4.6 warning: variable was set but not used.
-
-Thu May 26 14:11:57 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp:
-          Resolved gcc 4.6 warning: variable was set but not used.
-
-Thu May 26 11:39:54 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/bczar/bczar.html:
-          Added a yum install with all packages you could need on FC
-
-Thu May 26 13:09:50 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * tests/Compiler_Features_10_Test.cpp:
-          Resolved coverity warnings.
-
-Mon May 23 07:55:41 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
-        * tests/QtReactor_Test.h:
-        * tests/QtReactor_Test.cpp:
-        Changed deprecated qt4 functions and includes.
-
-Mon May 23 07:10:41 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/APG/Naming/Name_Binding.h:
-        * netsvcs/lib/Client_Logging_Handler.cpp:
-          Fixed incorrect delete
-
-Mon May 23 06:55:37 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/APG/Streams/MessageInfo.h:
-          Pass argument as const& to fix Coverity error
-
-        * protocols/ace/INet/BidirStreamBuffer.h:
-        * protocols/ace/INet/BufferedStreamBuffer.h:
-        * protocols/ace/INet/HTTP_BasicAuthentication.cpp:
-        * protocols/ace/RMCast/Link.cpp:
-          Fixed memory leaks, thanks to Max Zhou <earthdog at 126 dot com>
-          for creating the patch, this fixes bugzilla 3959
-
-Fri May 20 22:17:29 UTC 2011  Adam Mitz  <mitza@ociweb.com>
-
-        * bin/MakeProjectCreator/config/ace_qt4reactor.mpb:
-
-          Assignment to "after" must match the target MPC project name.
-
-Thu May 12 18:08:47 UTC 2011  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/wrapper_macros.GNU: Added command settings for
-          preprocessing C and C++ source files.
-
-        * include/makeinclude/rules.local.GNU: Added rules to preprocess
-          C and C++ files when directed.
-
-          These allow one to now quickly produce a preprocessed version of
-          a source file. Ala... make -f GNUmakefile.ACE ACE.i
-          would preprocess ACE.cpp and put the result in ACE.i.
-
-Thu May 12 01:04:19 UTC 2011   Chad Beaulac  <chad.beaulac@objectivesolutions.com>
-        * tests/Bug_3912_Regression_Test.cpp:
-          Integrated changes from Phil Mesnier.
-          Added static_cast and const_cast instead of C-style casts.
-
-Wed May 11 18:26:28 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Thread_Control.h:
-        * ace/Thread_Control.cpp:
-        * ace/Thread_Hook.h:
-        * ace/Thread_Hook.cpp:
-        * apps/gperf/src/Options.cpp:
-          Doxygen changes
-
-Wed May 11 13:41:28 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
-        * ace/QtReactor/QtReactor.h:
-          Changed for QT4 deprecated include QT/..
-
-Wed May 11 12:45:21 UTC 2011  Chad Beaulac  <chad.beaulac@objectivesolutions.com>
-
-        * tests/Bug_3912_Regression_Test.cpp:
-          Returning a value from close now.
-
-        * tests/tests.mpc:
-          Removed libs Stream_Config_Stream_DLL.
-          It's dynamically loaded by the ASR.
-
-Tue May 10 11:59:32 UTC 2011  Chad Beaulac  <chad.beaulac@objectivesolutions.com>
-
-        * ace/Stream.cpp:
-        * tests/Bug_3912_Regression_Test.cpp:
-        * tests/Bug_3912_Regression_Test.conf:
-          Fixed FUZZ whitespace and Id
-
-Mon May  9 19:09:35 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Dump.h:
-        * ace/FIFO.cpp:
-        * ace/Filecache.cpp:
-        * ace/Svc_Conf.y:
-        * ace/Svc_Conf_y.cpp:
-          Fixed coverity errors
-
-Sun May  8 17:57:50 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/ETCL/ETCL_Constraint.h:
-        * ace/ETCL/ETCL_Constraint.inl:
-          Fixed coverity errors
-
-Thu May  5 21:38:45 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * ace/Select_Reactor_T.cpp:
-
-          Added a reset of errno during the ctor in case there was an
-          error during the first attempt at opening the reactor. Turns out
-          that in this case on at least on Linux, the errno leaks through
-          the second, good call to open. This can happen for example, when
-          ACE::max_handles() is less than the select reactor's DEFAULT_SIZE.
-          Since all this happens in a ctor, there's no result value for
-          application code to check, apart from errno.
-
-Wed May  4 15:07:46 UTC 2011  Chad Beaulac <chad.beaulac@objectivesolutions.com>
-
-          * ace/Stream.cpp:
-          Modified ACE_Stream::remove(name,flags) so close
-          is always called on the module that's removed regardless of the
-          flags. Close needs to be called to ensure proper lifecycle
-          management when the ACE_Service_Repository shuts down in its
-          fini method.  Bugzilla #3912
-
-        * tests/Bug_3912_Regression_Test.conf:
-        * tests/Bug_3912_Regression_Test.cpp:
-        * tests/run_test.lst
-        * tests/test.mpc
-          Added test to assert that close is called.
-
-Fri Apr 29 14:01:29 UTC 2011  Steve Huston  <shuston@riverace.com>
-
-        * tests/tests.mpc: For Message_Queue_Test add -bmaxdata:0x20000000 to
-          linker options to extend the available data space at run time.
-          Avoids the heap smashing the stacks.
-
-Fri Apr 29 06:39:06 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * bin/fuzz.pl:
-          Exclude *.WCHAR_T.conf and *.UTF-16.conf files from $Id check.
-          These files are not UTF-8 format and cannot be read by perl.
-
-Thu Apr 28 06:39:25 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * rpmbuild/ace-tao.spec:
-          Disable inlining
-
-Wed Apr 27 13:33:43 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-visualage.h:
-          Removed this file, includes only non existent files
-
-Wed Apr 27 11:02:59 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Time_Value.inl:
-        * ace/Time_Value.cpp:
-          Corrected some casts to use time_t
-
-Wed Apr 27 09:01:11 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * rpmbuild/ace-tao.spec:
-          Improved this file
-
-Tue Apr 26 09:38:05 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * rpmbuild/ace-tao.spec:
-          Improved this file
-
-Tue Apr 26 08:17:40 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * rpmbuild/ace-tao.spec:
-          Improved this file
-
-Sat Apr 23 12:31:28 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Stream.cpp:
-          Fixed incorrect ACE_NEW_RETURN macro
-
-Fri Apr 22 19:05:19 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/ACE.cpp (strnew):
-          Removed null check, ACE_NEW_RETURN already does that
-
-Fri Apr 22 15:19:29 UTC 2011  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/platform_aix_ibm.GNU: Add support for XL C++ 11.
-
-Fri Apr 22 12:43:18 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * protocols/tests/HTBP/HTBP_Config.conf:
-        * protocols/tests/HTBP/Reactor_Tests/inside.conf:
-        * tests/Service_Config_Test.WCHAR_T.conf:
-          Fuzz: Added $Id string
-
-Fri Apr 22 11:16:57 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * rpmbuild/ace-tao.spec:
-          Removed autoconf support
-
-Fri Apr 22 07:25:57 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * ace/MMAP_Memory_Pool.cpp:
-        * ace/OS_NS_stdlib.cpp:
           Layout changes
 
-        * Kokyu/tests/DSRT_MIF/svc.conf:
-        * apps/Gateway/Gateway/svc.conf:
-        * apps/Gateway/Peer/svc.conf:
-        * apps/JAWS/server/svc.conf:
-        * apps/JAWS3/jaws3/jaws.conf:
-        * apps/JAWS3/small/jaws.conf:
-        * apps/JAWS3/small/svc.conf:
-        * examples/APG/Logging/client.conf:
-        * examples/APG/Logging/logging_strategy.conf:
-        * examples/APG/Logging/server.conf:
-        * examples/APG/Naming/svc.conf:
-        * examples/APG/Svc_Config/svc.conf.dynamic:
-        * examples/APG/Svc_Config/svc.conf.static:
-        * examples/ASX/CCM_App/svc.conf:
-        * examples/C++NPv2/svc.conf:
-        * examples/Service_Configurator/IPC-tests/server/svc.conf:
-        * examples/Service_Configurator/Misc/svc.conf1:
-        * examples/Service_Configurator/Misc/svc.conf2:
-        * netsvcs/clients/Naming/Client/svc.conf:
-        * netsvcs/clients/Naming/Client/svc2.conf:
-        * netsvcs/servers/svc.conf:
-        * performance-tests/Synch-Benchmarks/svcconf/perf_t1.conf:
-        * performance-tests/Synch-Benchmarks/svcconf/perf_t16.conf:
-        * performance-tests/Synch-Benchmarks/svcconf/perf_t2.conf:
-        * performance-tests/Synch-Benchmarks/svcconf/perf_t32.conf:
-        * performance-tests/Synch-Benchmarks/svcconf/perf_t4.conf:
-        * performance-tests/Synch-Benchmarks/svcconf/perf_t64.conf:
-        * performance-tests/Synch-Benchmarks/svcconf/perf_t8.conf:
-        * performance-tests/Synch-Benchmarks/svcconf/svc.conf:
-        * protocols/tests/HTBP/HTBP_Config.conf:
-        * protocols/tests/HTBP/Reactor_Tests/inside.conf:
-        * rpmbuild/etc/tao/tao-cosconcurrency.conf:
-        * rpmbuild/etc/tao/tao-cosevent.conf:
-        * rpmbuild/etc/tao/tao-cosnaming.conf:
-        * rpmbuild/etc/tao/tao-cosnotification.conf:
-        * rpmbuild/etc/tao/tao-costrading.conf:
-        * rpmbuild/etc/tao/tao-rtevent.conf:
-        * tests/Bug_3334_Regression_Test.conf:
-        * tests/Service_Config_Stream_Test.conf:
-        * tests/Service_Config_Test.UTF-16.conf:
-        * tests/Service_Config_Test.conf:
-        * tests/Service_Config_Test.conf.xml:
-        * tests/UNIXclerk.conf:
-        * tests/UNIXserver.conf:
-        * tests/UNIXtokens.conf:
-        * tests/Win32clerk.conf:
-        * tests/Win32server.conf:
-        * tests/Win32tokens.conf:
-          Fuzz: Added $Id string.
-
-Thu Apr 21 12:25:13 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/fuzz.pl:
-          Check *.conf files for an Id tag
-
-Thu Apr 21 08:16:01 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tests/Cached_Accept_Conn_Test.h:
+        * tests/Cached_Accept_Conn_Test.cpp:
+        * tests/MEM_Stream_Test.cpp:
+        * tests/QtReactor_Test.cpp:
+          Layout changes and removed some ACE_UNUSED_ARG usage
 
-        * include/makeinclude/platform_macosx.GNU:
-        * include/makeinclude/platform_macosx_common.GNU:
-          Cleanup
+Mon Dec  5 11:25:31 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * include/makeinclude/platform_macosx_lion.GNU:
-          Fixed comment
+        * bin/cleanbuilds.sh:
+        * bin/mail_test_stats.sh:
+          Extended our daily test stats with another email, the failing tests
+          for today excluding the not fixed ones
 
-Wed Apr 20 11:29:35 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Dec  5 08:35:54 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * bin/MakeProjectCreator/config/gnuace.features:
-          Don't set ndds default to 1, reduced size of release and makes it
-          possible to support more dds vendors
+        * docs/Download.html:
+          Release has vc9/vc10
 
-Wed Apr 20 10:27:42 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Dec  5 08:22:11 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * bin/diff-builds-and-group-fixed-tests-only.sh:
         * docs/Download.html:
         * etc/index.html:
-          Make x.0.2 available
-
-        * html/Stats/index.shtml:
-          Removed cell xampler
-
-Wed Apr 20 08:53:55 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * apps/gperf/src/Gen_Perf.cpp:
-          Fixed coverity errors
-
-        * bin/fuzz.pl:
-          Extended fuzz
-
-        * bin/generate_rel_manpages:
-          Removed obsolete make steps
+          Made 6.0.6 publicly available
 
         * docs/bczar/bczar.html:
-          zip should also be available
-
-        * tests/Env_Value_Test.cpp:
-        * tests/Reactor_Fairness_Test.cpp:
-          Layout changes
-
-Wed Apr 20 09:52:52 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE version 6.0.2 released.
+          Updated for next release and added wget step to get subversion config
+          file to make sure we checkout using commit timestamps
 
 Local Variables:
 mode: change-log
diff --git a/ACE/ChangeLogs/ChangeLog-2011b b/ACE/ChangeLogs/ChangeLog-2011b
new file mode 100644
index 00000000000..1a24061878c
--- /dev/null
+++ b/ACE/ChangeLogs/ChangeLog-2011b
@@ -0,0 +1,1550 @@
+Sun Dec 04 11:51:30 CET 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ACE version 6.0.6 released.
+
+Fri Dec  2 10:07:48 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * ace/Countdown_Time.h:
+        * ace/Countdown_Time.inl:
+        * ace/Countdown_Time.cpp:
+        * ace/Timer_Queue_T.h:
+        * ace/Timer_Queue_T.inl:
+        
+          Reverting timer changes to be replaced by better and more
+          flexible changes after the coming release.
+
+Tue Nov 29 19:28:56 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Countdown_Time.h:
+        * ace/Countdown_Time.cpp:
+          Use default value for constructor reducing the number of constructors
+
+Tue Nov 29 15:50:06 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * ace/Timer_Queue_T.h:
+        * ace/Timer_Queue_T.inl:
+
+          Added get_timer_method() to be able reuse timer method
+          setting.
+
+        * ace/Countdown_Time.h:
+        * ace/Countdown_Time.inl:
+        * ace/Countdown_Time.cpp:
+
+          Added option to use application defined timer like
+          timer queue.
+
+Mon Nov 28 14:29:45 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Log_Msg.h:
+          Doxygen change
+
+        * include/makeinclude/wrapper_macros.GNU:
+          S.inl files are not generated anymore
+
+Wed Nov 23 07:39:56 UTC 2011  Olli Savia  <ops@iki.fi>
+
+        * ace/Time_Value.inl:
+          Added a workaround for GCC 3.4 'internal compiler error' issue.
+
+Fri Nov 18 03:54:50 UTC 2011  James H. Hill  <hillj at cs dot iupui dot edu>
+
+        * bin/PerlACE/Process_Win32.pm:
+
+          Fixed fuzz errors.
+
+Mon Nov 14 06:02:05 UTC 2011  James H. Hill  <hillj at cs dot iupui dot edu>
+
+        * bin/PerlACE/Process_Win32.pm:
+
+          Bug fix where the script failed it File::Which is not installed
+          on the target machine. The script will search the PATH if File::Which
+          is installed on the host machine.
+
+Wed Nov  9 23:30:30 UTC 2011  James H. Hill  <hillj at cs dot iupui dot edu>
+
+        * bin/ChangeLogEditor/FileLocatorFactory.pm:
+        * bin/PerlACE/Process_Win32.pm:
+
+          Fixed fuzz errors related to trailing whitespaces.
+
+Tue Nov  8 18:58:36 UTC 2011  James H. Hill  <hillj at cs dot iupui dot edu>
+
+        * bin/ChangeLogEditor/FileLocatorFactory.pm:
+
+          Implemented a utility function that searches the parent
+          directory for the specified directory. This is necessary
+          because the SVN 1.7.x client does not store .svn directories
+          in the child directory anymore. Instead, the root directory
+          of the checkout contains the .svn directory. Now, the SVN
+          locator will search all parent directories to determine if
+          it the SCM is a SVN sandbox.
+
+        * bin/PerlACE/Process_Win32.pm:
+
+          Updated the Executable() subroutine such that if the full
+          or relative path of the executable is not specified, then
+          it will try to resolve the location of the executable using
+          the PATH.
+
+Sat Oct 22 02:06:37 UTC 2011  Abdullah Sowayan  <sowayan@gmail.com>
+
+        * include/makeinclude/platform_macosx_common.GNU:
+
+          Added missing:
+          DCCFLAGS += -g
+
+          From the file. Thanks to William R. Otte  <wotte@dre.vanderbilt.edu>
+          for pointing this out.
+
+Fri Oct 21 23:35:30 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * ace/Time_Value.inl:
+
+          Changed the operator comparing __builtin_constant_p to be a
+          bitwise (&) instead oflogical and (&&) to address a warning from the
+          LLVM compiler.  In this case, the result of the two operators is
+          logically equivalent.  Thanks to Abdullah Sowayan <sowayan@gmail.com>
+          for reporting the issue.
+
+Fri Oct 21 11:26:49 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * examples/Misc/test_trace.cpp:
+          Fixed compile issue in case all logging is turned off.
+
+Thu Oct 20 10:41:44 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/Download.html:
+          Added links to the OBS projects, thanks to John Fletcher for providing
+          this update
+
+Tue Oct 20 09:30:13 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        Merged changes from Remedy work branch.
+
+        === start changelog ===
+
+        Tue Oct 18 09:23:13 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+                * bin/MakeProjectCreator/config/global.features:
+                Add ccm_direct_collocation
+
+        Wed Oct 12 13:08:13 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * bin/MakeProjectCreator/config/crosscompile.mpb:
+                  Fixed install issues.
+
+                * bin/mwc.pl:
+                  Removed unnecessary STDERR.
+
+        === end changelog ===
+
+Thu Oct 20 06:57:38 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * *.*:
+          Removed autoconf support due to lack of resources/funding to
+          get autoconf really working. It now only causes confusions and
+          not working configurations for users.
+
+Wed Oct 19 19:13:38 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * bin/MakeProjectCreator/config/global.features:
+          disable openmp by default.
+
+        * include/makeinclude/platform_clang_common.GNU:
+        * include/makeinclude/platform_g++_common.GNU:
+          add flags for openmp.
+
+Wed Oct 19 09:56:20 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * rpmbuild/ace-tao.spec:
+          Removed not needed setting of inline
+
+Mon Oct 17 20:40:35 UTC 2011  Abdul Sowayan  <sowayan@gmail.com>
+
+        * include/makeinclude/platform_macosx_iOS.GNU:
+
+          Minor enhancements to this file to make ACE/TAO compile again.
+
+Sat Oct 15 00:57:11 UTC 2011  Abdullah Sowayan  <sowayan@gmail.com>
+
+        * ace/config-macosx-lion.h:
+        * include/makeinclude/platform_macosx_lion.GNU:
+
+          Minor enhancements to the files above.
+
+Mon Oct 10 12:13:52 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * protocols/ace/INet/ClientRequestHandler.h:
+        * protocols/ace/INet/HTTP_ClientRequestHandler.h:
+        * protocols/ace/INet/URLBase.h:
+          Always export, should solve SLE9 issues
+
+Mon Oct 10 11:16:58 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/Download.html:
+          Make x.0.5 public
+
+Mon Oct 10 11:16:58 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/diff-builds-and-group-fixed-tests-only.sh:
+          Updated for next release
+
+        * bin/make_release.py:
+          Next time we don't ship vc8 anymore
+
+        * docs/bczar/bczar.html:
+          Make x.0.5 public
+
+        * etc/index.html:
+          Make x.0.5 public
+
+Mon Oct 10 08:48:51 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ACE version 6.0.5 released.
+
+Sat Oct  8 09:00:00 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * ACEXML/examples/SAXPrint/namespaces.xml:
+        * ACEXML/examples/SAXPrint/ns.svc.conf.xml:
+        * ACEXML/examples/SAXPrint/simple.svcconf.xml:
+        * ACEXML/examples/SAXPrint/svc.conf.xml:
+          XML does not allow anything before the xml-tag.
+
+Fri Oct  7 09:45:31 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * ACEXML/docs/TODO.txt:
+        * ACEXML/docs/bugs.txt:
+        * ASNMP/tests/run_tests.sh:
+          Fuzz
+
+Fri Oct  7 09:10:55 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * ACEXML/docs/readme.txt:
+        * ASNMP/README:
+        * Kokyu/README:
+        * bin/LabVIEW_RT/README:
+        * bin/PerlACE/README:
+        * contrib/FaCE/README:
+        * examples/C++NPv1/README:
+        * examples/C++NPv2/README:
+        * examples/IPC_SAP/SSL_SAP/README:
+        * examples/Semaphores/README:
+        * html/README:
+        * netsvcs/lib/README:
+        * performance-tests/README:
+        * performance-tests/RPC/README:
+        * performance-tests/Synch-Benchmarks/Perf_Test/README:
+        * performance-tests/Synch-Benchmarks/README:
+        * performance-tests/Synch-Benchmarks/Synch_Lib/README:
+        * performance-tests/TCP/README:
+        * performance-tests/TTCP/C/README:
+        * performance-tests/UDP/README:
+        * protocols/ace/HTBP/README:
+        * websvcs/README:
+          Fuzz: No id-tags. Also uniform way of declaring the Id-tags
+
+Fri Oct  7 07:48:32 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * ACEXML/examples/SAXPrint/broken.xml:
+        * ACEXML/examples/SAXPrint/namespaces.xml:
+        * ACEXML/examples/SAXPrint/ns.svc.conf.xml:
+        * ACEXML/examples/SAXPrint/simple.svcconf.xml:
+        * ACEXML/examples/SAXPrint/svc.conf.xml:
+        * Kokyu/tests/DSRT_MIF/svc.conf.xml:
+        * examples/ASX/CCM_App/svc.conf.xml:
+        * netsvcs/servers/svc.conf.xml:
+        * tests/Service_Config_Test.conf.xml:
+          Fuzz: No Id-tags.
+
+Thu Oct  6 12:01:30 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * netsvcs/README:
+        * netsvcs/clients/Logger/README:
+        * netsvcs/clients/README:
+        * netsvcs/clients/Tokens/README:
+        * netsvcs/clients/Tokens/collection/README:
+        * netsvcs/clients/Tokens/deadlock/README:
+        * netsvcs/clients/Tokens/invariant/README:
+        * netsvcs/clients/Tokens/manual/README:
+        * netsvcs/clients/Tokens/mutex/README:
+        * netsvcs/lib/README:
+        * netsvcs/servers/README:
+          Fuzz: trailing whitespaces, tab characters and ID strings
+
+Thu Oct  6 11:56:19 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * README:
+        * examples/Connection/non_blocking/README:
+        * examples/IPC_SAP/DEV_SAP/README:
+        * examples/IPC_SAP/SOCK_SAP/README:
+        * examples/IPC_SAP/SSL_SAP/README:
+        * examples/Log_Msg/Log_Msg_MFC/README:
+        * examples/Log_Msg/README:
+        * examples/Logger/README:
+        * examples/README:
+        * examples/Reactor/Ntalker/README:
+        * examples/Reactor/README:
+        * examples/Reactor/TP_Reactor/README:
+        * examples/Service_Configurator/Misc/README:
+        * examples/Synch/README:
+        * examples/System_V_IPC/README:
+        * examples/Timer_Queue/README:
+          Fuzz: trailing whitespaces, tab characters and ID strings
+
+Mon Oct  3 06:30:57 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Dev_Poll_Reactor.h:
+          Doxygen improvements
+
+Fri Sep 30 14:03:58 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/fuzz.pl:
+          Check more filetypes for id tag
+
+        * docs/bczar/bczar.html:
+          Added some more packages
+
+Thu Sep 29 01:58:23 UTC 2011  Abdullah Sowayan  <sowayan@gmail.com>
+
+        * include/makeinclude/platform_macosx_lion.GNU:
+
+          LLVM is the default compiler on Lion for now on.
+
+Fri Sep 23 12:45:47 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * bin/PerlACE/TestTarget.pm:
+        * bin/PerlACE/TestTarget_Android.pm:
+          Created a special method for the ADB timeout environment
+          variable.
+
+Fri Sep 23 09:25:04 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * bin/PerlACE/TestTarget_Android.pm:
+          Stop the script when an emulator times out.
+
+Wed Sep 14 07:54:28 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/PerlACE/TestTarget_Android.pm:
+          Adding of libpath is only needed for non static builds
+
+Tue Sep 13 08:12:40 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/TestTarget.pm:
+          Added DOC_TEST_DEFAULT, this controls the default platform
+          for all platform instead of defaulting to localhost
+
+Tue Sep 13 08:12:40 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/PerlACE/ProcessAndroid.pm:
+          Don't delete executable after each run
+
+Mon Sep 12 12:55:58 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * ACE-INSTALL.html:
+          Made some minor modification to the Android section.
+
+Mon Sep 12 11:16:53 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-android.h:
+          Android doesn't have icmp support
+
+        * docs/bczar/bczar.html:
+          Added telnet
+
+Sun Sep 11 18:11:08 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/PerlACE/ProcessAndroid.pm:
+          Don't copy any log files here, that has to be done in the test
+          script
+
+        * tests/run_test.pl:
+          Get the log file from the target before analyzing it
+
+Sun Sep 11 18:02:08 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/PerlACE/ProcessAndroid.pm:
+          Fixed executable method
+
+Fri Sep  9 21:34:26 UTC 2011  Adam Mitz  <mitza@ociweb.com>
+
+        * bin/PerlACE/Process_Win32.pm:
+
+          Fixed a bug introduced in the previous commit to this file:
+          Thu Sep  8 08:14:46 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+          The bug prevented any tests from running on Win32.
+
+Fri Sep  9 19:31:43 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/PerlACE/ProcessAndroid.pm:
+        * bin/PerlACE/TestTarget_Android.pm:
+          Added PutFile for the TestTarget
+
+Fri Sep  9 19:19:22 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/PerlACE/ProcessAndroid.pm:
+        * bin/PerlACE/TestTarget_Android.pm:
+          Don't copy all config files, if we need files on a target, the test
+          script should copy them
+
+Fri Sep  9 19:15:28 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/PerlACE/TestTarget_Android.pm:
+          Try to kill emulator and emulator-arm
+
+Fri Sep  9 11:26:45 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_android.GNU:
+          Android doesn't have rwho
+
+Fri Sep  9 07:19:00 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/CDR_Stream.h:
+          Doxygen changes
+
+        * include/makeinclude/platform_android.GNU:
+          Prevent flags being listed twice
+
+Thu Sep  8 17:48:53 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/OS_NS_stdlib.cpp:
+          Fixed compile warnings
+
+        * ace/OS_NS_Thread.inl:
+          Added check for ACE_LACKS_CONDATTR
+
+        * ace/Mem_Map.cpp:
+          When ACE_MMAP_NO_ZERO is defined, when the length if zero we
+          default to the pagesize
+
+Thu Sep  8 17:46:28 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-android.h:
+          Further cleanup and improvements
+
+Thu Sep  8 17:32:48 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/TP_Reactor.h:
+          Typo fixed
+
+        * ace/Process_Manager.cpp:
+          Layout changes
+
+        * ace/config-sunos5.5.h:
+          Removed old comment
+
+        * ace/Signal.h:
+          Doxygen cleanup
+
+        * ace/OS_NS_errno.inl:
+          Const changes
+
+        * ace/OS_NS_errno.h:
+          Only define ACE_ERRNO_TYPE when it is not defined yet, that way we
+          can just set it in config-android.h
+
+        * ace/config-android.h:
+          Cleanup and set various defines needed to get correct runtime
+          behavior
+
+        * bin/PerlACE/Process_VMS.pm:
+          Chorus support removal
+
+        * bin/PerlACE/README:
+          Layout changes
+
+        * include/makeinclude/platform_android.GNU:
+          Further cleanup
+
+Thu Sep  8 17:20:26 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_android.GNU:
+          Fixed warning about not recognized --version
+
+Thu Sep  8 17:16:26 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ACE-INSTALL.html:
+        * docs/bczar/bczar.html:
+          Another 32bit package for android
+
+        * include/makeinclude/platform_android.GNU:
+        * include/makeinclude/platform_android_linux.GNU:
+          Renamed to platform_android.GNU
+
+Thu Sep  8 13:20:55 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ACE-INSTALL.html:
+          Added another 32bit package for Android
+
+        * docs/bczar/bczar.html:
+          Added some packages
+
+Thu Sep  8 13:20:55 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ACE-INSTALL.html:
+          Documented which 32bit packages need to be installed on a 64bit
+          linux host for the Android port
+
+        * docs/bczar/bczar.html:
+          Added some packages
+
+Thu Sep  8 08:16:35 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Lib_Find.cpp:
+          Add support for ACE_DEFAULT_TEMP_DIR
+
+        * ace/MEM_Stream.h:
+          Added missing export include
+
+        * ace/OS_NS_unistd.cpp:
+          Added ACE_HAS_NONCONST_PWRITE
+
+        * ace/Select_Reactor_Base.cpp:
+          Layout change
+
+        * include/makeinclude/platform_android_linux.GNU:
+          Use ?= to make an override possible from platform_macros.GNU
+
+Thu Sep  8 08:14:46 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/PerlACE/ConfigList.pm:
+        * bin/PerlACE/Process.pm:
+        * bin/PerlACE/ProcessAndroid.pm:
+        * bin/PerlACE/ProcessLVRT.pm:
+        * bin/PerlACE/ProcessVX.pm:
+        * bin/PerlACE/ProcessVX_Unix.pm:
+        * bin/PerlACE/ProcessVX_Win32.pm:
+        * bin/PerlACE/ProcessWinCE.pm:
+        * bin/PerlACE/ProcessWinCE_Unix.pm:
+        * bin/PerlACE/Process_Unix.pm:
+        * bin/PerlACE/Process_VMS.pm:
+        * bin/PerlACE/Process_Win32.pm:
+        * bin/PerlACE/Run_Test.pm:
+        * bin/PerlACE/TestTarget.pm:
+        * bin/PerlACE/TestTarget_Android.pm:
+        * bin/PerlACE/TestTarget_LVRT.pm:
+        * bin/PerlACE/TestTarget_VxWorks.pm:
+        * bin/PerlACE/TestTarget_WinCE.pm:
+          Extensions to run automatically tests on an Android emulator
+
+Tue Sep  6 09:36:36 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * rpmbuild/ace-tao.spec:
+          Removed rnq option, that is now default, added versioned namespace
+          support
+
+Wed Aug 31 11:43:13 UTC 2011  Abdul Sowayan  <sowayan@gmail.com>
+
+        * include/makeinclude/platform_macosx_iOS.GNU:
+
+          Minor updates to this file to work with Mac OSX Lion (10.7)
+
+Wed Aug 31 11:33:39 UTC 2011  Abdul Sowayan  <sowayan@gmail.com>
+
+        * ace/config-macosx-iOS-hardware.h:
+        * ace/config-macosx-iOS-simulator.h:
+        * include/makeinclude/platform_macosx_iOS.GNU:
+
+          Renamed the files from iphone to iOS since this is what apple
+          calls the platform these days.
+
+        * ace/config-macosx-iphone-hardware.h:
+        * ace/config-macosx-iphone-simulator.h:
+        * include/makeinclude/platform_macosx_iphone.GNU:
+
+          Removed these files.
+
+Tue Aug 30 14:40:01 UTC 2011  Abdul Sowayan  <sowayan@gmail.com>
+
+        * include/makeinclude/platform_macosx_iphone.GNU:
+
+          Allow the user to specify the location of XCode. This is helpful
+          when there are multiple versions of XCode installed on the machine.
+          To specify the location of XCode, use XCODE_ROOT environment variable.
+          If XCODE_ROOT is not specified, the location of XCode is assumed to be
+          located at the default installation directory (which is /Developer).
+
+Fri Aug 26 16:02:13 UTC 2011  Abdul Sowayan  <sowayan@gmail.com>
+
+        * include/makeinclude/platform_macosx_iphone.GNU:
+
+          Switch the default compiler from GCC to Clang
+
+Fri Aug 26 15:59:19 UTC 2011  Abdul Sowayan  <sowayan@gmail.com>
+
+        * ace/config-macosx-iphone-hardware.h:
+        * ace/config-macosx-iphone-simulator.h:
+
+          Updated these files to use Mac OS-X Lion as the build host. Also, fixed
+          some minor typos.
+
+Wed Aug 24 13:06:17 UTC 2011  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Message_Block.cpp: Replaced the recursive version of
+          ACE_Message_Block::clone() with a non-recursive version to avoid
+          problems when there are large numbers of message blocks.  Thanks
+          to Andrew Metcalfe <andrew dot metcalfe at ccur dot com> for
+          reporting this and suggesting the fix, which was provided by
+          Eric Frias <efrias at syncad dot com>.
+
+Tue Aug 23 18:20:02 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * NEWS:
+          Prepared for next release
+
+        * bin/diff-builds-and-group-fixed-tests-only.sh:
+        * docs/Download.html:
+        * docs/bczar/bczar.html:
+        * etc/index.html:
+          Updated to make the new release public
+
+Tue Aug 23 19:01:44 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ACE version 6.0.4 released.
+
+Thu Aug 18 01:31:48 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ace/Message_Block.cpp:
+
+          Reverted the change from Mon Aug 15 14:41:24 UTC 2011 Douglas
+          C. Schmidt <schmidt@dre.vanderbilt.edu>. This change caused a
+          regression failure that showed up on some of the TAO tests. We
+          can try reintroducing this patch after the upcoming release.
+
+Wed Aug 17 15:01:28 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ACE-INSTALL.html:
+
+          Fix typo in SYSROOT default example.
+
+Wed Aug 17 13:54:12 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ace/Message_Block.cpp:
+
+          Unfuzz.
+
+Mon Aug 15 14:41:24 UTC 2011  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Message_Block.cpp: Replaced the recursive version of
+          ACE_Message_Block::clone() with a non-recursive version to avoid
+          problems when there are large numbers of message blocks.  Thanks
+          to Andrew Metcalfe <andrew dot metcalfe at ccur dot com> for
+          reporting this and suggesting the fix, which was provided by
+          Eric Frias <efrias at syncad dot com>.
+
+Sun Aug 14 10:44:32 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * rpmbuild/ace-tao.spec:
+          Added support for inline, thanks to Thomas Lockhart for providing
+          the patch
+
+Wed Aug 10 20:15:40 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ACE-INSTALL.html:
+        * NEWS:
+
+          Add a note about support for Android in the news, and add more
+          detail to the installation steps.
+
+Wed Aug 10 19:02:21 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ACE-INSTALL.html:
+
+          Updated the text related to installing for Android.
+
+        * include/makeinclude/platform_android_linux.GNU:
+
+          Added this file.
+
+        * include/makeinclude/platform_linux_android.GNU:
+
+          Removed this file.
+
+          Renamed the file to be consistent with others, now the name is
+          target platform first followed by the build-specific name. The
+          settings for cross compilation are now configured inside this
+          platform file, using some assumptions for architecture.
+
+          The build for the arm architecture works, but it looks like x86
+          still needs work by the NDK team, it was just added in their r6
+          release. I've submitted a bug report to the android team with a
+          suggested patch.
+
+Wed Aug 10 17:14:01 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-win32.h:
+          Removed one include too much
+
+Wed Aug 10 12:41:18 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-macros.h:
+          Enable ACE_HAS_REACTOR_NOTIFICATION_QUEUE by default, it gives
+          much better performance and also doesn't suffer the issue that them
+          reactor queue can get full
+
+Wed Aug 10 12:18:56 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Notification_Queue.inl:
+        * ace/Service_Config.h:
+          Layout changes
+
+Wed Aug 10 11:45:28 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-win32-common.h:
+        * ace/config-win32.h:
+          Moved define to the common file
+
+        * ace/config-win32-borland.h:
+          Removed support for C++ Builder, the port is broken and not maintained
+          for years.
+
+Tue Aug  9 17:28:15 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * debian/patches/series:
+          Updated because of removed files
+
+        * debian/patches/16-ace-inet-pkgconfig-files.diff:
+        * debian/patches/prevent_doxygen_ace_manpages.diff:
+          Removed these files, integrated into trunk
+
+Tue Aug  9 17:17:56 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/os_include/os_dlfcn.h:
+          Added if !defined checks around all defines in this file
+
+Mon Aug  8 21:46:01 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ace/OS_NS_time.inl:
+
+          Fix some inconsistencies in the new android-specific wrappers.
+
+        * ace/config-android.h:
+
+          Android does not supply std::wstring
+
+        * include/makeinclude/platform_linux_android.GNU:
+
+          The android supplied compiler gives a preemptive warning about
+          va_args mangling change, but I cannot find anything to change
+          in the ACE code, so I added the recommended warning suppressor.
+
+Thu Aug  4 22:11:26 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ace/config-android.h:
+
+          unfuzz.
+
+Thu Aug  4 15:03:16 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ACE-INSTALL.html:
+        * ace/OS_NS_Thread.cpp:
+        * ace/OS_NS_errno.h:
+        * ace/OS_NS_time.h:
+        * ace/OS_NS_time.inl:
+        * ace/config-linux.h:
+        * ace/config-android.h:
+        * include/makeinclude/platform_linux_android.GNU:
+
+          Added configuration files and minor changes to allow building
+          for Android using the Android Native Development Kit's standalone
+          tool chain. http://developer.android.com/sdk/ndk/index.html
+          Android is not a completely tested platform and automated testing
+          does not work for it currently. Thanks to Trevor Fields of OCI
+          for doing the heavy lifting on preparing these changes.
+
+        * examples/APG/ThreadManagement/Async_Cancel.cpp:
+        * examples/Service_Configurator/IPC-tests/client/local_dgram_client_test.cpp:
+        * examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.inl:
+        * examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.inl:
+        * examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp:
+        * examples/System_V_IPC/SV_Message_Queues/TMQ_Client.cpp:
+
+          Add wrappers necessary to get them working with Android.
+
+        * tests/Thread_Attrs_Test.cpp:
+        * tests/test_config.h:
+
+          Minor changes for running tests on Android.
+
+Sun Jul 31 11:14:23 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/generate_doxygen.pl:
+          Don't generate man pages, not used
+
+        * debian/*:
+          Pull in latest version from debian packaging
+
+        * protocols/ace/INet/ACE_INet.pc.in:
+        * protocols/ace/INet/ACE_INet_SSL.pc.in:
+        * protocols/ace/INet/inet.mpc:
+        * protocols/ace/INet/inet_ssl.mpc:
+          Added pc.in files
+
+        * etc/ace_man.doxygen:
+          Removed this file.
+
+Sat Jul 30 13:11:43 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-windows.h:
+        * ace/config-win64.h:
+          Renamed win64.h to windows.h
+
+Sun Jul 24 04:27:10 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * examples/APG/Streams/Answerer.cpp:
+
+          Fuzz fixes.
+
+Sat Jul 23 22:37:24 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ace/config-win64.h:
+        * examples/APG/Timers/PCB.cpp:
+
+          Fuzz fixes.
+
+        * bin/fuzz.pl:
+
+          Enhanced the check for ACE_TRACE messages so that it works
+          correctly with class definitions such as those found in
+          examples/APG/ThreadPools/Futures.cpp.
+
+Fri Jul 22 12:29:59 UTC 2011  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/Malloc_T.cpp: Fixed ACE_Dynamic_Cached_Allocator so that it
+          doesn't overflow.  Thanks to Qiao Zhiqiang <qiaozhiqiang at
+          leadcoretech dot com> for this fix.
+
+Fri Jul 22 12:27:16 UTC 2011  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * tests/Cached_Allocator_Test.cpp (run_main): Updated this test to
+          check that ACE_Dynamic_Cached_Allocator works properly.
+
+Wed Jul 20 23:52:46 UTC 2011  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/config-win64.h: Added this file to make it more clear how to
+          build ACE on a 64-bit Windows platform.  Thanks to Thomas Pauli
+          <thomas dot pauli at tu-dortmund dot de> for contributing this
+          fix.
+
+Mon Jul 18 11:44:16 UTC 2011  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * Happy Birthday to me ;-)
+
+Mon Jul 11 00:39:05 UTC 2011  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * examples/APG/ThreadPools/Futures.cpp (class Manager):
+        * examples/APG/Containers/Stacks.cpp (StackExample::run):
+        * examples/APG/Containers/Allocator.cpp (StackExample::run):
+        * examples/APG/Timers/PCB.cpp (PCB::handleClose): Fixed a mismatch in ACE_TRACE.
+
+Sat Jul  9 19:07:20 UTC 2011  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/RB_Tree.inl,
+          ace/Svc_Handler.cpp,
+          examples/APG/Active_Objects/AO.cpp,
+          examples/APG/Active_Objects/AO2.cpp,
+          examples/APG/Containers/Allocator.cpp,
+          examples/APG/Containers/DLList.cpp,
+          examples/APG/Containers/Hash_Map.cpp,
+          examples/APG/Containers/Hash_Map_Hash.cpp,
+          examples/APG/Containers/Map_Manager.cpp,
+          examples/APG/Containers/Map_Manager_Specialization.cpp,
+          examples/APG/Containers/Queues.cpp,
+          examples/APG/Containers/RB_Tree.cpp,
+          examples/APG/Containers/RB_Tree_Functors.cpp,
+          examples/APG/Containers/Sets.cpp,
+          examples/APG/Containers/Stacks.cpp,
+          examples/APG/Processes/Process_Manager_Death.cpp,
+          examples/APG/Processes/Process_Mutex.cpp,
+          examples/APG/Signals/SigAction.cpp,
+          examples/APG/Signals/SigHandler.cpp,
+          examples/APG/Signals/SigHandlers.cpp,
+          examples/APG/Streams/Answerer.cpp,
+          examples/APG/Streams/CommandStream.cpp,
+          examples/APG/Streams/CommandTask.cpp,
+          examples/APG/Streams/EndTask.h,
+          examples/APG/ThreadPools/Futures.cpp,
+          examples/APG/ThreadPools/LF_ThreadPool.cpp,
+          examples/APG/ThreadPools/Task_ThreadPool.cpp,
+          examples/APG/ThreadPools/ThreadPool.cpp,
+          examples/APG/Timers/Alarm.cpp,
+          examples/APG/Timers/CB.cpp,
+          examples/APG/Timers/PCB.cpp,
+          examples/APG/Timers/PTimerDispatcher.cpp,
+          examples/APG/Timers/Task.cpp,
+          examples/APG/Timers/TimerDispatcher.cpp,
+          examples/APG/Timers/Upcall.cpp,
+          examples/Reactor/TP_Reactor/ReadHandler.cpp,
+          examples/Timer_Queue/Custom_Handler.cpp,
+          netsvcs/lib/Name_Handler.cpp,
+          netsvcs/lib/Server_Logging_Handler_T.cpp,
+          netsvcs/lib/TS_Clerk_Handler.cpp,
+          netsvcs/lib/TS_Server_Handler.cpp,
+          tests/Bug_3878_Regression_Test.cpp,
+          tests/Thread_Timer_Queue_Adapter_Test.cpp: Fixed all the
+          ACE_TRACE statements similar to
+
+          ACE_TRACE( ACE_TEXT( "sometext" ) );
+
+          and
+
+          ACE_TRACE( "some"
+                     "text" );
+
+          to
+
+          ACE_TRACE( "sometext" );
+
+          Thanks to Espen Harlinn <espen at harlinn dot no> for this fix,
+          which fixes bugid 3976.
+
+Thu Jul  7 15:24:09 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Unbounded_Set_Ex.cpp:
+          Fixed compile error when ACE_HAS_DUMP is defined. This fixes bugzilla
+          3977, thanks to Ben Bronk <benjamin dot j dot bronk at lmco dot com>
+          for reporting this
+
+        * docs/bczar/bczar.html:
+          Added git
+
+Tue Jul  5 10:30:18 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/templates/gnu.mpd:
+          Removed cidlc, that got removed years ago
+
+Fri Jul  1 11:08:06 UTC 2011  Steve Huston  <shuston@riverace.com>
+
+        * tests/bug_3974_Regression_Test.cpp: Return the correct value from
+          the test. Thanks to Johnny for picking this up.
+
+Fri Jul  1 10:28:10 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * ace/config-freebsd.h:
+          Added missing ACE_HAS_XPG4_MULTIBYTE_CHAR. Should also resolve
+          CDR stream op compile problems.
+
+Fri Jul  1 10:01:54 UTC 2011  Olli Savia  <ops@iki.fi>
+
+        * ace/config-linux.h:
+          Reverted __ACE_INLINE__ removal.
+
+Fri Jul  1 09:31:38 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-openvms.h:
+          Readded OpenVMS socket buffer size limit
+
+Fri Jul  1 08:46:30 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * ace/config-qnx.h:
+        * ace/config-sunos5.5.h:
+          Added ACE_LACKS_STD_WSTRING to remedy compile problems with new
+          CDR stream ops in TAO.
+
+Wed Jun 29 20:47:33 UTC 2011  Steve Huston  <shuston@riverace.com>
+
+        * ace/Select_Reactor_T.cpp:
+        * ace/TP_Reactor.cpp:
+        * ace/Dev_Poll_Reactor.cpp:
+        * ace/WFMO_Reactor.cpp:
+          In handle_events(), if returning -1 because the reactor isn't
+          ready to handle events, also set errno to ESHUTDOWN to tell the
+          caller why. Fixes Bugzilla #3974.
+
+        * tests/Bug_3974_Regression_Test.cpp:
+        * tests/tests.mpc:
+        * tests/run_test.lst:
+          New test for the above problem/fix.
+
+Wed Jun 29 10:38:02 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Thread_Manager.cpp:
+          Fixed compile error in some environments
+
+Wed Jun 29 07:56:54 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * ace/config-lynxos.h:
+          Added ACE_LACKS_STD_WSTRING to remedy compile problems with new
+          CDR stream ops in TAO.
+
+Thu Jun 23 14:51:19 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/CE_Screen_Output.h:
+        * ace/Log_Msg.cpp:
+        * netsvcs/clients/Logger/direct_logging.cpp:
+        * netsvcs/clients/Logger/indirect_logging.cpp:
+        * netsvcs/lib/Base_Optimizer.h:
+        * netsvcs/lib/Base_Optimizer.cpp:
+        * netsvcs/lib/Client_Logging_Handler.cpp:
+        * netsvcs/lib/Log_Message_Receiver.h:
+        * netsvcs/lib/Log_Message_Receiver.cpp:
+        * netsvcs/lib/Server_Logging_Handler.cpp:
+        * netsvcs/lib/Server_Logging_Handler_T.cpp:
+        * netsvcs/lib/TS_Clerk_Handler.cpp:
+        * netsvcs/lib/TS_Server_Handler.cpp:
+        * netsvcs/lib/Time_Request_Reply.cpp:
+        * netsvcs/lib/lib.mpc:
+        * netsvcs/servers/README:
+        * netsvcs/servers/main.cpp:
+          Layout and typo fixes
+
+Thu Jun 23 14:29:08 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/bczar/bczar.html:
+          libtool
+
+        * bin/diff-builds-and-group-fixed-tests-only.sh:
+        * docs/Download.html:
+          Make x.0.3 available
+
+Thu Jun 23 12:39:08 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * etc/*.doxygen
+          Disable html help, seems doxygen now disables the search option
+          when html help is enabled
+
+Thu Jun 23 13:46:08 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ACE version 6.0.3 released.
+
+Wed Jun 22 18:01:15 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * Basic_Types.h:
+        * CDR_Base.cpp:
+        * CDR_Base.h:
+        * config-win32-mingw.h:
+
+          Reverted all changes made related to support for long double
+          constants in IDL.
+
+Tue Jun 21 18:14:46 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * ace/Basic_Types.h:
+
+          Fixed typo in ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII
+          decision tree. Thanks to Phil Mesnier <mesnier_p@ociweb.com>
+          for his help in connecting it to scoreboard warnings.
+
+Mon Jun 20 17:39:01 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * ace/Basic_Types.h:
+
+          Another tweak to ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII's
+          logic aimed at warnings on FC6, FC8, FC12, and FC15.
+
+Mon Jun 20 17:17:26 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * ace/config-win32-mingw.h:
+        * ace/Basic_Types.h:
+
+          - Moved the definition of ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII
+            to the MinGW config file.
+
+          - Added #define ACE_CDR_IMPLEMENT_WITH_NATIVE_DOUBLE 1 to
+            the MinGW config file, so that, for generated IDL long
+            double constants, the argument will agree with the
+            print format string. MinGW doesn't support long double
+            in the print format.
+
+Fri Jun 17 16:48:29 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * ace/Basic_Types.h:
+
+          Another tweak to ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII's
+          conditional definition to eliminate warnings on FC12
+          and FC15.
+
+Fri Jun 17 12:48:31 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * ace/Basic_Types.h:
+
+          Removed the 'L' from the version of
+          ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII targeted at MinGW
+          platforms. That platform apparently doesn't support that
+          part of the C print format spec.
+
+Thu Jun 16 13:31:16 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * ace/Basic_Types.h:
+
+          Changed the logic of what ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII
+          expands to in order to eliminate warnings on FC6 and FC8.
+
+Wed Jun 15 13:10:40 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * ace/Basic_Types.h:
+
+          Added a special version of ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII
+          for MinGW32, which seems to diverge from other platforms in how
+          it conforms to the printf print format.
+
+Fri Jun 10 19:05:30 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * ace/Basic_Types.h:
+
+          Added #define of ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII
+          to make generation of a long double literal by the TAO IDL
+          compiler more portable.
+
+Fri Jun 10 12:58:49 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * ChangeLog:
+          Fuzz. Removed tab.
+
+Thu Jun  9 01:16:23 UTC 2011  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/RB_Tree.cpp: Fixed overly long ACE_TRACE string literals
+          that were split across lines.  Thanks to Espen Harlinn <espen at
+          harlinn dot no> for reporting this.
+
+Wed Jun  8 21:05:56 UTC 2011  Adam Mitz  <mitza@ociweb.com>
+
+        * bin/fuzz.pl:
+
+          Switch from cvs to svn for the -m option that checks only modified
+          files.  We haven't used cvs for some time now.
+
+Tue Jun  7 20:45:56 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ace/CDR_Base.h:
+
+          The inline function needs to be static to match the semantics of
+          a struct constructor when the environment has native long
+          doubles.
+
+Tue Jun  7 18:20:36 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * ace/CDR_Base.h:
+
+          Added an inline function called LongDoubleAssign tha works
+          as an alternative to the struct constructor of the same
+          name when a 16-byte native long double exists and the struct
+          is not defined. Thanks again to Adam Mitz <mitza at ociweb dot com>
+          for the idea.
+
+Mon Jun  6 22:17:26 UTC 2011  Adam Mitz  <mitza@ociweb.com>
+
+        * ace/CDR_Base.h:
+
+          The struct just added by Jeff also needs the export macro.
+
+Mon Jun  6 19:51:27 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * ace/CDR_Base.cpp:
+        * ace/CDR_Base.h:
+
+          Added a struct LongDoubleAssign which inherits from LongDouble,
+          and contains the assignment operator and constructors, as well
+          as a cast operator to LongDouble. This scheme allows generated
+          code to use the LongDouble struct (when no 16-byte native long
+          double exists) as a member in C++ unions, and to be initialized
+          (when it appears as a constant) with the default copy constructor
+          from LongDouble, converted from the supplied LongDoubleAssign,
+          which is in turn initialized from the rhs literal. Thanks to
+          Adam Mitz <mitza at ociweb dot com> for the LongDoubleAssign
+          suggestion to work around the C++ union restriction.
+
+Mon Jun  6 16:59:29 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/Download.html:
+          Fixed typo
+
+        * include/makeinclude/platform_g++_common.GNU:
+          Added support for c++0x, adding this to your platform_macros.GNU
+          enables the g++ c++0x extensions
+
+Mon Jun  6 13:44:14 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp:
+          Fixed gcc 4.6 warning.
+
+Fri Jun  3 18:46:50 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * ace/CDR_Base.h:
+
+          Made the ACE_CDR::LongDouble struct constructor from native
+          long double explicit, which eliminates compiler ambiguities
+          when the struct's '==' and '!=' operators are used with
+          a native long double rhs.
+
+Wed Jun  1 19:30:44 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * ace/CDR_Base.cpp:
+        * ace/CDR_Base.h:
+
+          To the struct ACE_CDR::LongDouble, used for platforms with
+          a native long double that isn't 16 bytes, added an
+          assignment operator and a constructor. The former is for
+          internal use by the IDL compiler, and the latter is for
+          code generation for long double constants. For types
+          using the non-native struct, a const declaration is
+          impossible to initialize by assignment to a literal,
+          so a constructor is generated instead.
+
+Wed Jun  1 10:17:33 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * bin/fuzz.pl:
+          Fixed typo.
+
+Wed Jun  1 05:53:10 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * examples/APG/Naming/Temperature_Monitor2.cpp:
+        * examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp:
+        * tests/Bug_3943_Regression_Test.cpp:
+        * tests/Proactor_UDP_Test.cpp:
+          Resolved gcc 4.6 warning: variable was set but not used.
+
+Tue May 31 09:16:33 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/Download.html:
+          OBS now stands for Open Build Service
+
+Tue May 31 07:13:01 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * ACEXML/examples/SAXPrint/main.cpp:
+          Fixed compile error.
+
+Mon May 30 18:44:55 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ACEXML/examples/SAXPrint/main.cpp:
+          Fixed gcc 4.6 warning
+
+        * docs/bczar/bczar.html:
+          Added some more packages
+
+Fri May 27 14:44:01 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * tests/Bug_2653_Regression_Test.cpp:
+        * tests/Compiler_Features_12_Test.cpp:
+        * tests/Reference_Counted_Event_Handler_Test.cpp:
+          Resolved gcc 4.6 warning: variable was set but not used.
+
+Fri May 27 09:49:56 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp:
+          Made changes to satisfy Coverity and the GNU 4.6 gcc compiler.
+          fgets returns a void*. This is stored in dummy. We use
+          ACE_UNUSED_ARG to fool the 4.6 gcc compiler.
+
+Thu May 26 14:27:50 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp:
+          Resolved gcc 4.6 warning: variable was set but not used.
+
+Thu May 26 14:11:57 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * ace/Monitor_Control/Linux_Network_Interface_Monitor.cpp:
+          Resolved gcc 4.6 warning: variable was set but not used.
+
+Thu May 26 11:39:54 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/bczar/bczar.html:
+          Added a yum install with all packages you could need on FC
+
+Thu May 26 13:09:50 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * tests/Compiler_Features_10_Test.cpp:
+          Resolved coverity warnings.
+
+Mon May 23 07:55:41 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+        * tests/QtReactor_Test.h:
+        * tests/QtReactor_Test.cpp:
+        Changed deprecated qt4 functions and includes.
+
+Mon May 23 07:10:41 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/APG/Naming/Name_Binding.h:
+        * netsvcs/lib/Client_Logging_Handler.cpp:
+          Fixed incorrect delete
+
+Mon May 23 06:55:37 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/APG/Streams/MessageInfo.h:
+          Pass argument as const& to fix Coverity error
+
+        * protocols/ace/INet/BidirStreamBuffer.h:
+        * protocols/ace/INet/BufferedStreamBuffer.h:
+        * protocols/ace/INet/HTTP_BasicAuthentication.cpp:
+        * protocols/ace/RMCast/Link.cpp:
+          Fixed memory leaks, thanks to Max Zhou <earthdog at 126 dot com>
+          for creating the patch, this fixes bugzilla 3959
+
+Fri May 20 22:17:29 UTC 2011  Adam Mitz  <mitza@ociweb.com>
+
+        * bin/MakeProjectCreator/config/ace_qt4reactor.mpb:
+
+          Assignment to "after" must match the target MPC project name.
+
+Thu May 12 18:08:47 UTC 2011  Steve Huston  <shuston@riverace.com>
+
+        * include/makeinclude/wrapper_macros.GNU: Added command settings for
+          preprocessing C and C++ source files.
+
+        * include/makeinclude/rules.local.GNU: Added rules to preprocess
+          C and C++ files when directed.
+
+          These allow one to now quickly produce a preprocessed version of
+          a source file. Ala... make -f GNUmakefile.ACE ACE.i
+          would preprocess ACE.cpp and put the result in ACE.i.
+
+Thu May 12 01:04:19 UTC 2011   Chad Beaulac  <chad.beaulac@objectivesolutions.com>
+        * tests/Bug_3912_Regression_Test.cpp:
+          Integrated changes from Phil Mesnier.
+          Added static_cast and const_cast instead of C-style casts.
+
+Wed May 11 18:26:28 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Thread_Control.h:
+        * ace/Thread_Control.cpp:
+        * ace/Thread_Hook.h:
+        * ace/Thread_Hook.cpp:
+        * apps/gperf/src/Options.cpp:
+          Doxygen changes
+
+Wed May 11 13:41:28 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+        * ace/QtReactor/QtReactor.h:
+          Changed for QT4 deprecated include QT/..
+
+Wed May 11 12:45:21 UTC 2011  Chad Beaulac  <chad.beaulac@objectivesolutions.com>
+
+        * tests/Bug_3912_Regression_Test.cpp:
+          Returning a value from close now.
+
+        * tests/tests.mpc:
+          Removed libs Stream_Config_Stream_DLL.
+          It's dynamically loaded by the ASR.
+
+Tue May 10 11:59:32 UTC 2011  Chad Beaulac  <chad.beaulac@objectivesolutions.com>
+
+        * ace/Stream.cpp:
+        * tests/Bug_3912_Regression_Test.cpp:
+        * tests/Bug_3912_Regression_Test.conf:
+          Fixed FUZZ whitespace and Id
+
+Mon May  9 19:09:35 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Dump.h:
+        * ace/FIFO.cpp:
+        * ace/Filecache.cpp:
+        * ace/Svc_Conf.y:
+        * ace/Svc_Conf_y.cpp:
+          Fixed coverity errors
+
+Sun May  8 17:57:50 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/ETCL/ETCL_Constraint.h:
+        * ace/ETCL/ETCL_Constraint.inl:
+          Fixed coverity errors
+
+Thu May  5 21:38:45 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ace/Select_Reactor_T.cpp:
+
+          Added a reset of errno during the ctor in case there was an
+          error during the first attempt at opening the reactor. Turns out
+          that in this case on at least on Linux, the errno leaks through
+          the second, good call to open. This can happen for example, when
+          ACE::max_handles() is less than the select reactor's DEFAULT_SIZE.
+          Since all this happens in a ctor, there's no result value for
+          application code to check, apart from errno.
+
+Wed May  4 15:07:46 UTC 2011  Chad Beaulac <chad.beaulac@objectivesolutions.com>
+
+          * ace/Stream.cpp:
+          Modified ACE_Stream::remove(name,flags) so close
+          is always called on the module that's removed regardless of the
+          flags. Close needs to be called to ensure proper lifecycle
+          management when the ACE_Service_Repository shuts down in its
+          fini method.  Bugzilla #3912
+
+        * tests/Bug_3912_Regression_Test.conf:
+        * tests/Bug_3912_Regression_Test.cpp:
+        * tests/run_test.lst
+        * tests/test.mpc
+          Added test to assert that close is called.
+
+Fri Apr 29 14:01:29 UTC 2011  Steve Huston  <shuston@riverace.com>
+
+        * tests/tests.mpc: For Message_Queue_Test add -bmaxdata:0x20000000 to
+          linker options to extend the available data space at run time.
+          Avoids the heap smashing the stacks.
+
+Fri Apr 29 06:39:06 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * bin/fuzz.pl:
+          Exclude *.WCHAR_T.conf and *.UTF-16.conf files from $Id check.
+          These files are not UTF-8 format and cannot be read by perl.
+
+Thu Apr 28 06:39:25 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * rpmbuild/ace-tao.spec:
+          Disable inlining
+
+Wed Apr 27 13:33:43 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-visualage.h:
+          Removed this file, includes only non existent files
+
+Wed Apr 27 11:02:59 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Time_Value.inl:
+        * ace/Time_Value.cpp:
+          Corrected some casts to use time_t
+
+Wed Apr 27 09:01:11 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * rpmbuild/ace-tao.spec:
+          Improved this file
+
+Tue Apr 26 09:38:05 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * rpmbuild/ace-tao.spec:
+          Improved this file
+
+Tue Apr 26 08:17:40 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * rpmbuild/ace-tao.spec:
+          Improved this file
+
+Sat Apr 23 12:31:28 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Stream.cpp:
+          Fixed incorrect ACE_NEW_RETURN macro
+
+Fri Apr 22 19:05:19 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/ACE.cpp (strnew):
+          Removed null check, ACE_NEW_RETURN already does that
+
+Fri Apr 22 15:19:29 UTC 2011  Steve Huston  <shuston@riverace.com>
+
+        * include/makeinclude/platform_aix_ibm.GNU: Add support for XL C++ 11.
+
+Fri Apr 22 12:43:18 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * protocols/tests/HTBP/HTBP_Config.conf:
+        * protocols/tests/HTBP/Reactor_Tests/inside.conf:
+        * tests/Service_Config_Test.WCHAR_T.conf:
+          Fuzz: Added $Id string
+
+Fri Apr 22 11:16:57 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * rpmbuild/ace-tao.spec:
+          Removed autoconf support
+
+Fri Apr 22 07:25:57 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * ace/MMAP_Memory_Pool.cpp:
+        * ace/OS_NS_stdlib.cpp:
+          Layout changes
+
+        * Kokyu/tests/DSRT_MIF/svc.conf:
+        * apps/Gateway/Gateway/svc.conf:
+        * apps/Gateway/Peer/svc.conf:
+        * apps/JAWS/server/svc.conf:
+        * apps/JAWS3/jaws3/jaws.conf:
+        * apps/JAWS3/small/jaws.conf:
+        * apps/JAWS3/small/svc.conf:
+        * examples/APG/Logging/client.conf:
+        * examples/APG/Logging/logging_strategy.conf:
+        * examples/APG/Logging/server.conf:
+        * examples/APG/Naming/svc.conf:
+        * examples/APG/Svc_Config/svc.conf.dynamic:
+        * examples/APG/Svc_Config/svc.conf.static:
+        * examples/ASX/CCM_App/svc.conf:
+        * examples/C++NPv2/svc.conf:
+        * examples/Service_Configurator/IPC-tests/server/svc.conf:
+        * examples/Service_Configurator/Misc/svc.conf1:
+        * examples/Service_Configurator/Misc/svc.conf2:
+        * netsvcs/clients/Naming/Client/svc.conf:
+        * netsvcs/clients/Naming/Client/svc2.conf:
+        * netsvcs/servers/svc.conf:
+        * performance-tests/Synch-Benchmarks/svcconf/perf_t1.conf:
+        * performance-tests/Synch-Benchmarks/svcconf/perf_t16.conf:
+        * performance-tests/Synch-Benchmarks/svcconf/perf_t2.conf:
+        * performance-tests/Synch-Benchmarks/svcconf/perf_t32.conf:
+        * performance-tests/Synch-Benchmarks/svcconf/perf_t4.conf:
+        * performance-tests/Synch-Benchmarks/svcconf/perf_t64.conf:
+        * performance-tests/Synch-Benchmarks/svcconf/perf_t8.conf:
+        * performance-tests/Synch-Benchmarks/svcconf/svc.conf:
+        * protocols/tests/HTBP/HTBP_Config.conf:
+        * protocols/tests/HTBP/Reactor_Tests/inside.conf:
+        * rpmbuild/etc/tao/tao-cosconcurrency.conf:
+        * rpmbuild/etc/tao/tao-cosevent.conf:
+        * rpmbuild/etc/tao/tao-cosnaming.conf:
+        * rpmbuild/etc/tao/tao-cosnotification.conf:
+        * rpmbuild/etc/tao/tao-costrading.conf:
+        * rpmbuild/etc/tao/tao-rtevent.conf:
+        * tests/Bug_3334_Regression_Test.conf:
+        * tests/Service_Config_Stream_Test.conf:
+        * tests/Service_Config_Test.UTF-16.conf:
+        * tests/Service_Config_Test.conf:
+        * tests/Service_Config_Test.conf.xml:
+        * tests/UNIXclerk.conf:
+        * tests/UNIXserver.conf:
+        * tests/UNIXtokens.conf:
+        * tests/Win32clerk.conf:
+        * tests/Win32server.conf:
+        * tests/Win32tokens.conf:
+          Fuzz: Added $Id string.
+
+Thu Apr 21 12:25:13 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/fuzz.pl:
+          Check *.conf files for an Id tag
+
+Thu Apr 21 08:16:01 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/platform_macosx.GNU:
+        * include/makeinclude/platform_macosx_common.GNU:
+          Cleanup
+
+        * include/makeinclude/platform_macosx_lion.GNU:
+          Fixed comment
+
+Wed Apr 20 11:29:35 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/gnuace.features:
+          Don't set ndds default to 1, reduced size of release and makes it
+          possible to support more dds vendors
+
+Wed Apr 20 10:27:42 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/diff-builds-and-group-fixed-tests-only.sh:
+        * docs/Download.html:
+        * etc/index.html:
+          Make x.0.2 available
+
+        * html/Stats/index.shtml:
+          Removed cell xampler
+
+Wed Apr 20 08:53:55 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * apps/gperf/src/Gen_Perf.cpp:
+          Fixed coverity errors
+
+        * bin/fuzz.pl:
+          Extended fuzz
+
+        * bin/generate_rel_manpages:
+          Removed obsolete make steps
+
+        * docs/bczar/bczar.html:
+          zip should also be available
+
+        * tests/Env_Value_Test.cpp:
+        * tests/Reactor_Fairness_Test.cpp:
+          Layout changes
+
+Wed Apr 20 09:52:52 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ACE version 6.0.2 released.
+
+Local Variables:
+mode: change-log
+add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time))
+indent-tabs-mode: nil
+End:
diff --git a/ACE/NEWS b/ACE/NEWS
index 8fdd191c101..72f40092433 100644
--- a/ACE/NEWS
+++ b/ACE/NEWS
@@ -1,9 +1,19 @@
-USER VISIBLE CHANGES BETWEEN ACE-6.0.5 and ACE-6.1.0
+USER VISIBLE CHANGES BETWEEN ACE-6.0.6 and ACE-6.1.0
+====================================================
+
+. Added a new method to ACE_Atomic_Op<LOCK, TYPE>, TYPE exchange (TYPE newval)
+  which does an atomic exchange of the new value with ACE_Atomic_Op's value
+  and returns the old value. The tests/Atomic_Op_Test.cpp test program has a
+  test case that exemplifies its usage; see the Exchange_Tester class.
+
+USER VISIBLE CHANGES BETWEEN ACE-6.0.5 and ACE-6.0.6
 ====================================================
 
 . Removed autoconf support, only traditional way of
   compilation is shipped from now
 
+. Add support for RHEL 6.1 64bit
+
 USER VISIBLE CHANGES BETWEEN ACE-6.0.4 and ACE-6.0.5
 ====================================================
 
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
index 7d75c9a4410..27c2219458c 100644
--- a/ACE/PROBLEM-REPORT-FORM
+++ b/ACE/PROBLEM-REPORT-FORM
@@ -40,7 +40,7 @@
 To: ace-bugs@list.isis.vanderbilt.edu
 Subject: [area]: [synopsis]
 
-    ACE VERSION: 6.0.5
+    ACE VERSION: 6.0.6
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/ACE/VERSION b/ACE/VERSION
index 2561b9e5c3e..25d17917ef4 100644
--- a/ACE/VERSION
+++ b/ACE/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 6.0.5, released Mon Oct 10 08:48:51 CEST 2011
+This is ACE version 6.0.6, released Sun Dec 04 11:51:30 CET 2011
 
 If you have any problems with or questions about ACE, please send
 e-mail to the ACE mailing list (ace-bugs@list.isis.vanderbilt.edu),
diff --git a/ACE/ace/Atomic_Op.h b/ACE/ace/Atomic_Op.h
index 69eb3e42f70..597c218b77a 100644
--- a/ACE/ace/Atomic_Op.h
+++ b/ACE/ace/Atomic_Op.h
@@ -124,6 +124,9 @@ public:
   /// Atomically assign <rhs> to @c value_.
   ACE_Atomic_Op<ACE_Thread_Mutex, long> &operator= (const ACE_Atomic_Op<ACE_Thread_Mutex, long> &rhs);
 
+  /// Exchange value with @a newval.
+  long exchange (long newval);
+
   /// Explicitly return @c value_.
   long value (void) const;
 
@@ -221,6 +224,9 @@ public:
   /// Atomically assign <rhs> to @c value_.
   ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long> &operator= (const ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long> &rhs);
 
+  /// Exchange value with @a newval.
+  unsigned long exchange (unsigned long newval);
+
   /// Explicitly return @c value_.
   unsigned long value (void) const;
 
diff --git a/ACE/ace/Atomic_Op.inl b/ACE/ace/Atomic_Op.inl
index 123df4dc505..714bfe9c1be 100644
--- a/ACE/ace/Atomic_Op.inl
+++ b/ACE/ace/Atomic_Op.inl
@@ -189,6 +189,22 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator= (
 }
 
 ACE_INLINE long
+ACE_Atomic_Op<ACE_Thread_Mutex, long>::exchange (long newval)
+{
+#if defined (ACE_HAS_INTRINSIC_INTERLOCKED)
+  return ::_InterlockedExchange (const_cast<long *> (&this->value_), newval);
+#elif defined (WIN32)
+  return ::InterlockedExchange (const_cast<long *> (&this->value_), newval);
+#elif defined (ACE_HAS_VXATOMICLIB)
+  return ::vxAtomicSet (reinterpret_cast <atomic_t*>(const_cast<long *> (&this->value_)), newval);
+#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB)
+  return ::atomic_swap_ulong (reinterpret_cast<volatile unsigned long*>(&this->value_), newval);
+#else /* WIN32 */
+  return (*exchange_fn_) (&this->value_, newval);
+#endif /* WIN32 */
+}
+
+ACE_INLINE long
 ACE_Atomic_Op<ACE_Thread_Mutex, long>::value (void) const
 {
   return this->value_;
@@ -373,6 +389,22 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::operator= (
 }
 
 ACE_INLINE unsigned long
+ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::exchange (unsigned long newval)
+{
+#if defined (ACE_HAS_INTRINSIC_INTERLOCKED)
+  return ::_InterlockedExchange (const_cast<long *> (reinterpret_cast<volatile long*> (&this->value_)), newval);
+#elif defined (WIN32)
+  return ::InterlockedExchange (const_cast<long *> (reinterpret_cast<volatile long*> (&this->value_)), newval);
+#elif defined (ACE_HAS_VXATOMICLIB)
+  return ::vxAtomicSet (reinterpret_cast <atomic_t*>(const_cast<long *> (reinterpret_cast<volatile long*> (&this->value_))), newval);
+#elif defined (ACE_HAS_SOLARIS_ATOMIC_LIB)
+  return ::atomic_swap_ulong (&this->value_, newval);
+#else /* WIN32 */
+  return (*exchange_fn_) (reinterpret_cast<volatile long *> (&this->value_), newval);
+#endif /* WIN32 */
+}
+
+ACE_INLINE unsigned long
 ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::value (void) const
 {
   return this->value_;
diff --git a/ACE/ace/Atomic_Op_GCC_T.h b/ACE/ace/Atomic_Op_GCC_T.h
index 348be5e95e0..a8dfc2b641a 100644
--- a/ACE/ace/Atomic_Op_GCC_T.h
+++ b/ACE/ace/Atomic_Op_GCC_T.h
@@ -74,6 +74,9 @@ public:
   /// Atomically check if @c value_ less than rhs.
   bool operator< (T rhs) const;
 
+  /// Exchange value with @a newval.
+  T exchange (T newval);
+
   /// Explicitly return @c value_.
   T value (void) const;
 
diff --git a/ACE/ace/Atomic_Op_GCC_T.inl b/ACE/ace/Atomic_Op_GCC_T.inl
index de3bf1a1438..8a914c65c1a 100644
--- a/ACE/ace/Atomic_Op_GCC_T.inl
+++ b/ACE/ace/Atomic_Op_GCC_T.inl
@@ -130,6 +130,13 @@ ACE_Atomic_Op_GCC<T>::operator= (
 
 template <typename T>
 ACE_INLINE T
+ACE_Atomic_Op_GCC<T>::exchange (T newval)
+{
+  return __sync_val_compare_and_swap (&this->value_, this->value_, newval);
+}
+
+template <typename T>
+ACE_INLINE T
 ACE_Atomic_Op_GCC<T>::value (void) const
 {
   return this->value_;
diff --git a/ACE/ace/Atomic_Op_T.h b/ACE/ace/Atomic_Op_T.h
index 75ca728351a..1e3c53a3f3a 100644
--- a/ACE/ace/Atomic_Op_T.h
+++ b/ACE/ace/Atomic_Op_T.h
@@ -207,6 +207,9 @@ public:
   ACE_Atomic_Op_Ex<ACE_LOCK, TYPE> &operator= (
     ACE_Atomic_Op_Ex<ACE_LOCK, TYPE> const & rhs);
 
+  /// Exchange value with @a newval.
+  TYPE exchange (TYPE newval);
+
   /// Explicitly return @c value_.
   TYPE value (void) const;
 
@@ -318,6 +321,9 @@ public:
   /// Atomically check if @c value_ less than @a rhs.
   bool operator< (arg_type rhs) const;
 
+  /// Exchange value with @a newval.
+  TYPE exchange (TYPE newval);
+
   /// Explicitly return @c value_.
   TYPE value (void) const;
 
diff --git a/ACE/ace/Atomic_Op_T.inl b/ACE/ace/Atomic_Op_T.inl
index def9e9a435d..df549538e2b 100644
--- a/ACE/ace/Atomic_Op_T.inl
+++ b/ACE/ace/Atomic_Op_T.inl
@@ -154,6 +154,16 @@ ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::operator= (
 
 template <class ACE_LOCK, class TYPE>
 ACE_INLINE TYPE
+ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::exchange (TYPE newval)
+{
+  // ACE_TRACE ("ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::exchange");
+  ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, this->value_);
+  std::swap (this->value_, newval);
+  return newval;
+}
+
+template <class ACE_LOCK, class TYPE>
+ACE_INLINE TYPE
 ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::value (void) const
 {
   // ACE_TRACE ("ACE_Atomic_Op_Ex<ACE_LOCK, TYPE>::value");
@@ -308,6 +318,13 @@ ACE_Atomic_Op<ACE_LOCK, TYPE>::operator< (
 
 template <class ACE_LOCK, class TYPE>
 ACE_INLINE TYPE
+ACE_Atomic_Op<ACE_LOCK, TYPE>::exchange (TYPE newval)
+{
+  return this->impl_.exchange (newval);
+}
+
+template <class ACE_LOCK, class TYPE>
+ACE_INLINE TYPE
 ACE_Atomic_Op<ACE_LOCK, TYPE>::value (void) const
 {
   return this->impl_.value ();
diff --git a/ACE/ace/DLL.h b/ACE/ace/DLL.h
index af92d842d51..72129472497 100644
--- a/ACE/ace/DLL.h
+++ b/ACE/ace/DLL.h
@@ -88,24 +88,37 @@ public:
 
   /**
    * This method opens and dynamically links a specified DLL.
-   * @param dll_name  The filename or path of the DLL to load.
-   *        If a filename is given to @c open(), the @c ACE::ldfind() is used
-   *        to locate DLLs via the following algorithms: (1) DLL filename
-   *        expansion: @c ACE::ldfind() determines the name of the DLL by
-   *        adding the appropriate prefix and suffix, e.g., it adds the @c lib
-   *        prefix and @c .so suffix for Solaris and the @c .dll suffix for
-   *        Windows and (2) DLL search path: @c ACE::ldfind() will also search
-   *        for the designated DLL using the platform's DLL search path
-   *        environment variable, e.g., it searches for DLLs using @c
-   *        LD_LIBRARY_PATH on many UNIX systems and @c PATH on Windows.
+   * @param dll_name  The filename or path of the DLL to load. ACE will
+   *        attempt to apply the platform's standard library/DLL prefixes
+   *        and suffixes, allowing a simple, unadorned name to be passed
+   *        regardless of platform. The set of name transforms is listed
+   *        below. A @i decorator is a platform's name designator for a debug
+   *        vs release build. For example, on Windows it is usually "d".
+   *        @li Name + decorator + suffix
+   *        @li Name + suffix
+   *        @li Prefix + name + decorator + suffix
+   *        @li Prefix + name + suffix
+   *        @li Name
+   *        Note that the transforms with @i decorator will be avoided if
+   *        ACE is built with the @c ACE_DISABLE_DEBUG_DLL_CHECK config macro.
+   *
+   *        @Note There is another mode for locating library/DLL files that
+   *        was used in old versions of ACE. The alternate method builds
+   *        more combinations of pathname by combining the names transforms
+   *        above with locations listed in the platform's standard "path"
+   *        locations (e.g., @c LD_LIBRARY_PATH). It can be enabled by building
+   *        ACE with the @c ACE_MUST_HELP_DLOPEN_SEARCH_PATH config macro.
+   *        Use of this option is discouraged since it avoids the standard
+   *        platform search options and security mechanisms.
+   *
    * @param open_mode  Flags to alter the actions taken when loading the DLL.
    *        The possible values are:
    *        @li @c RTLD_LAZY (this the default): loads identifier symbols but
    *            not the symbols for functions, which are loaded dynamically
-   *            on-demand.
+   *            on demand.
    *        @li @c RTLD_NOW: performs all necessary relocations when
    *            @a dll_name is first loaded
-   *        @li RTLD_GLOBAL: makes symbols available for relocation
+   *        @li @c RTLD_GLOBAL: makes symbols available for relocation
    *            processing of any other DLLs.
    * @param close_handle_on_destruction  Indicates whether or not the
    *        close() method will be called to close an open DLL when this
diff --git a/ACE/ace/DLL_Manager.h b/ACE/ace/DLL_Manager.h
index 279d48cf9d4..ca94edf3e13 100644
--- a/ACE/ace/DLL_Manager.h
+++ b/ACE/ace/DLL_Manager.h
@@ -68,14 +68,44 @@ public:
   const ACE_TCHAR *dll_name () const;
 
   /**
-   * This method opens and dynamically links @a dll_name.  The default
-   * mode is @c RTLD_LAZY, which loads identifier symbols but not the
-   * symbols for functions, which are loaded dynamically on-demand.
-   * Other supported modes include: @c RTLD_NOW, which performs all
-   * necessary relocations when @a dll_name is first loaded and
-   * @c RTLD_GLOBAL, which makes symbols available for relocation
-   * processing of any other DLLs.  Returns -1 on failure and 0 on
-   * success.
+   * This method opens and dynamically links a library/DLL.
+   * @param dll_name  The filename or path of the DLL to load. ACE will
+   *        attempt to apply the platform's standard library/DLL prefixes
+   *        and suffixes, allowing a simple, unadorned name to be passed
+   *        regardless of platform. The set of name transforms is listed
+   *        below. A @i decorator is a platform's name designator for a debug
+   *        vs release build. For example, on Windows it is usually "d".
+   *        @li Name + decorator + suffix
+   *        @li Name + suffix
+   *        @li Prefix + name + decorator + suffix
+   *        @li Prefix + name + suffix
+   *        @li Name
+   *        Note that the transforms with @i decorator will be avoided if
+   *        ACE is built with the @c ACE_DISABLE_DEBUG_DLL_CHECK config macro.
+   *
+   *        @Note There is another mode for locating library/DLL files that
+   *        was used in old versions of ACE. The alternate method builds
+   *        more combinations of pathname by combining the names transforms
+   *        above with locations listed in the platform's standard "path"
+   *        locations (e.g., @c LD_LIBRARY_PATH). It can be enabled by building
+   *        ACE with the @c ACE_MUST_HELP_DLOPEN_SEARCH_PATH config macro.
+   *        Use of this option is discouraged since it avoids the standard
+   *        platform search options and security mechanisms.
+   *
+   * @param open_mode  Flags to alter the actions taken when loading the DLL.
+   *        The possible values are:
+   *        @li @c RTLD_LAZY (this the default): loads identifier symbols but
+   *            not the symbols for functions, which are loaded dynamically
+   *            on demand.
+   *        @li @c RTLD_NOW: performs all necessary relocations when
+   *            @a dll_name is first loaded
+   *        @li @c RTLD_GLOBAL: makes symbols available for relocation
+   *            processing of any other DLLs.
+   * @param handle If a value other than @c ACE_INVALID_HANDLE is supplied,
+   *        this object is assigned the specified handle instead of attempting
+   *        to open the specified @a dll_name.
+   * @retval -1 On failure
+   * @retval 0 On success.
    */
   int open (const ACE_TCHAR *dll_name,
             int open_mode,
diff --git a/ACE/ace/Log_Msg.h b/ACE/ace/Log_Msg.h
index 14a6e7cb33d..f847c4ede0e 100644
--- a/ACE/ace/Log_Msg.h
+++ b/ACE/ace/Log_Msg.h
@@ -556,16 +556,16 @@ public:
                    size_t size,
                    const ACE_TCHAR *text = 0);
 
-  static void init_hook (ACE_OS_Log_Msg_Attributes &attributes
-# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS)
-                         , ACE_SEH_EXCEPT_HANDLER selector = 0
-                         , ACE_SEH_EXCEPT_HANDLER handler = 0
-# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */
   /**
    * Init hook, create a Log_Msg_Attribute object, initialize its
    * attributes from the TSS Log_Msg and save the object in the
    * @a attributes argument
    */
+  static void init_hook (ACE_OS_Log_Msg_Attributes &attributes
+# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS)
+                         , ACE_SEH_EXCEPT_HANDLER selector = 0
+                         , ACE_SEH_EXCEPT_HANDLER handler = 0
+# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */
                          );
 
   /**
diff --git a/ACE/ace/TTY_IO.h b/ACE/ace/TTY_IO.h
index 501bacceeca..d3f165eca23 100644
--- a/ACE/ace/TTY_IO.h
+++ b/ACE/ace/TTY_IO.h
@@ -46,7 +46,7 @@ public:
   {
     Serial_Params (void);
 
-    /** Specifies the baudrate at which the communnication port operates. */
+    /** Specifies the baudrate at which the communication port operates. */
     int baudrate;
     /** Specifies the minimum number of bytes in input buffer before XON char
         is sent. Negative value indicates that default value should
diff --git a/ACE/ace/Time_Value.inl b/ACE/ace/Time_Value.inl
index 25346ad2506..984ffc6f7c2 100644
--- a/ACE/ace/Time_Value.inl
+++ b/ACE/ace/Time_Value.inl
@@ -60,7 +60,7 @@ ACE_Time_Value::set (time_t sec, suseconds_t usec)
   // ACE_OS_TRACE ("ACE_Time_Value::set");
   this->tv_.tv_sec = sec;
   this->tv_.tv_usec = usec;
-#if __GNUC__
+#if __GNUC__ && !(__GNUC__ == 3 && __GNUC_MINOR__ == 4)
   if ((__builtin_constant_p(sec) &
        __builtin_constant_p(usec)) &&
       (sec >= 0 && usec >= 0 && usec < ACE_ONE_SECOND_IN_USECS))
diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h
index 374adc46ff2..d5741194727 100644
--- a/ACE/ace/Version.h
+++ b/ACE/ace/Version.h
@@ -5,5 +5,5 @@
 
 #define ACE_MAJOR_VERSION 6
 #define ACE_MINOR_VERSION 0
-#define ACE_BETA_VERSION 5
-#define ACE_VERSION "6.0.5"
+#define ACE_BETA_VERSION 6
+#define ACE_VERSION "6.0.6"
diff --git a/ACE/ace/config-linux.h b/ACE/ace/config-linux.h
index 7730ab02029..45c1a0e7989 100644
--- a/ACE/ace/config-linux.h
+++ b/ACE/ace/config-linux.h
@@ -371,7 +371,6 @@
 # endif
 #endif
 
-
 #define ACE_HAS_SVR4_DYNAMIC_LINKING
 #define ACE_HAS_AUTOMATIC_INIT_FINI
 #define ACE_HAS_DLSYM_SEGFAULT_ON_INVALID_HANDLE
diff --git a/ACE/bin/ChangeLogEditor/FileLocatorFactory.pm b/ACE/bin/ChangeLogEditor/FileLocatorFactory.pm
index 9fd292cc603..17baba160c3 100644
--- a/ACE/bin/ChangeLogEditor/FileLocatorFactory.pm
+++ b/ACE/bin/ChangeLogEditor/FileLocatorFactory.pm
@@ -13,6 +13,7 @@ package FileLocatorFactory;
 
 use strict;
 
+use Cwd;
 use CVSFileLocator;
 use SVNFileLocator;
 
@@ -25,7 +26,7 @@ sub create {
   ## will exist when Subversion isn't the rcs being used.  However, that
   ## is not the case for CVS directories.
   switch: {
-    ((defined $ENV{SVN_ASP_DOT_NET_HACK} && -d '_svn') || -d '.svn')
+    ((defined $ENV{SVN_ASP_DOT_NET_HACK} && -d '_svn') || searchParentDirectory('.svn'))
       && do { return new SVNFileLocator(); };
     -d 'CVS'  && do { return new CVSFileLocator(); };
     print STDERR "WARNING: Unsupported revision control protocol\n";
@@ -34,5 +35,28 @@ sub create {
   return new FileLocator();
 }
 
+sub searchParentDirectory {
+  my($hidden)  = shift;
+  my($path)    = cwd();
+  my($index)   = -1;
+
+  # Search all parent directories for the specified hidden
+  # directory. We stop when we either found the hidden directory
+  # of there are no more parent directories let to search.
+  do {
+    if (-d $path . '/' . $hidden) {
+      return 1;
+    }
+
+    $index = rindex($path, '/');
+
+    if ($index != -1) {
+      $path = substr ($path, 0, $index);
+    }
+  } while ($index != -1);
+
+  return 0;
+}
+
 
 1;
diff --git a/ACE/bin/PerlACE/Process_Win32.pm b/ACE/bin/PerlACE/Process_Win32.pm
index e286c45f229..043f68fb2e1 100644
--- a/ACE/bin/PerlACE/Process_Win32.pm
+++ b/ACE/bin/PerlACE/Process_Win32.pm
@@ -10,6 +10,12 @@ use Win32::Process;
 use File::Basename;
 use Cwd;
 
+# Make sure the File::Which module is installed on the machine
+# before trying to use it. If the module is installed on this
+# machine, then it will be included because of the eval ()
+# statement below.
+my $has_which = eval ("use File::Which; 1;") ? 1 : 0;
+
 ###############################################################################
 
 # This is what GetExitCode will return if the process is still running.
@@ -133,10 +139,21 @@ sub Executable
         $executable = $self->Normalize_Executable_Name ($executable);
     }
     else {
-        if ($executable !~ m/\.(BAT|EXE)$/i) {
+        if ($executable !~ m/\.(BAT|EXE|COM)$/i) {
             $executable = $executable.".EXE";
         }
+
         $executable =~ s/\//\\/g; # / <- # color coding issue in devenv
+
+        # If there is no directory in the executable name, then we are going
+        # to search the PATH for the executable.
+        if ($has_which && $executable !~ m/\//) {
+            my $which = File::Which::which ($executable);
+
+            if ($which ne "") {
+                $executable = $which;
+            }
+        }
     }
 
     return $executable;
@@ -178,6 +195,7 @@ sub IgnoreExeSubDir
         $self->{IGNOREEXESUBDIR} = shift;
     }
     elsif (@_ != 0 && $self->{EXECUTABLE} =~ /perl$/) {
+        print ("==== automatically ignoring...\n");
         $self->{IGNOREEXESUBDIR} = shift;
     }
 
diff --git a/ACE/bin/cleanbuilds.sh b/ACE/bin/cleanbuilds.sh
new file mode 100755
index 00000000000..bae822867f1
--- /dev/null
+++ b/ACE/bin/cleanbuilds.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+# $Id$
+
+if test -z $ACE_ROOT; then ACE_ROOT=..; fi
+if test -z $TAO_ROOT; then TAO_ROOT=${ACE_ROOT}/TAO; fi
+if test -z $CIAO_ROOT; then CIAO_ROOT=${TAO_ROOT}/CIAO; fi
+if test -z $DANCE_ROOT; then DANCE_ROOT=${TAO_ROOT}/DAnCE; fi
+#
+wget http://download.theaceorb.nl/teststat/cleanbuild_testfails-YYYY_MM_DD.txt -O cleanbuild.txt
+#
+grep -h \!FIXED_BUGS_ONLY ${ACE_ROOT}/tests/*.lst ${ACE_ROOT}/bin/*.lst ${TAO_ROOT}/bin/*.lst ${CIAO_ROOT}/bin/*.lst ${DANCE_ROOT}/bin/*.lst | sed -e "s/^\([^\:]*\).*/\1/" | sed -e "s/\(\/run_test.pl\)\?\s*$//" > Ignore.txt
+#
+cat cleanbuild.txt | grep -v -f Ignore.txt | tee cleanbuildresults.txt
+
diff --git a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh
index 7db9fb35556..e28e9f3c785 100755
--- a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh
+++ b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # $Id$
 
-if test -z $1; then olddate=2011_10_10; else olddate=$1; fi
+if test -z $1; then olddate=2011_12_04; else olddate=$1; fi
 if test -z $2; then newdate=`date -u +%Y_%m_%d`; else newdate=$2; fi
 if test -z $3; then prefix=`date -u +%Y%m%d%a`; else prefix=$3; fi
 if test -z $ACE_ROOT; then ACE_ROOT=..; fi
diff --git a/ACE/bin/mail_test_stats.sh b/ACE/bin/mail_test_stats.sh
index 0c094ac3f48..d778984c2bd 100755
--- a/ACE/bin/mail_test_stats.sh
+++ b/ACE/bin/mail_test_stats.sh
@@ -5,6 +5,7 @@ export TREE_ROOT=$HOME/ACE/latest
 export ACE_ROOT=$TREE_ROOT/ACE_wrappers
 export TAO_ROOT=$ACE_ROOT/TAO
 export CIAO_ROOT=$TAO_ROOT/CIAO
+export DANCE_ROOT=$TAO_ROOT/DAnCE
 mkdir -p $TREE_ROOT
 cd $TREE_ROOT
 svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/sets-anon/ACE+TAO+CIAO .
@@ -13,7 +14,10 @@ rm *Tests.txt
 rm *TestRev.txt
 rm *Ignore.txt
 rm *Builds.txt
+rm cleanbuildresults.txt
+
 ./diff-builds-and-group-fixed-tests-only.sh
+./cleanbuilds.sh
 
 MAILTO="devo-group@list.isis.vanderbilt.edu"
 MAIL="mail -S smtp=mail.remedy.nl"
@@ -44,3 +48,13 @@ $MAIL -r $MAILFROM -s "ACE/TAO/CIAO test statistics for $CURRENTDATE" $MAILTO <
 
 rm -f $mailfile
 
+mailfile="/tmp/rsmailfile"
+{
+   echo "Sending failing tests for " $CURRENTDATE
+   echo
+   cat cleanbuildresults.txt
+} > $mailfile
+
+$MAIL -r $MAILFROM -s "ACE/TAO/CIAO failing tests for $CURRENTDATE" $MAILTO < $mailfile
+
+rm -f $mailfile
diff --git a/ACE/debian/ace.dsc b/ACE/debian/ace.dsc
index 21f178f3a81..cf89422a092 100644
--- a/ACE/debian/ace.dsc
+++ b/ACE/debian/ace.dsc
@@ -1,10 +1,10 @@
 Format: 1.0
-Source: ACE+TAO+CIAO-src-6.0.5
-Version: 2.0.5
+Source: ACE+TAO+CIAO-src-6.0.6
+Version: 2.0.6
 Binary: ace
 Maintainer: Johnny Willemsen  <jwillemsen@remedy.nl>
 Architecture: any
 Build-Depends: gcc, make, g++, debhelper (>= 5), libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev (>= 8.4.7), zlib1g-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev, doxygen, graphviz
 Files:
- 65b34001c9605f056713a7e146b052d1 46346654 ACE+TAO+CIAO-src-6.0.5.tar.gz
+ 65b34001c9605f056713a7e146b052d1 46346654 ACE+TAO+CIAO-src-6.0.6.tar.gz
 
diff --git a/ACE/debian/debian.control b/ACE/debian/debian.control
index ef2c535d2f6..172cb1ef9c4 100644
--- a/ACE/debian/debian.control
+++ b/ACE/debian/debian.control
@@ -27,7 +27,7 @@ Description: makefile, project, and workspace creator
   * mpc-ace: generates project files for a single target
   * mwc-ace: generates workspace files for a set of projects
 
-Package: libace-6.0.5
+Package: libace-6.0.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -45,7 +45,7 @@ Description: C++ network programming framework
 Package: libace-dev
 Architecture: any
 Section: libdevel
-Depends: libace-6.0.5 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-6.0.6 (= ${binary:Version}), ${misc:Depends}
 Suggests: libace-doc, libtao-dev, pkg-config
 Replaces: mpc-ace (<< 5.6.3-4)
 Description: C++ network programming framework - development files
@@ -62,7 +62,7 @@ Description: C++ network programming framework - documentation
  This package contains the ACE overview documentation, tutorials,
  examples, and information regarding upstream development.
 
-Package: libace-ssl-6.0.5
+Package: libace-ssl-6.0.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -73,12 +73,12 @@ Description: ACE secure socket layer library
 Package: libace-ssl-dev
 Architecture: any
 Section: libdevel
-Depends: libace-ssl-6.0.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 6.0.5d), ${misc:Depends}
+Depends: libace-ssl-6.0.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 6.0.6d), ${misc:Depends}
 Description: ACE secure socket layer library - development files
  This package contains the header files and static library for the ACE
  SSL library.
 
-Package: libace-rmcast-6.0.5
+Package: libace-rmcast-6.0.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -92,12 +92,12 @@ Description: ACE reliable multicast library
 Package: libace-rmcast-dev
 Architecture: any
 Section: libdevel
-Depends: libace-rmcast-6.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-rmcast-6.0.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE reliable multicast library - development files
  This package contains the header files and static library for the ACE
  reliable multicast library.
 
-Package: libace-tmcast-6.0.5
+Package: libace-tmcast-6.0.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -111,12 +111,12 @@ Description: ACE transactional multicast library
 Package: libace-tmcast-dev
 Architecture: any
 Section: libdevel
-Depends: libace-tmcast-6.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-tmcast-6.0.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE transactional multicast library - development files
  This package contains the header files and static library for the ACE
  transactional multicast library.
 
-Package: libace-htbp-6.0.5
+Package: libace-htbp-6.0.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -130,12 +130,12 @@ Description: ACE protocol over HTTP tunneling library
 Package: libace-htbp-dev
 Architecture: any
 Section: libdevel
-Depends: libace-htbp-6.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-htbp-6.0.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE protocol over HTTP tunneling library - development files
  This package contains the header files and static library for the ACE
  HTBP library.
 
-Package: libace-inet-6.0.5
+Package: libace-inet-6.0.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -146,15 +146,15 @@ Description: ACE Inet protocol library
 Package: libace-inet-dev
 Architecture: any
 Section: libdevel
-Depends: libace-inet-6.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-6.0.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE Inet protocol library - development files
  This package contains the header files and static library for the ACE
  Inet protocol library.
 
-Package: libace-inet-ssl-6.0.5
+Package: libace-inet-ssl-6.0.6
 Architecture: any
 Section: libs
-Depends: libace-inet-6.0.3, libace-ssl-6.0.5, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-6.0.3, libace-ssl-6.0.6, ${shlibs:Depends}, ${misc:Depends}
 Description: ACE SSL-enabled Inet protocol library
  This package provides an ACE addon library for clients (and possibly
  servers at some point) using Inet protocols which support SSL, such as
@@ -163,7 +163,7 @@ Description: ACE SSL-enabled Inet protocol library
 Package: libace-inet-ssl-dev
 Architecture: any
 Section: libdevel
-Depends: libace-inet-ssl-6.0.5 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-ssl-6.0.6 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE SSL-enabled Inet protocol library - development files
  This package contains the header files and static library for the ACE
  SSL-enabled Inet protocol library.
@@ -188,7 +188,7 @@ Description: ACE perfect hash function generator (transitional package)
  .
  It can be safely removed after installation.
 
-Package: libacexml-6.0.5
+Package: libacexml-6.0.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -204,16 +204,16 @@ Package: libacexml-dev
 Architecture: any
 Section: libdevel
 Replaces: libace-dev (<< 5.7.7-4)
-Depends: libacexml-6.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libacexml-6.0.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE SAX based XML parsing library - development files
  This package contains the header files and static library for the ACE
  XML parsing library.
 
-Package: libkokyu-6.0.5
+Package: libkokyu-6.0.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: libtao-2.0.3, libtao-orbsvcs-2.0.5
+Suggests: libtao-2.0.3, libtao-orbsvcs-2.0.6
 Description: ACE scheduling and dispatching library
  Kokyu is a library designed to provide flexible scheduling and
  dispatching services.
@@ -224,12 +224,12 @@ Description: ACE scheduling and dispatching library
 Package: libkokyu-dev
 Architecture: any
 Section: libdevel
-Depends: libkokyu-6.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libkokyu-6.0.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE scheduling and dispatching library - development files
  This package contains the header files and static library for the ACE
  scheduling and dispatching library.
 
-Package: libace-qtreactor-6.0.5
+Package: libace-qtreactor-6.0.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -248,12 +248,12 @@ Description: ACE-GUI reactor integration for Qt
 Package: libace-qtreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-qtreactor-6.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), libqt4-dev, ${misc:Depends}
+Depends: libace-qtreactor-6.0.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libqt4-dev, ${misc:Depends}
 Description: ACE-GUI reactor integration for Qt - development files
  This package contains header files and static library for the ACE-Qt
  reactor integration.
 
-Package: libace-xtreactor-6.0.5
+Package: libace-xtreactor-6.0.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -271,12 +271,12 @@ Description: ACE-GUI reactor integration for Xt
 Package: libace-xtreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-xtreactor-6.0.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.0.5), ${misc:Depends}
+Depends: libace-xtreactor-6.0.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.0.6), ${misc:Depends}
 Description: ACE-GUI reactor integration for Xt - development files
  This package contains header files and static library for the ACE-Xt
  reactor integration.
 
-Package: libace-tkreactor-6.0.5
+Package: libace-tkreactor-6.0.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -295,12 +295,12 @@ Description: ACE-GUI reactor integration for Tk
 Package: libace-tkreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-tkreactor-6.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
+Depends: libace-tkreactor-6.0.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
 Description: ACE-GUI reactor integration for Tk - development files
  This package contains header files and static library for the ACE-Tk
  reactor integration.
 
-Package: libace-flreactor-6.0.5
+Package: libace-flreactor-6.0.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -318,12 +318,12 @@ Description: ACE-GUI reactor integration for Fl
 Package: libace-flreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-flreactor-6.0.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.0.5), ${misc:Depends}
+Depends: libace-flreactor-6.0.3 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.0.6), ${misc:Depends}
 Description: ACE-GUI reactor integration for Fl - development files
  This package contains header files and static library for the ACE-Fl
  reactor integration.
 
-Package: libace-foxreactor-6.0.5
+Package: libace-foxreactor-6.0.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -340,12 +340,12 @@ Description: ACE-GUI reactor integration for FOX
 Package: libace-foxreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-foxreactor-6.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Depends: libace-foxreactor-6.0.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
 Description: ACE-GUI reactor integration for FOX - development files
  This package contains header files and static library for the ACE-FOX
  reactor integration.
 
-Package: libtao-2.0.5
+Package: libtao-2.0.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -360,7 +360,7 @@ Package: libtao-dev
 Architecture: any
 Section: libdevel
 Replaces: libtao-orbsvcs-dev (<< 5.7.7-4)
-Depends: libtao-2.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-2.0.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Suggests: libtao-doc, libtao-orbsvcs-dev
 Description: ACE based CORBA ORB core libraries - development files
  This package contains the header files for TAO. Due to the size of
@@ -376,7 +376,7 @@ Description: ACE based CORBA ORB core libraries - documentation
  This package contains the TAO overview documentation, tutorials,
  examples, and information regarding upstream development.
 
-Package: libtao-orbsvcs-2.0.5
+Package: libtao-orbsvcs-2.0.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -387,14 +387,14 @@ Package: libtao-orbsvcs-dev
 Architecture: any
 Section: libdevel
 Replaces: libtao-dev (<< 5.7.7-4)
-Depends: libtao-orbsvcs-2.0.5 (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-orbsvcs-2.0.6 (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO CORBA services - development files
  This package contains the header files for the TAO CORBA services.
  .
  The examples and some documentation have been included as well, but the
  static libraries have been left out due to their size (over 400MB).
 
-Package: libtao-qtresource-2.0.5
+Package: libtao-qtresource-2.0.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -405,12 +405,12 @@ Description: TAO-GUI reactor integration for Qt
 Package: libtao-qtresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-qtresource-2.0.5 (= ${binary:Version}), libace-qtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-qtresource-2.0.6 (= ${binary:Version}), libace-qtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO-GUI reactor integration for Qt - development files
  This package contains header files and static library for the TAO-Qt
  reactor integration.
 
-Package: libtao-xtresource-2.0.5
+Package: libtao-xtresource-2.0.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -421,12 +421,12 @@ Description: TAO-GUI reactor integration for Xt
 Package: libtao-xtresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-xtresource-2.0.5 (= ${binary:Version}), libace-xtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-xtresource-2.0.6 (= ${binary:Version}), libace-xtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO-GUI reactor integration for Xt - development files
  This package contains header files and static library for the TAO-Xt
  reactor integration.
 
-Package: libtao-flresource-2.0.5
+Package: libtao-flresource-2.0.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -437,12 +437,12 @@ Description: TAO-GUI reactor integration for Fl
 Package: libtao-flresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-flresource-2.0.5 (= ${binary:Version}), libace-flreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-flresource-2.0.6 (= ${binary:Version}), libace-flreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO-GUI reactor integration for Fl - development files
  This package contains header files and static library for the TAO-Fl
  reactor integration.
 
-Package: libtao-tkresource-2.0.5
+Package: libtao-tkresource-2.0.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -453,12 +453,12 @@ Description: TAO-GUI reactor integration for Tk
 Package: libtao-tkresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-tkresource-2.0.5 (= ${binary:Version}), libace-tkreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-tkresource-2.0.6 (= ${binary:Version}), libace-tkreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO-GUI reactor integration for Tk - development files
  This package contains header files and static library for the TAO-Tk
  reactor integration.
 
-Package: libtao-foxresource-2.0.5
+Package: libtao-foxresource-2.0.6
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -469,14 +469,14 @@ Description: TAO-GUI reactor integration for FOX
 Package: libtao-foxresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-foxresource-2.0.5 (= ${binary:Version}), libace-foxreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-foxresource-2.0.6 (= ${binary:Version}), libace-foxreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO-GUI reactor integration for FOX - development files
  This package contains header files and static library for the TAO-FOX
  reactor integration.
 
 Package: tao-idl
 Architecture: any
-Depends: g++, libtao-2.0.5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: g++, libtao-2.0.6 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: TAO IDL to C++ compiler
  This package provides an Interface Definition Language (IDL) to C++
  compiler.
@@ -486,7 +486,7 @@ Description: TAO IDL to C++ compiler
 
 Package: tao-ifr
 Architecture: any
-Depends: g++, libtao-2.0.5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: g++, libtao-2.0.6 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: TAO interface repository
  CORBA-aware programs can contact an interface repository to get
  objects' interfaces at run-time. Then they can use the Dynamic
diff --git a/ACE/debian/libace-6.0.5.docs b/ACE/debian/libace-6.0.6.docs
index 3bdab5b0089..3bdab5b0089 100644
--- a/ACE/debian/libace-6.0.5.docs
+++ b/ACE/debian/libace-6.0.6.docs
diff --git a/ACE/debian/libace-6.0.5.install b/ACE/debian/libace-6.0.6.install
index d9afda38c12..d9afda38c12 100644
--- a/ACE/debian/libace-6.0.5.install
+++ b/ACE/debian/libace-6.0.6.install
diff --git a/ACE/debian/libace-flreactor-6.0.5.install b/ACE/debian/libace-flreactor-6.0.6.install
index 528836aacee..528836aacee 100644
--- a/ACE/debian/libace-flreactor-6.0.5.install
+++ b/ACE/debian/libace-flreactor-6.0.6.install
diff --git a/ACE/debian/libace-foxreactor-6.0.5.install b/ACE/debian/libace-foxreactor-6.0.6.install
index e360f29f5af..e360f29f5af 100644
--- a/ACE/debian/libace-foxreactor-6.0.5.install
+++ b/ACE/debian/libace-foxreactor-6.0.6.install
diff --git a/ACE/debian/libace-htbp-6.0.5.install b/ACE/debian/libace-htbp-6.0.6.install
index 08103fd5cad..08103fd5cad 100644
--- a/ACE/debian/libace-htbp-6.0.5.install
+++ b/ACE/debian/libace-htbp-6.0.6.install
diff --git a/ACE/debian/libace-inet-6.0.5.install b/ACE/debian/libace-inet-6.0.6.install
index 59a73a509d0..59a73a509d0 100644
--- a/ACE/debian/libace-inet-6.0.5.install
+++ b/ACE/debian/libace-inet-6.0.6.install
diff --git a/ACE/debian/libace-inet-ssl-6.0.5.install b/ACE/debian/libace-inet-ssl-6.0.6.install
index b9b8b9045f7..b9b8b9045f7 100644
--- a/ACE/debian/libace-inet-ssl-6.0.5.install
+++ b/ACE/debian/libace-inet-ssl-6.0.6.install
diff --git a/ACE/debian/libace-qtreactor-6.0.5.install b/ACE/debian/libace-qtreactor-6.0.6.install
index 1d371e1e571..1d371e1e571 100644
--- a/ACE/debian/libace-qtreactor-6.0.5.install
+++ b/ACE/debian/libace-qtreactor-6.0.6.install
diff --git a/ACE/debian/libace-rmcast-6.0.5.install b/ACE/debian/libace-rmcast-6.0.6.install
index 86e78259853..86e78259853 100644
--- a/ACE/debian/libace-rmcast-6.0.5.install
+++ b/ACE/debian/libace-rmcast-6.0.6.install
diff --git a/ACE/debian/libace-ssl-6.0.5.NEWS b/ACE/debian/libace-ssl-6.0.6.NEWS
index e5bd0e4aa10..e5bd0e4aa10 100644
--- a/ACE/debian/libace-ssl-6.0.5.NEWS
+++ b/ACE/debian/libace-ssl-6.0.6.NEWS
diff --git a/ACE/debian/libace-ssl-6.0.5.install b/ACE/debian/libace-ssl-6.0.6.install
index 8df45a6d55f..8df45a6d55f 100644
--- a/ACE/debian/libace-ssl-6.0.5.install
+++ b/ACE/debian/libace-ssl-6.0.6.install
diff --git a/ACE/debian/libace-tkreactor-6.0.5.install b/ACE/debian/libace-tkreactor-6.0.6.install
index 12ab35062d2..12ab35062d2 100644
--- a/ACE/debian/libace-tkreactor-6.0.5.install
+++ b/ACE/debian/libace-tkreactor-6.0.6.install
diff --git a/ACE/debian/libace-tmcast-6.0.5.install b/ACE/debian/libace-tmcast-6.0.6.install
index e066131dea0..e066131dea0 100644
--- a/ACE/debian/libace-tmcast-6.0.5.install
+++ b/ACE/debian/libace-tmcast-6.0.6.install
diff --git a/ACE/debian/libace-xtreactor-6.0.5.install b/ACE/debian/libace-xtreactor-6.0.6.install
index c53614c7208..c53614c7208 100644
--- a/ACE/debian/libace-xtreactor-6.0.5.install
+++ b/ACE/debian/libace-xtreactor-6.0.6.install
diff --git a/ACE/debian/libacexml-6.0.5.docs b/ACE/debian/libacexml-6.0.6.docs
index 002855d7915..002855d7915 100644
--- a/ACE/debian/libacexml-6.0.5.docs
+++ b/ACE/debian/libacexml-6.0.6.docs
diff --git a/ACE/debian/libacexml-6.0.5.install b/ACE/debian/libacexml-6.0.6.install
index d3e912ffa51..d3e912ffa51 100644
--- a/ACE/debian/libacexml-6.0.5.install
+++ b/ACE/debian/libacexml-6.0.6.install
diff --git a/ACE/debian/libkokyu-6.0.5.docs b/ACE/debian/libkokyu-6.0.6.docs
index e8869c513b2..e8869c513b2 100644
--- a/ACE/debian/libkokyu-6.0.5.docs
+++ b/ACE/debian/libkokyu-6.0.6.docs
diff --git a/ACE/debian/libkokyu-6.0.5.install b/ACE/debian/libkokyu-6.0.6.install
index 62854308f96..62854308f96 100644
--- a/ACE/debian/libkokyu-6.0.5.install
+++ b/ACE/debian/libkokyu-6.0.6.install
diff --git a/ACE/debian/libtao-2.0.5.docs b/ACE/debian/libtao-2.0.6.docs
index 6ed40bf21ea..6ed40bf21ea 100644
--- a/ACE/debian/libtao-2.0.5.docs
+++ b/ACE/debian/libtao-2.0.6.docs
diff --git a/ACE/debian/libtao-2.0.5.install b/ACE/debian/libtao-2.0.6.install
index 65d040bd469..65d040bd469 100644
--- a/ACE/debian/libtao-2.0.5.install
+++ b/ACE/debian/libtao-2.0.6.install
diff --git a/ACE/debian/libtao-flresource-2.0.5.install b/ACE/debian/libtao-flresource-2.0.6.install
index 5d4ee6ce57a..5d4ee6ce57a 100644
--- a/ACE/debian/libtao-flresource-2.0.5.install
+++ b/ACE/debian/libtao-flresource-2.0.6.install
diff --git a/ACE/debian/libtao-foxresource-2.0.5.install b/ACE/debian/libtao-foxresource-2.0.6.install
index 6ceb47601aa..6ceb47601aa 100644
--- a/ACE/debian/libtao-foxresource-2.0.5.install
+++ b/ACE/debian/libtao-foxresource-2.0.6.install
diff --git a/ACE/debian/libtao-orbsvcs-2.0.5.NEWS b/ACE/debian/libtao-orbsvcs-2.0.6.NEWS
index ea0759e0ade..ea0759e0ade 100644
--- a/ACE/debian/libtao-orbsvcs-2.0.5.NEWS
+++ b/ACE/debian/libtao-orbsvcs-2.0.6.NEWS
diff --git a/ACE/debian/libtao-orbsvcs-2.0.5.install b/ACE/debian/libtao-orbsvcs-2.0.6.install
index e0e491e9095..e0e491e9095 100644
--- a/ACE/debian/libtao-orbsvcs-2.0.5.install
+++ b/ACE/debian/libtao-orbsvcs-2.0.6.install
diff --git a/ACE/debian/libtao-qtresource-2.0.5.install b/ACE/debian/libtao-qtresource-2.0.6.install
index 172f4c45db8..172f4c45db8 100644
--- a/ACE/debian/libtao-qtresource-2.0.5.install
+++ b/ACE/debian/libtao-qtresource-2.0.6.install
diff --git a/ACE/debian/libtao-tkresource-2.0.5.install b/ACE/debian/libtao-tkresource-2.0.6.install
index 7f543154b5b..7f543154b5b 100644
--- a/ACE/debian/libtao-tkresource-2.0.5.install
+++ b/ACE/debian/libtao-tkresource-2.0.6.install
diff --git a/ACE/debian/libtao-xtresource-2.0.5.install b/ACE/debian/libtao-xtresource-2.0.6.install
index ab5151ed073..ab5151ed073 100644
--- a/ACE/debian/libtao-xtresource-2.0.5.install
+++ b/ACE/debian/libtao-xtresource-2.0.6.install
diff --git a/ACE/docs/Download.html b/ACE/docs/Download.html
index 581f8d45b2f..e7a4bded6dc 100644
--- a/ACE/docs/Download.html
+++ b/ACE/docs/Download.html
@@ -72,7 +72,7 @@ case.  You may want to understand the DOC group's <A
 HREF="https://svn.dre.vanderbilt.edu/viewvc/Middleware/trunk/ACE/docs/ACE-bug-process.html?revision=HEAD">
 bug fixing policies</A> when you make this decision.  </P>The full
 packages do contain all sources with pre generated makefiles for GNU
-make, Visual C++ 8.0/9.0/10.0. The
+make, Visual C++ 9.0/10.0. The
 sources-only packages just contain the source code, you have to generate
 your own makefiles with MPC.  </P>
 <P>
@@ -90,128 +90,128 @@ of the ACE, TAO, and CIAO micro release kit is available for
   <TR><TH>Filename</TH><TH>Description</TH><TH>Full</TH><TH>Sources only</TH></TR>
   <TR><TD>ACE+TAO+CIAO.tar.gz</TD>
       <TD>ACE+TAO+CIAO (tar+gzip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.0.5.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.0.5.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.0.6.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.0.6.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.0.5.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.0.5.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.0.6.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.0.6.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO+CIAO.tar.bz2</TD>
       <TD>ACE+TAO+CIAO (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.0.5.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.0.5.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.0.6.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.0.6.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.0.5.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.0.5.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.0.6.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.0.6.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO+CIAO.zip</TD>
       <TD>ACE+TAO+CIAO (zip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.0.5.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.0.5.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.0.6.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.0.6.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.0.5.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.0.5.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.0.6.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.0.6.zip">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO+DAnCE.tar.gz</TD>
       <TD>ACE+TAO+DAnCE (tar+gzip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.0.5.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.0.5.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.0.6.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.0.6.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.0.5.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.0.5.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.0.6.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.0.6.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO+DAnCE.tar.bz2</TD>
       <TD>ACE+TAO+DAnCE (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.0.5.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.0.5.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.0.6.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.0.6.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.0.5.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.0.5.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.0.6.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.0.6.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO+DAnCE.zip</TD>
       <TD>ACE+TAO+DAnCE (zip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.0.5.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.0.5.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.0.6.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.0.6.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.0.5.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.0.5.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.0.6.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.0.6.zip">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO.tar.gz</TD>
       <TD>ACE+TAO (tar+gzip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.0.5.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.0.5.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.0.6.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.0.6.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.0.5.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.0.5.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.0.6.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.0.6.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO.tar.bz2</TD>
       <TD>ACE+TAO (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.0.5.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.0.5.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.0.6.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.0.6.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.0.5.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.0.5.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.0.6.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.0.6.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO.zip</TD>
       <TD>ACE+TAO (zip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.0.5.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.0.5.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.0.6.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.0.6.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.0.5.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.0.5.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.0.6.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.0.6.zip">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE-html.tar.gz</TD>
       <TD>Doxygen documentation for ACE+TAO+CIAO (tar+gzip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.0.5.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.0.5.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.0.6.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.0.6.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE-html.tar.bz2</TD>
       <TD>Doxygen documentation for ACE+TAO+CIAO (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.0.5.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.0.5.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.0.6.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.0.6.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE-html.zip</TD>
       <TD>Doxygen documentation for ACE+TAO+CIAO (zip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.0.5.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.0.5.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.0.6.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.0.6.zip">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE.tar.gz</TD>
       <TD>ACE only (tar+gzip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.0.5.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.0.5.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.0.6.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.0.6.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.0.5.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.0.5.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.0.6.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.0.6.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE.tar.bz2</TD>
       <TD>ACE only (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.0.5.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.0.5.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.0.6.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.0.6.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.0.5.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.0.5.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.0.6.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.0.6.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE.zip</TD>
       <TD>ACE only (zip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.0.5.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.0.5.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.0.6.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.0.6.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.0.5.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.0.5.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.0.6.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.0.6.zip">FTP</A>]
       </TD>
   </TR>
 </TABLE>
diff --git a/ACE/docs/bczar/bczar.html b/ACE/docs/bczar/bczar.html
index 0c4518d8548..ee52484b4b2 100644
--- a/ACE/docs/bczar/bczar.html
+++ b/ACE/docs/bczar/bczar.html
@@ -107,7 +107,7 @@
           </ul>
           If you want to perform a full build with qt support, than run:
           <ul>
-            <li><code>yum install perl svn screen pysvn automake doxygen bzip2 tar gzip openssh graphviz zip libtool gcc-c++ boost-devel valgrind openssl-devel gcc qt4 fltk-devel bzip2-devel rsync openssl lzo-devel zziplib-devel acpid acpi nfs-utils java xerces-c xerces-c-devel mc qt qt-devel icecream ruby ruby-devel lksctp-tools-devel git glibc.i686 libstdc++.i686 ncurses-libs.i686 zlib.i686 telnet GitPython</code></li>
+            <li><code>yum install perl svn screen pysvn automake doxygen bzip2 tar gzip openssh graphviz zip libtool gcc-c++ boost-devel valgrind openssl-devel gcc qt4 fltk-devel bzip2-devel rsync openssl lzo-devel zziplib-devel acpid acpi nfs-utils java xerces-c xerces-c-devel mc qt qt-devel icecream ruby ruby-devel lksctp-tools-devel git glibc.i686 libstdc++.i686 ncurses-libs.i686 zlib.i686 telnet GitPython NetworkManager wget mailx</code></li>
           </ul>
         </li>
         <li>
@@ -305,11 +305,12 @@
         rm -rf doxygen<br>
         mkdir doxygen<br>
         cd doxygen<br>
+		wget https://svn.dre.vanderbilt.edu/viewvc/Middleware/trunk/ACE/docs/svn/config?view=co -O $HOME/.subversion/config
         svn co
-        svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_0_6/ACE ACE_wrappers<br>
-        svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_0_6/TAO ACE_wrappers/TAO<br>
-        svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_0_6/CIAO ACE_wrappers/TAO/CIAO<br>
-        svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_0_6/DAnCE ACE_wrappers/TAO/DAnCE<br>
+        svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_1_06/ACE ACE_wrappers<br>
+        svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_1_0/TAO ACE_wrappers/TAO<br>
+        svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_1_0/CIAO ACE_wrappers/TAO/CIAO<br>
+        svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_1_0/DAnCE ACE_wrappers/TAO/DAnCE<br>
         cd ACE_wrappers<br>
         export ACE_ROOT=$PWD<br>
         $ACE_ROOT/bin/generate_rel_manpages<br>
diff --git a/ACE/etc/index.html b/ACE/etc/index.html
index 8d13ee5a25e..27b209d667c 100644
--- a/ACE/etc/index.html
+++ b/ACE/etc/index.html
@@ -35,6 +35,7 @@
     <hr>
     We do have the documentation for previous releases
     <ul>
+      <LI><P><A HREF="6.0.6/html">6.0.6</A></P></LI>
       <LI><P><A HREF="6.0.5/html">6.0.5</A></P></LI>
       <LI><P><A HREF="6.0.4/html">6.0.4</A></P></LI>
       <LI><P><A HREF="6.0.3/html">6.0.3</A></P></LI>
diff --git a/ACE/include/makeinclude/wrapper_macros.GNU b/ACE/include/makeinclude/wrapper_macros.GNU
index 29f8650283e..ef7e47cc311 100644
--- a/ACE/include/makeinclude/wrapper_macros.GNU
+++ b/ACE/include/makeinclude/wrapper_macros.GNU
@@ -289,7 +289,6 @@ IDL_CLIENT_HDR_EXT ?= C.h
 IDL_CLIENT_INL_EXT ?= C.inl
 IDL_CLIENT_SRC_EXT ?= C.cpp
 IDL_SERVER_HDR_EXT ?= S.h
-IDL_SERVER_INL_EXT ?= S.inl
 IDL_SERVER_SRC_EXT ?= S.cpp
 IDL_SERVER_THDR_EXT ?= S_T.h
 IDL_SERVER_TINL_EXT ?= S_T.inl
diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec
index f8feb93d11e..cd4a194f4d6 100644
--- a/ACE/rpmbuild/ace-tao.spec
+++ b/ACE/rpmbuild/ace-tao.spec
@@ -1,7 +1,7 @@
 # Set the version number here.
-%define ACEVER  6.0.5
-%define TAOVER  2.0.5
-%define CIAOVER 1.0.5
+%define ACEVER  6.0.6
+%define TAOVER  2.0.6
+%define CIAOVER 1.0.6
 
 # Conditional build
 # Default values are
diff --git a/ACE/tests/Atomic_Op_Test.cpp b/ACE/tests/Atomic_Op_Test.cpp
index 98a30d27cce..3eb37a49abb 100644
--- a/ACE/tests/Atomic_Op_Test.cpp
+++ b/ACE/tests/Atomic_Op_Test.cpp
@@ -18,12 +18,65 @@
 
 #include "test_config.h"
 
-
-
 #include "ace/Atomic_Op.h"
 #include "ace/Synch_Traits.h"
 #include "ace/Time_Value.h"
 #include "ace/OS_NS_sys_time.h"
+#include "ace/Barrier.h"
+#include "ace/Task.h"
+
+
+/*
+ * Exchange_Test tests the exchange() operation in ACE_Atomic_Op. It runs
+ * a number of threads and each tries to "claim" the op_ by exchanging it
+ * with '1'. Only one thread should do this. The claimed_ member counts
+ * the number of threads that actually do claim it.
+ */
+template <typename T>
+class Exchange_Tester : public ACE_Task<ACE_NULL_SYNCH>
+{
+public:
+  Exchange_Tester (unsigned int thr_count);
+  int result (void) const;
+
+private:
+  Exchange_Tester () {}
+  int svc (void);
+
+  ACE_Barrier barrier_;
+  ACE_Atomic_Op<ACE_SYNCH_MUTEX, T> op_;
+  ACE_Atomic_Op<ACE_SYNCH_MUTEX, int> claimed_;
+};
+
+template <typename T>
+Exchange_Tester<T>::Exchange_Tester (unsigned int thr_count)
+  : barrier_(thr_count), op_ (0), claimed_ (0)
+{
+  this->activate (THR_NEW_LWP | THR_JOINABLE | THR_INHERIT_SCHED,
+                  (int)thr_count);
+}
+
+template <typename T>
+int
+Exchange_Tester<T>::result (void) const
+{
+  return this->claimed_ == 1 ? 0 : 1;
+}
+
+template <typename T>
+int
+Exchange_Tester<T>::svc (void)
+{
+  this->barrier_.wait ();     // Want all threads to try to claim "at once"
+  bool claimed = this->op_.exchange (1) == 0;
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("Thread %t %s claim.\n"),
+              claimed ? ACE_TEXT ("DID") : ACE_TEXT ("DID NOT")));
+  if (claimed)
+    ++this->claimed_;
+  return 0;
+}
+
 
 template <typename TYPE, typename dummy>
 int test (const ACE_TCHAR* type, int iterations)
@@ -267,6 +320,24 @@ run_main (int, ACE_TCHAR *[])
   retval += test <long long, int> (ACE_TEXT("long long"), ITERATIONS);
 #endif
 
+#if defined (ACE_HAS_THREADS)
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing exchange with long\n")));
+  Exchange_Tester<long> e1 (5);
+  e1.wait ();
+  retval += e1.result ();
+
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing exchange with unsigned long\n")));
+  Exchange_Tester<unsigned long> e2 (5);
+  e2.wait ();
+  retval += e2.result ();
+
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing exchange with int\n")));
+  Exchange_Tester<int> e3 (5);
+  e3.wait ();
+  retval += e3.result ();
+
+#endif /* ACE_HAS_THREADS */
+
   ACE_END_TEST;
   return retval;
 }
diff --git a/ACE/tests/Cached_Accept_Conn_Test.cpp b/ACE/tests/Cached_Accept_Conn_Test.cpp
index c7a7877db96..1cda7d29263 100644
--- a/ACE/tests/Cached_Accept_Conn_Test.cpp
+++ b/ACE/tests/Cached_Accept_Conn_Test.cpp
@@ -33,8 +33,6 @@
 #pragma warning(disable:4503)
 #endif /* _MSC_VER */
 
-
-
 // Note: To keep both sunCC5.0 without debugging symbols and gcc2.7.3
 // happy, it was necessary to have the definitions of the methods of
 // the Accept_Strategy before the instantiations.
@@ -59,8 +57,7 @@ template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
 Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
                                                          bool restart)
 {
-  int result = ACCEPT_STRATEGY_BASE::open (local_addr,
-                                           restart);
+  int result = ACCEPT_STRATEGY_BASE::open (local_addr, restart);
 
   if (result == 0)
     return result;
diff --git a/ACE/tests/Cached_Accept_Conn_Test.h b/ACE/tests/Cached_Accept_Conn_Test.h
index c1ca61d74f0..e11880ba668 100644
--- a/ACE/tests/Cached_Accept_Conn_Test.h
+++ b/ACE/tests/Cached_Accept_Conn_Test.h
@@ -100,7 +100,6 @@ typedef ACE_NOOP_Concurrency_Strategy<Client_Svc_Handler>
 typedef ACE_Cached_Connect_Strategy_Ex<Client_Svc_Handler, ACE_SOCK_CONNECTOR, CACHING_STRATEGY, ATTRIBUTES, ACE_SYNCH_NULL_MUTEX>
         CACHED_CONNECT_STRATEGY;
 
-
 template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
 class Accept_Strategy : public ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>
 {
diff --git a/ACE/tests/MEM_Stream_Test.cpp b/ACE/tests/MEM_Stream_Test.cpp
index 66d13ae085e..14b1fa6bc4f 100644
--- a/ACE/tests/MEM_Stream_Test.cpp
+++ b/ACE/tests/MEM_Stream_Test.cpp
@@ -13,7 +13,6 @@
  */
 //=============================================================================
 
-
 #include "test_config.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
@@ -29,8 +28,6 @@
 #include "ace/Singleton.h"
 #include "ace/Atomic_Op.h"
 
-
-
 #if (defined (ACE_HAS_THREADS) || defined (ACE_HAS_PROCESS_SPAWN)) && \
     (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
 
diff --git a/ACE/tests/QtReactor_Test.cpp b/ACE/tests/QtReactor_Test.cpp
index 0f6cdb1f629..f07b56aacfc 100644
--- a/ACE/tests/QtReactor_Test.cpp
+++ b/ACE/tests/QtReactor_Test.cpp
@@ -265,14 +265,12 @@ ACE_HANDLE DgramHandler::get_handle () const
   return peer_.get_handle ();
 }
 
-int DgramHandler::handle_input (ACE_HANDLE handle)
+int DgramHandler::handle_input (ACE_HANDLE)
 {
-  ACE_UNUSED_ARG (handle);
   int recvBuffer;
   ACE_INET_Addr peerAddress;
-  int result;
 
-  result = peer_.recv (&recvBuffer, sizeof (recvBuffer) , peerAddress);
+  int result = peer_.recv (&recvBuffer, sizeof (recvBuffer) , peerAddress);
 
   if (0 >= result)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -865,11 +863,8 @@ TCPAcceptorHandler::~TCPAcceptorHandler ()
   ACE_TRACE ("TCPAcceptorHandler::~TCPAcceptorHandler");
 }
 
-void testNativeReactor (int argc, ACE_TCHAR *argv[])
+void testNativeReactor (int, ACE_TCHAR *[])
 {
-  ACE_UNUSED_ARG (argc);
-  ACE_UNUSED_ARG (argv);
-
   ACE_DEBUG ((LM_INFO, ACE_TEXT ("Testing autotest using native reactor\n")));
 
   ACE_Reactor      reactor;
diff --git a/ADBC/ChangeLog b/ADBC/ChangeLog
index 874caf843f0..703919174ea 100644
--- a/ADBC/ChangeLog
+++ b/ADBC/ChangeLog
@@ -1,8 +1,14 @@
+Wed Nov 23 16:13:17 UTC 2011  James H. Hill  <hillj at cs dot iupui dot edu>
+
+        * adbc/ODBC/ODBC_Types.h:
+
+          Added support for versioned namespace builds.
+
 Wed Jun  1 03:05:15 UTC 2011  James H. Hill  <hillj@cs.iupui.edu>
 
         * adbc/ODBC/ODBC.mpc:
 
-	  Added 'odbc' as a required feature.
+          Added 'odbc' as a required feature.
 
 Thu Apr 28 19:53:33 UTC 2011  James H. Hill  <hillj at cs dot iupui dot edu>
 
diff --git a/ADBC/adbc/ODBC/ODBC_Types.h b/ADBC/adbc/ODBC/ODBC_Types.h
index df4b4d54545..9a897ea7f6c 100644
--- a/ADBC/adbc/ODBC/ODBC_Types.h
+++ b/ADBC/adbc/ODBC/ODBC_Types.h
@@ -17,7 +17,9 @@
 #include "adbc/Types.h"
 
 // Forward decl.
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Date_Time;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 namespace ADBC
 {
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 25b74fad4db..0334ea96bb5 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,2033 +1,118 @@
-Wed Nov 02 08:30:13 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+Wed Dec  7 19:00:59 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        Merged changes from Remedy work branch.
+        * connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.mpc:
+          Fix problem in this mpc file
 
-        === start changelog ===
-
-        Tue Nov  1 09:11:13 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * tests/IDL_Test/Inherited_Component/Extended/Base.mpc:
-                  Layout changes.
-
-                * tests/IDL_Test/Inherited_Component/Extended/Derived.mpc:
-                  Linux link error.
-
-        Tue Nov  1 08:48:41 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * tests/IDL_Test/Inherited_Component/Extended/Derived.idl:
-                  Used module name to identify the supported interface.
-
-                * tests/IDL_Test/Inherited_Component/Extended/Derived.mpc:
-                  Fixed link issue on linux
-
-        Mon Oct 31 13:53:36 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * ciao/Containers/Extension/Extension_Container.h:
-                * ciao/Containers/Session/Session_Container.h:
-                * ciao/Contexts/Extension/Extension_Context_T.cpp:
-                * ciao/Deployment/Handlers/CIAO_Handler_Common.cpp:
-                * ciao/Deployment/Handlers/CIAO_State.cpp:
-                * ciao/Deployment/Handlers/Component_Handler.h:
-                * ciao/Deployment/Handlers/Component_Handler.cpp:
-                * ciao/Deployment/Handlers/Connection_Handler.cpp:
-                * ciao/Deployment/Handlers/Container_Handler.cpp:
-                * ciao/Deployment/Handlers/Home_Handler.h:
-                * ciao/Deployment/Handlers/Home_Handler.cpp:
-                * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp:
-                * ciao/Servants/Connector_Servant_Impl_Base.cpp:
-                  Several improvements regarding thread safety. Also
-                  some minor code layout changes.
-
-                * ciao/Containers/Extension/README:
-                * ciao/Contexts/Extension/README:
-                * ciao/Servants/Extension/README:
-                  Added: Extension containers are not ready to use, yet.
-
-        Sat Oct 29 14:25:16 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.mpc:
-                * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc:
-                * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc:
-                * connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc:
-                  Fuzz.
-
-                * connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc:
-                * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc:
-                * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc:
-                  Fixed double project names.
-
-        Fri Oct 28 15:55:29 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc:
-                * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc:
-                * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc:
-                  Fixed compile and link issues on windows
-
-        Fri Oct 28 15:04:03 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc:
-                  Fixed another link issue.
-
-        Fri Oct 28 15:00:43 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc:
-                  Fixed link issue on windows.
-
-        Fri Oct 28 14:55:18 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc:
-                  Fixed compile issues on windows.
-
-        Fri Oct 28 14:52:38 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc:
-                  Added libpaths.
-
-        Fri Oct 28 14:49:01 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc:
-                * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc:
-                  Fixed afters.
-
-        Fri Oct 28 14:18:46 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * connectors/dds4ccm/tests/IDL_Test:
-                * connectors/dds4ccm/tests/IDL_Test/Base:
-                * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl:
-                * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.mpc:
-                * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.idl:
-                * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc:
-                * connectors/dds4ccm/tests/IDL_Test/Component:
-                * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.idl:
-                * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc:
-                * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.idl:
-                * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc:
-                * connectors/dds4ccm/tests/IDL_Test/Connector:
-                * connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl:
-                * connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc:
-                  Compilation test.
-
-                * tests/IDL_Test/Inherited_Component/IhC_Bar.mpc:
-                  Fixed link issue
+Wed Dec  7 10:47:15 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        Fri Oct 28 14:17:05 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * tests/IDL_Test/Inherited_Component/Extended:
-
-                * tests/IDL_Test/Inherited_Component/Extended/Base.idl:
-                * tests/IDL_Test/Inherited_Component/Extended/Base.mpc:
-                * tests/IDL_Test/Inherited_Component/Extended/Derived.idl:
-                * tests/IDL_Test/Inherited_Component/Extended/Derived.mpc:
-                * tests/IDL_Test/Inherited_Component/Extended/Tester.cpp:
-                  Compilation test.
-
-        Thu Oct 27 10:10:00 UTC 2011  Martin Corino  <mcorino@remedy.nl>
-
-                * ciao/Deployment/Interceptors/Deployment_Interceptors.h:
-                * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp:
-
-                  Changed basic CIAO_ReferenceLookup_i to attempt handling resolving
-                  externalReference endpoints as CORBA IOR type references.
-                  Added factory method for creating interceptor.
-
-                * tests/DAnCE/ExecutionManager-Deployments/run_test.pl:
-
-                  Change to allow overruling CIAO_LOG_LEVEL from commandline.
-
-        === end changelog ===
-
-Tue Nov  1 19:23:58 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * MPC/config/ccm_svnt.mpb:
-        * MPC/config/ciao_container_base_stub.mpb:
-          Removed avoids_corba_e_compact, should work now
-
-Tue Nov  1 13:16:16 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp:
-        * tests/DAnCE/ExecutionManager-Deployments/run_test.pl:
-
-          Integrated improvements from Martin Corino <mcorino@remedy.nl>.
-
-Thu Nov 01 10:54:13 UTC 2011  Martin Corino  <mcorino@remedy.nl>
-
-        Merged changes from Remedy SA work branch.
+        Merged in the changes to update AMI4CCM to match the initial revision
+        with the synchronous port and the new pragma's added
 
         === start changelog ===
 
-        Tue Nov 01 08:41:15 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-                * tests/Collocation/Sender/Sender_exec.cpp:
-                Add define in test in case of CIAO not build with
-                ccm_direct_colloation.
-
-        Mon Oct 31 13:55:15 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-                * ciao/Containers/Container_Base.idl:
-                * ciao/Containers/Container_Base_T.h:
-                * ciao/Containers/Container_Base_T.cpp:
-                * ciao/Servants/Extension/Extension_Container.h:
-                * ciao/Servants/Connector_Servant_Impl_Base.cpp:
-                * ciao/Servants/Servant_Impl_Base.cpp:
-                * ciao/Servants/Servants.mpc:
-                Removed already disabled lines with servant- and portactivators
-
-                * ciao/Containers/CIAO_Servant_Activator.idl:
-                * ciao/Containers/CIAO_Servant_Activator.mpc:
-                * ciao/Containers/Servant_Activator.h:
-                * ciao/Containers/Servant_Activator.cpp:
-                * ciao/Servants/Port_Activator_T.cpp:
-                * ciao/Servants/Port_Activator_T.h:
-                * ciao/Servants/CIAO_Port_Activator.idl:
-                * ciao/Servants/Port_Activator.h:
-                * ciao/Servants/Port_Activator.cpp:
-                * MPC/config/ciao_port_activator_stub.mpb:
-                * MPC/config/ciao_servant_activator_stub.mpb:
-                * MPC/config/ciao_servant_activator.mpb:
-
-                Deleted this files.
-
-
-
-        Mon Oct 31 13:30:15 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-                * tests/Collocation/README:
-                Explanation of the test
-
-        Mon Oct 31 13:19:15 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-                * tests/Collocation/Coll_Base/Base.idl:
-                * tests/Collocation/Coll_Base/Base.mpc:
-                * tests/Collocation/Receiver/Receiver.idl:
-                * tests/Collocation/Receiver/Receiver_exec.h:
-                * tests/Collocation/Receiver/Receiver_exec.cpp:
-                * tests/Collocation/Sender/Sender.idl:
-                * tests/Collocation/Sender/Sender_exec.h:
-                * tests/Collocation/Sender/Sender_exec.cpp:
-                * tests/Collocation/descriptors/PlanAllOnOne.cdp:
-                * tests/Collocation/descriptors/run_test.pl:
-                Expanded test. Use different CollocationStrategies via
-                attributes in deploymentplans.
-
-        Tue Oct 27 07:16:24 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
-              * ciao/Containers/Extension/Extension_Containers.mpc:
-              Remove ciao_port_activator_stub and cia_servant_activator_stub
-              * ciao/Servants/Servant_Impl_Base.cpp:
-              Committed the right file now.
-
-        Wed Oct 26 12:018:24 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
-                * ciao/Containers/Session/Session_Containers.mpc:
-              Remove ciao_port_activator_stub and cia_servant_activator_stub
+        Thu Dec  1 09:50:06 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
 
-        Wed Oct 26 07:28:24 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+                * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp:
+                * connectors/ami4ccm/examples/Hello/descriptors/PlanSyncPort.cdp:
+                * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl:
+                * connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl:
+                * connectors/ami4ccm/tests/UsesMulti/descriptors/PlanSyncPort.cdp:
+                * connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl:
+                Changes for using now sync port ami connector beside Sender-Receiver connection
 
-                * ciao/Containers/Containers.mpc:
-              Remove ciao_port_activator_stub and cia_servant_activator_stub
+        Thu Dec  1 09:15:53 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
 
+                * connectors/ami4ccm/tests/InterMulti/descriptors/PlanSyncPort.cdp:
+                * connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl:
 
-        Wed Oct 26 07:28:24 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+                * connectors/ami4ccm/tests/UsesMulti/descriptors/PlanSyncPort.cdp:
+                * connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl:
+                Changes for using now sync port ami connector beside Sender-Receiver connection
 
-                * MPC/config/ciao_extension_container.mpb:
-                * MPC/config/ciao_extension_container_stub.mpb:
-                * MPC/config/ciao_servant.mpb:
-                * MPC/config/ciao_session_container.mpb:
-                * MPC/config/ciao_session_container_stub.mpb:
-                * ciao/Containers/Containers.mpc:
-                * ciao/Containers/Extension/Extension_Container.mpc:
-                * ciao/Containers/Session/Session_Container.mpc:
-                Remove ciao_port_activator_stub and cia_servant_activator_stub
+        Wed Nov 30 16:11:09 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
 
-                * ciao/Containers/CIAO_Servant_Activator.idl:
-                * ciao/Containers/CIAO_Servant_Activator.mpc:
-                * ciao/Containers/Servant_Activator.h:
-                * ciao/Containers/Servant_Activator.cpp:
-                * ciao/Servants/Port_Activator_T.cpp:
-                * ciao/Servants/CIAO_Port_Activator.idl:
-                Deactivate content. Later on if build successfull delete files
+                * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp:
+                * connectors/ami4ccm/tests/InterReturn/descriptors/Plan.cdp:
+                * connectors/ami4ccm/tests/InterReturn/descriptors/PlanSyncPort.cdp:
+                * connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl:
+                Run test also with sync port on AMI connector.
 
-                * ciao/Containers/Container_Base.idl:
-                * ciao/Containers/Container_Base_T.h:
-                * ciao/Containers/Container_Base_T.cpp:
-                * ciao/Servants/Connector_Servant_Impl_Base.cpp:
-                * ciao/Servants/Servant_Impl_Base.cpp:
-                * ciao/Servants/Servants.mpc:
-                Disable Servant_Activator and Port_Activator functionality,
-                Later on if build successfull delete lines
-
-                * tests/Collocation/Coll_Base/Base.mpc:
-                * tests/Collocation/Receiver/Receiver.mpc:
-                * tests/Collocation/Sender/Sender.mpc:
-                Remove avoids_no_events and -GD (already global defined)
-
-                * tests/Collocation/descriptors/run_test.pl:
-                Disable debug logs
-
-                * bin/ciao_tests.lst:
-                Add CIAO/tests/Collocation
-
-        === end changelog ===
-
-Sun Oct 30 22:39:45 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * ciao/Deployment/Interceptors/Deployment_Interceptors.h:
-        * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp:
-
-          Moved external reference resolution to the interceptor.
-
-Fri Oct 21 07:24:24 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl:
-        * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl:
-        * connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl:
-        * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl:
-        * connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl:
-          Fixed typo
-
-Fri Oct 21 07:06:59 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/ResetTopic/README:
-        * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl:
-        * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl:
-        * connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl:
-        * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl:
-        * connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl:
-          Fixed opendds compile errors.
-
-Tue Oct 20 09:30:13 UTC 2011  Martin Corino  <mcorino@remedy.nl>
-
-        Merged changes from Remedy work branch.
-
-        === start changelog ===
-
-        Thu Oct 20 08:56:25 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * ciao/Deployment/Handlers/Connection_Handler.cpp:
-                  Optimized logging
-
-                * tests/DAnCE/Components/SimpleMultipleUser_exec.cpp:
-                  Reverted extra test. More investigation needed.
-
-        Wed Oct 19 14:19:49 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * ciao/Deployment/Handlers/Connection_Handler.cpp:
-                  Fixed some typos in comments.
-
-                * tests/DAnCE/Components/SimpleMultipleUser_exec.cpp:
-                  Added extra tests on exit.
-
-        Tue Oct 18 14:06:44 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * ciao/Servants/Connector_Servant_Impl_Base.cpp:
-                * ciao/Servants/Home_Servant_Impl_T.cpp:
-                * ciao/Servants/Servant_Impl_Base.cpp:
-                * ciao/Servants/Session/Servant_Impl_T.cpp:
-                  Using class variables in a thread safe way.
-                  Code alignment.
-
-        Tue Oct 18 10:02:14 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * NEWS:
-                  Info about thread safety.
-
-                * ciao/Containers/Servant_Activator.cpp:
-                  Minor code updates.
-
-                * ciao/Contexts/Context_Impl_Base_T.cpp:
-                * ciao/Contexts/Session/Session_Context_T.cpp:
-                  Made the container_ variable thread safe.
-
-        Tue Oct 18 08:57:34 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
-                * MPC/ccm_direct_collocation.mpb:
-                * MPC/avoids_ccm_direct_collocation.mpb:
-                * MPC/ciaoidldefaults.mpb:
-                * MPC/ccm_svnt.mpb:
-                * MPC/ccm.mpb:
-                * MPC/ciao_base.mpb:
-                * MPC/ciao.mpb:
-                * MPC/ciao_servant.mpb:
-                * MPC/ciao_servant_activator_stub.mpb:
-                Add direct_collocation to projects
-
-
-
-
-        Tue Oct 18 08:31:34 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * ciao/Containers/Container_Base_T.cpp:
-                  Using temporary _var variables in order to be thread safe.
-
-        Mon Oct 17 14:01:44 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * ciao/Deployment/Handlers/CIAO_State.h:
-                * ciao/Deployment/Handlers/CIAO_State.cpp:
-                * ciao/Deployment/Handlers/Connection_Handler.h:
-                * ciao/Deployment/Handlers/Connection_Handler.cpp:
-                  Using mutexes to be threadsafe.
-
-                * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp:
-                  Using this for class variable.
-
-                * ciao/Servants/Extension/Servant_Impl_T.cpp:
-                  Renamed some variables.
-
-        Mon Oct 17 08:31:17 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp:
-                * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp:
-                  A subscriber must be created when just listeners are created.
-
-        Fri Oct 14 12:18:05 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+        Mon Nov 21 15:10:06 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
 
                 * bin/ciao_tests.lst:
-                * connectors/dds4ccm/tests/ResetTopic/TooLong:
-                * connectors/dds4ccm/tests/ResetTopic/TooLong/Base:
-                * connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl:
-                * connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.mpc:
-                * connectors/dds4ccm/tests/ResetTopic/TooLong/Connector:
-                * connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl:
-                * connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc:
-                * connectors/dds4ccm/tests/ResetTopic/TooLong/Sender:
-                * connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/SenderDriver.cpp:
-                * connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl:
-                * connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc:
-                * connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.h:
-                * connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.cpp:
-                * connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors:
-                * connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/Plan.cdp:
-                * connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/run_test.pl:
-                  Added a test which test whether the correct exception is thrown when a topic cannot
-                  be created by DDS.
-
-        Thu Oct 13 06:30:15 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * connectors/dds4ccm/impl/logger/Log_Macros.h:
-                  Fixed compile errors when all logging is disabled. Seems that no space
-                  is allowed between the declaration and the first bracket ( "XXX (Y)" should
-                  be "XXX(Y)" ).
-
-        Wed Oct 12 13:10:27 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * ciao/Base/CIAO_Base.mpc:
-                * ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors.mpc:
-                * connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc:
-                * connectors/dds4ccm/idl/dds4ccm_skel.mpc:
-                * connectors/dds4ccm/idl/dds4ccm_stub.mpc:
-                * connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc:
-                * connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc:
-                * connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc:
-                * connectors/dds4ccm/impl/dds4ccm_impl.mpc:
-                * connectors/dds4ccm/impl/logger/dds4ccm_logger.mpc:
-                * connectors/dds4ccm/impl/ndds/ndds_idltocpp.mpc:
-                  Fixed several install issues.
-
-        Wed Oct 12 12:37:47 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+                * connectors/ami4ccm/tests/SyncPortConn:
+                * connectors/ami4ccm/tests/SyncPortConn/Base:
+                * connectors/ami4ccm/tests/SyncPortConn/Base/Hello.idl:
+                * connectors/ami4ccm/tests/SyncPortConn/Base/SyncPortConn.mpc:
+                * connectors/ami4ccm/tests/SyncPortConn/Receiver:
+                * connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.idl:
+                * connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.mpc:
+                * connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.h:
+                * connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.cpp:
+                * connectors/ami4ccm/tests/SyncPortConn/Sender:
+                * connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.idl:
+                * connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.mpc:
+                * connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.h:
+                * connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.cpp:
+                * connectors/ami4ccm/tests/SyncPortConn/descriptors:
+                * connectors/ami4ccm/tests/SyncPortConn/descriptors/.dance_artifacts:
+                * connectors/ami4ccm/tests/SyncPortConn/descriptors/Plan.cdp:
+                * connectors/ami4ccm/tests/SyncPortConn/descriptors/Plan_no_sync_amiconn.cdp:
+                * connectors/ami4ccm/tests/SyncPortConn/descriptors/run_test.pl:
+                Test using sync port on AMI connector.
+
+        Mon Nov 21 13:30:15 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
+
+                * connectors/ami4ccm/ami4ccm/ami4ccm.idl:
+                Add sync port to connector
+
+        Tue Nov  8 08:53:04 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+                * connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.mpc:
+                Missing file.
+
+        Mon Nov  7 13:29:04 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
 
                 * bin/ciao_tests.lst:
-                * connectors/dds4ccm/tests/CollocatedPubSub:
-                * connectors/dds4ccm/tests/CollocatedPubSub/Base:
-                * connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.idl:
-                * connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.mpc:
-                * connectors/dds4ccm/tests/CollocatedPubSub/Connector:
-                * connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl:
-                * connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc:
-                * connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent:
-                * connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.idl:
-                * connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc:
-                * connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.h:
-                * connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.cpp:
-                * connectors/dds4ccm/tests/CollocatedPubSub/SubComponent:
-                * connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.idl:
-                * connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc:
-                * connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.h:
-                * connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.cpp:
-                * connectors/dds4ccm/tests/CollocatedPubSub/descriptors:
-                * connectors/dds4ccm/tests/CollocatedPubSub/descriptors/Plan.cdp:
-                * connectors/dds4ccm/tests/CollocatedPubSub/descriptors/run_test.pl:
-                  New test. Three components running on the same node. One writes the samples
-                  to DDS and collects these sample at the same time. The other two components just
-                  listen. All listeners have a QueryFilter applied.
-
-        Wed Oct 12 12:25:34 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
-                * tests/Collocation:
-                * tests/Collocation/Sender:
-                * tests/Collocation/Sender/Sender.idl:
-                * tests/Collocation/Sender/Sender_exec.cpp:
-                * tests/Collocation/Sender/Sender.mpc:
-                * tests/Collocation/Sender/Sender_exec.h:
-                * tests/Collocation/.project:
-                * tests/Collocation/Coll_Base:
-                * tests/Collocation/Coll_Base/Base.mpc:
-                * tests/Collocation/Coll_Base/Base.idl:
-                * tests/Collocation/descriptors:
-                * tests/Collocation/descriptors/run_test.pl:
-                * tests/Collocation/descriptors/PlanAllOnOne.cdp:
-                * tests/Collocation/Receiver:
-                * tests/Collocation/Receiver/Receiver.mpc:
-                * tests/Collocation/Receiver/Receiver_exec.h:
-                * tests/Collocation/Receiver/Receiver_exec.cpp:
-                * tests/Collocation/Receiver/Receiver.idl:
-                Test for collocation, for playing with results change OrbStrategy in cdp plan
-
-        Wed Oct 12 09:07:34 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp:
-                  We also need to create a subscriber and publisher when the user
-                  is using a ConnectorStatusListener; the Subscriber Listener and
-                  Publisher Listener are involved in the ConnectorStatusListener.
-
-        Wed Oct 12 08:58:10 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.cpp:
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.cpp:
-                  Extended this test a bit more.
-
-        Tue Oct 11 14:27:23 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * connectors/dds4ccm/idl/ndds/ndds_dcps.idl:
-                  Layout changes.
-
-                * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp:
-                  Fixed warnings.
-
-        Tue Oct 11 09:34:02 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * NEWS:
-                  Updated.
-
-                * ciao/Deployment/Handlers/Connection_Handler.h:
-                * ciao/Deployment/Handlers/Connection_Handler.cpp:
-                  Improved logging: mentioning the connection which has
-                  been pre-established.
-
-                * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp:
-                * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp:
-                * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h:
-                * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp:
-                  Prevent the creation of a subscriber or publisher when
-                  they are not needed.
-
-                * connectors/dds4ccm/tests/ResetTopic/README:
-                  Updated.
-
-        Mon Oct 10 14:11:45 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * ciao/Deployment/Handlers/Connection_Handler.h:
-                * ciao/Deployment/Handlers/Connection_Handler.cpp:
-                  Added validate_connection when a user want's the connections to
-                  be connected during deployment (instead of on first usage). This can
-                  be switched on by setting the CIAO_PRE_ESTABLISH_CONNECTIONS define
-
-        Mon Oct 10 08:03:56 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp:
-                  No need to check of the NonChangeable exception, since the topic name can be reset.
-
-        Mon Oct 10 07:55:48 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h:
-                * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp:
-                  No need to check of the NonChangeable exception. Since the topic name can be reset.
-
-        Mon Oct 10 07:46:35 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h:
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp:
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h:
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp:
-                  Fixed ref count issue. Because of this, the core crashed on exit.
-
-        Fri Oct  7 15:41:09 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h:
-                  Minor change of names.
-
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h:
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp:
-                  Some extra check on whether samples were received during each run.
-
-        Fri Oct  7 15:30:37 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h:
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp:
-                  Some extra check on whether samples were received during each run.
-
-        Thu Oct  6 11:34:13 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp:
-                * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp:
-                * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp:
-
-                * connectors/dds4ccm/impl/ndds/DomainParticipantManager.cpp:
-                  Optimized logging.
-
-                * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp:
-                * connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp:
-                  Removed unnecessary logging.
-
-                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc:
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc:
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc:
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc:
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc:
-                  Fixed warnings on FC15.
-
-        Wed Oct  5 15:12:49 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.h:
-                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.cpp:
-                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/Plan.cdp:
-                  Enabled test for state connector.
-
-        Wed Oct  5 14:16:49 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp:
-                * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp:
-                  Start DDS when the topic name is not empty.
-
-                * bin/ciao_tests.lst:
-                * connectors/dds4ccm/tests/ResetTopic/ToEmpty:
-                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base:
-                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl:
-                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.mpc:
-                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector:
-                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl:
-                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc:
-                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender:
-                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/SenderDriver.cpp:
-                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl:
-                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc:
-                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.h:
-                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.cpp:
-                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors:
-                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/Plan.cdp:
-                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/run_test.pl:
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp:
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp:
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp:
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp:
-                  Clearing topic name on a running DDS connector. After clearing, start writing.
-                  The connector should throw a bad_inv_order exception. Setting the topic name again.
-                  The sender should be able to write again. Need to expanded with an updater
-                  (state connector).
-
-        Wed Oct  5 12:39:54 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp:
-                * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp:
-                  Components are always set when a port is obtained. This does not
-                  depend on whether the topic name has been set.
-
-        Wed Oct  5 12:29:41 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-
-                * connectors/dds4ccm/impl/DDS_Event_Connector_T.h:
-                * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp:
-                * connectors/dds4ccm/impl/DDS_State_Connector_T.h:
-                * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp:
-                  Reset the components in the ccm_remove method itself since this is
-                  the only place where these components need to be reset.
-
-                * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h:
-                * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp:
-                  Applied coding conventions.
-
-                * bin/ciao_tests.lst:
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen:
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base:
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl:
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.mpc:
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector:
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl:
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc:
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver:
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp:
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.idl:
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc:
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h:
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp:
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender:
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp:
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl:
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc:
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.h:
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.cpp:
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors:
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/Plan.cdp:
-                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/run_test.pl:
-                  A new test which tests the reset of topic names in the state connector.
-
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp:
-                  Removed unnecessary logging
-
-        Wed Oct  5 07:58:13 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * bin/ciao_tests.lst:
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen:
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Base:
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl:
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.mpc:
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector:
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl:
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc:
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver:
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp:
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.idl:
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc:
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h:
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp:
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender:
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp:
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl:
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc:
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.h:
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.cpp:
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors:
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/Plan.cdp:
-                * connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/run_test.pl:
-                  Reset of topic name during write and listen operations.
-
-        Mon Oct  3 14:18:35 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp:
-                * connectors/dds4ccm/impl/DDS_Get_T.h:
-                * connectors/dds4ccm/impl/DDS_Get_T.cpp:
-                * connectors/dds4ccm/impl/DDS_Listen_T.h:
-                * connectors/dds4ccm/impl/DDS_Listen_T.cpp:
-                * connectors/dds4ccm/impl/DDS_StateListen_T.h:
-                * connectors/dds4ccm/impl/DDS_StateListen_T.cpp:
-                * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp:
-                * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h:
-                * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp:
-                * connectors/dds4ccm/impl/DDS_Update_T.h:
-                * connectors/dds4ccm/impl/DDS_Update_T.cpp:
-                * connectors/dds4ccm/impl/DDS_Write_T.h:
-                * connectors/dds4ccm/impl/DDS_Write_T.cpp:
-                  Setting the component to nil in the State connector and Event connector,
-                  instead of setting it in the extended ports.
-
-        Fri Sep 30 16:27:55 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc:
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc:
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc:
-                  Fixed duplicate project names.
-
-        Fri Sep 30 08:28:31 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * bin/ciao_tests.lst:
-                  Added new test to the test framework
-
-        Fri Sep 30 08:08:14 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc:
-                * connectors/dds4ccm/idl/dds4ccm_skel.mpc:
-                  Layout changes
-
-                * connectors/dds4ccm/impl/CCM_DataReader.cpp:
-                * connectors/dds4ccm/impl/DDS_Event_Connector_T.h:
-                * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp:
-                * connectors/dds4ccm/impl/DDS_Get_T.h:
-                * connectors/dds4ccm/impl/DDS_Get_T.cpp:
-                * connectors/dds4ccm/impl/DDS_Listen_T.h:
-                * connectors/dds4ccm/impl/DDS_Listen_T.cpp:
-                * connectors/dds4ccm/impl/DDS_StateListen_T.h:
-                * connectors/dds4ccm/impl/DDS_StateListen_T.cpp:
-                * connectors/dds4ccm/impl/DDS_State_Connector_T.h:
-                * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp:
-                * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h:
-                * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp:
-                * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h:
-                * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp:
-                * connectors/dds4ccm/impl/DDS_Update_T.h:
-                * connectors/dds4ccm/impl/DDS_Update_T.cpp:
-                * connectors/dds4ccm/impl/DDS_Write_T.h:
-                * connectors/dds4ccm/impl/DDS_Write_T.cpp:
-                * connectors/dds4ccm/impl/Getter_T.cpp:
-                * connectors/dds4ccm/impl/Reader_T.cpp:
-                  Ability to change the topic name. When a topic name changes,
-                  DDS will be restarted. After restart, the connector manages the
-                  new topic.
-
-                * connectors/dds4ccm/impl/ndds/DomainParticipantManager.cpp:
-                  Improved logging
-
-                * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp:
-                * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h:
-                * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp:
-                * connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp:
-                  Removed test for NonChangeable exception.
-
-
-                * connectors/dds4ccm/tests/ResetTopic:
-                * connectors/dds4ccm/tests/ResetTopic/README:
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet:
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base:
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl:
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.mpc:
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl:
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc:
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector:
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl:
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc:
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver:
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.idl:
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc:
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.h:
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.cpp:
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.h:
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.cpp:
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender:
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl:
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc:
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.h:
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp:
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors:
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/Plan.cdp:
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml:
-                * connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/run_test.pl:
-                  Added test which test the reset DDS within the connector. See readme for more information.
+                * connectors/ami4ccm/tests/PragmaT:
+                * connectors/ami4ccm/tests/PragmaT/Base:
+                * connectors/ami4ccm/tests/PragmaT/Base/PragmaT.idl:
+                * connectors/ami4ccm/tests/PragmaT/Base/PragmaT.mpc:
+                * connectors/ami4ccm/tests/PragmaT/README:
+                * connectors/ami4ccm/tests/PragmaT/Receiver:
+                * connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.idl:
+                * connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.h:
+                * connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.cpp:
+                * connectors/ami4ccm/tests/PragmaT/Sender:
+                * connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.idl:
+                * connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.mpc:
+                * connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.h:
+                * connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.cpp:
+                * connectors/ami4ccm/tests/PragmaT/descriptors:
+                * connectors/ami4ccm/tests/PragmaT/descriptors/Plan.cdp:
+                * connectors/ami4ccm/tests/PragmaT/descriptors/run_test.pl:
+                Test use of new pragma's 'ami4ccm interface', 'ami4ccm receptacle' and 'ami4ccm idl'.
+                New pragma's work besides old ones 'ciao ami4ccm ...' .
 
         === end changelog ===
 
-Thu Oct 13 19:09:42 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * ciao/Deployment/Handlers/Container_Handler.cpp:
-
-          File missing from previous commit.
-
-Thu Oct 13 19:04:17 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * ciao/Base/CIAO_Properties.idl:
-        * ciao/Deployment/Handlers/Component_Handler.cpp:
-        * ciao/Deployment/Handlers/Home_Handler.cpp:
-        * ciao/Deployment/Handlers/Homed_Component_Handler.cpp:
-
-          Changed to use constants in the CIAO_Properties file to identify
-          implementation type.
-
-Mon Oct 10 08:48:51 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * CIAO version 1.0.5 released.
-
-Sat Oct  8 08:45:40 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/performance-tests/DDSLatency/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/Getter/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/SLManyByMany/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/SLOneByOne/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml:
-          Fixed runtime issue. XML doesn't allow comments before the <xml ... > tag.
-
-Fri Oct  7 09:46:31 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * docs/CIAO_Style_Guide.txt:
-        * docs/Porting_Hints.txt:
-        * performance-tests/Benchmark/descriptors/NOTE.txt:
-          Fuzz.
-
-Fri Oct  7 09:20:40 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/ami4ccm/tests/ThreeComp/README.txt:
-        * connectors/dds4ccm/performance-tests/Latency/descriptors/README:
-        * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/README:
-        * connectors/dds4ccm/tests/DDSEntity/README:
-        * connectors/dds4ccm/tests/Event_Connection_Test/README:
-        * connectors/dds4ccm/tests/Getter/README:
-        * connectors/dds4ccm/tests/InstanceHandle/README:
-        * connectors/dds4ccm/tests/KeyedSamples/README:
-        * connectors/dds4ccm/tests/LateBinding/README:
-        * connectors/dds4ccm/tests/ListenManyByMany/README:
-        * connectors/dds4ccm/tests/ListenNotEnabled/README:
-        * connectors/dds4ccm/tests/ListenOneByOne/README:
-        * connectors/dds4ccm/tests/NonChangeableAttribute/README:
-        * connectors/dds4ccm/tests/QueryCondition/DDS/README:
-        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/README:
-        * connectors/dds4ccm/tests/QueryCondition/Different/README:
-        * connectors/dds4ccm/tests/QueryCondition/TwoQueries/README:
-        * connectors/dds4ccm/tests/Reader/README:
-        * connectors/dds4ccm/tests/SetConnectorAttributes/README:
-        * connectors/dds4ccm/tests/SharedDomainParticipant/README:
-        * connectors/dds4ccm/tests/State_Connection_Test/README:
-        * connectors/dds4ccm/tests/UnkeyedSamples/README:
-        * connectors/tests/AMIDDS/README.txt:
-        * examples/BasicSP/EC/README:
-        * examples/DevGuideExamples/readme.txt:
-        * tests/CIDL/CodeGen/README:
-        * tests/DAnCE/EM-Launch-Failures/README.txt:
-        * tests/DAnCE/EM-Redeployment/README.txt:
-        * tests/DAnCE/EM-Shutdown-Failures/README.txt:
-        * tests/DAnCE/Threading/README:
-        * tests/IDL3/Connectors/README.txt:
-        * tests/IDL3/Events/Any/README:
-        * tests/IDL3/Lookup/README:
-        * tests/IDL3_to_XMI/Forward_Declared/README:
-        * tests/IDL_Test/IDL3_Plus/README:
-        * tests/IDL_Test/Reused_Facet_Interface/README:
-        * tests/Thread/README.txt:
-          Fuzz: Id-tags.
-
-Fri Oct  7 07:59:11 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml:
-          Fuzz: Trailing whitespace
-
-Fri Oct  7 07:08:30 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc:
-          Changed Id tag so that it's recognized by svn.
-
-Fri Oct  7 07:07:19 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc:
-          Reverted last changes.
-
-Thu Oct  6 12:07:52 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp:
-        * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp:
-        * connectors/dds4ccm/performance-tests/DDSLatency/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp:
-        * connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/Getter/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc:
-        * connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/SLManyByMany/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/SLOneByOne/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc:
-          Fuzz. Added Id string.
-
-        * tests/CIF/Common/CIF_Common.cpp:
-          Check on orb is not nil.
-
-Tue Aug 23 18:18:23 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * NEWS:
-          Prepared for next release
-
-Tue Aug 23 19:01:44 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * CIAO version 1.0.4 released.
-
-Sun Aug 14 10:32:36 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DataReader_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DataWriter_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp:
-        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp:
-        * connectors/dds4ccm/impl/ndds/Publisher.cpp:
-        * connectors/dds4ccm/impl/ndds/Subscriber.cpp:
-        * connectors/dds4ccm/impl/ndds/Topic.cpp:
-        * connectors/dds4ccm/impl/ndds/TypeSupport.cpp:
-          Improved support for creating DDS entities with a OoS directly.
-          Because not all vendor specific extensions are available through
-          the IDL to C++ wrapper we first have to retrieve the QoS and than
-          only change the QoS that are available through the IDL to C++
-          wrapper. This way we set at least valid values for the vendor
-          specific extensions
-
-Fri Aug 12 07:24:01 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DataWriter_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp:
-        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp:
-        * connectors/dds4ccm/impl/ndds/Publisher.cpp:
-        * connectors/dds4ccm/impl/ndds/Subscriber.cpp:
-          Reverted change of yesterday, breaks the dds4ccm tests that don't
-          have a QoS file
-
-Thu Aug 11 13:34:51 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/Writer_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DataWriter_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp:
-        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp:
-        * connectors/dds4ccm/impl/ndds/Publisher.cpp:
-        * connectors/dds4ccm/impl/ndds/Subscriber.cpp:
-          Initialize all NDDS QoS variables with their default value, than
-          we get correct values for all non standard extensions.
-
-Thu Aug 11 11:04:12 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/idl/ndds/ndds_dcps.idl:
-        * connectors/dds4ccm/impl/ndds/convertors/DataReaderQos.h:
-        * connectors/dds4ccm/impl/ndds/convertors/DataReaderResourceLimitsQosPolicy.h:
-        * connectors/dds4ccm/impl/ndds/convertors/DataWriterQos.h:
-        * connectors/dds4ccm/impl/ndds/convertors/DataWriterResourceLimitsQosPolicy.h:
-        * connectors/dds4ccm/impl/ndds/convertors/DestinationOrderQosPolicy.h:
-        * connectors/dds4ccm/impl/ndds/convertors/HistoryQosPolicy.h:
-          Extended IDL QoS representation with several NDDS specific fields
-
-Thu Aug 11 07:01:53 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/dds4ccm_conf.h:
-          Fixed typo in error message
-
-Thu Aug 11 06:54:09 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DataReader_T.h:
-        * connectors/dds4ccm/impl/ndds/DataReader_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DataWriter_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp:
-        * connectors/dds4ccm/impl/ndds/Publisher.cpp:
-        * connectors/dds4ccm/impl/ndds/Subscriber.cpp:
-        * connectors/dds4ccm/impl/ndds/Topic.cpp:
-          Fixed possible race condition in the set_listener methods
-
-Wed Aug 10 12:43:08 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/dds4ccm_conf.h:
-          When the thread switch feature is enabled in DDS4CCM, we do require
-          the user to have ACE_HAS_REACTOR_NOTIFICATION_QUEUE to be enabled.
-          Without this option we could overflow the ACE reactor queue leading
-          to blocking
-
-Wed Aug 10 09:27:06 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp:
-          Removed OpenDDS code that is not needed anymore
-
-Tue Aug  9 14:56:12 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/DDS_Base_Connector_T.h:
-          Removed OpenDDS include that no longer exists
-
-Mon Aug  8 14:28:31 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc:
-          Disable cdr streaming
-
-Mon Aug  8 10:59:50 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/TypeSupport.cpp:
-          Improved logging
-
-Mon Aug  8 10:57:32 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/idl/ndds/ndds_dcps.idl:
-        * connectors/dds4ccm/impl/ndds/convertors/ResourceLimitsQosPolicy.h:
-          Provide access to some RTI specific QoS values
-
-Mon Aug  8 10:53:42 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/Deployment/Handlers/Component_Handler.cpp:
-          When we catch an exception log for which instance
-
-Mon Aug  8 09:04:55 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * MPC/config/ndds_idltocpp.mpb:
-          Don't generate CDR streaming operations
-
-Mon Aug  8 08:35:38 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * MPC/config/ndds_idltocpp.mpb:
-          Don't generate arg traits, not needed for datatypes that are only
-          are intended to go through local interfaces
-
-        * connectors/dds4ccm/idl/dds_rtf2_dcps.idl:
-          Add include open OpenSplice
-
-Fri Jul 29 14:17:56 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+Mon Dec  5 12:32:50 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ciao/Containers/Container_Base_T.cpp:
+          Removed some commented out code and use a switch instead of an if
 
-          unfuzz.
-
-Wed Jul 27 08:42:34 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * ciao/Containers/Container_Base_T.cpp:
-
-          Fixed some errors in the logging messages that would cause segfaults
-          on some platforms.
-
-Wed Jun 29 19:12:21 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/DDS_Base_Connector_T.h:
-        * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp:
-        * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp:
-        * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp:
-        * connectors/dds4ccm/impl/DDS_Update_T.cpp:
-        * connectors/dds4ccm/impl/DDS_Write_T.cpp:
-        * connectors/dds4ccm/impl/Getter_T.cpp:
-        * connectors/dds4ccm/impl/InstanceHandleManager_T.cpp:
-        * connectors/dds4ccm/impl/Reader_T.cpp:
-          Extended portability and improved some error handling
+        * ciao/Deployment/Handlers/CIAO_Handler_Common.cpp:
+          Removed return statement which we never could reach
 
-Wed Jun 29 14:03:36 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * ciao/Servants/Session/Servant_Impl_T.cpp:
+          Some code restructuring
 
-        * MPC/config/dds4ccm_impl.mpb:
-        * connectors/dds4ccm/impl/DDS_Base_Connector_T.h:
-        * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp:
-          Extended OpenDDS support
+        * ciao/Valuetype_Factories/ConfigValue.cpp:
+          Small performance increase
 
-Thu Jun 23 15:00:01 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/IDL_Test/Cornucopia/Cornucopia.doxygen:
-          Disable html help, seems doxygen now disables the search option
-          when html help is enabled
-
-Thu Jun 23 12:39:08 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * etc/*.doxygen:
-          Disable html help, seems doxygen now disables the search option
-          when html help is enabled
-
-Thu Jun 23 13:46:08 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * CIAO version 1.0.3 released.
-
-Mon Jun 20 15:38:24 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/DevGuideExamples/Messenger/Administrator_exec_i.h:
-        * examples/DevGuideExamples/Messenger/History_exec_i.cpp:
-        * examples/DevGuideExamples/Messenger/Messenger.mpc:
-        * examples/DevGuideExamples/Messenger/Messenger_exec_i.h:
         * examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp:
-        * examples/DevGuideExamples/Messenger/Receiver_exec_i.h:
-        * examples/DevGuideExamples/Messenger/descriptors/run_test.pl:
-          Some cleanup and simplifications but this example doesn't deploy yet
-
-Mon Jun 20 13:58:32 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp:
-          Fixed coverity errors
-
-Mon Jun 20 08:02:38 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/docs/TestCoverage.ods:
-          Updated.
-
-        * connectors/dds4ccm/tests/Derived/Derived.idl:
-        * connectors/dds4ccm/tests/Derived/Derived_Connector.idl:
-        * connectors/dds4ccm/tests/Derived/Derived_Connector.mpc:
-          Code alignment. Corrected some incorrect names.
-
-        * connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h:
-          Code alignment.
-
-Sun Jun 19 18:00:12 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Hello/Sender/Sender_exec.cpp:
           Fixed memory leak
 
-Sat Jun 18 08:14:04 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * examples/Hello/Receiver/Receiver_exec.cpp:
-          Fixed compiler error on windows.
-
-Fri Jun 17 13:53:44 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * examples/Hello/descriptors/PlanLocality_DifferentProcesses.cdp:
-          Renamed "SameProcess" to "DifferentProcess"
-
-        * examples/Hello/step-by-step.html:
-          Update. Fixed some typos.
-
-Fri Jun 17 12:47:24 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * examples/Hello/step-by-step.html:
-          Update. Started rewriting Assemble.
-
-        * examples/Null_Component/Null_Component.mpc:
-        * examples/Null_Component_Glfa/Null_Component.mpc:
-          Let the TAO IDL compiler generate the executor files.
-
-        * examples/Null_Component/Null_Component_exec.h:
-        * examples/Null_Component/Null_Component_exec.cpp:
-        * examples/Null_Component/plan.h:
-        * examples/Null_Component_Glfa/Null_Component_exec.h:
-        * examples/Null_Component_Glfa/Null_Component_exec.cpp:
-          Removed since the TAO IDL compiler generates these files
-          on the fly.
-
-        * examples/Philosophers:
-        * examples/Philosophers/Philosophers.idl:
-        * examples/Philosophers/README:
-          Removed these files.
-
-Fri Jun 17 12:21:03 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * examples/Hello/step-by-step.html:
-          Describing ccm_noevent in default.features. Made an extra
-          link to the description of "starter".
-
-        * examples/Hello/descriptors/Domain.cdd:
-        * examples/Hello/descriptors/Hello.pcd:
-        * examples/Hello/descriptors/package.tpd:
-        * examples/Hello/descriptors/svc_em.conf:
-          Removed these files since they may confuse the user.
-
-Fri Jun 17 11:52:57 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * examples/Hello/Hello_Base/Hello_Base.mpc:
-        * examples/Hello/Receiver/Receiver.mpc:
-        * examples/Hello/Sender/Sender.mpc:
-          Regenerated, using the -e option in generate_component_mpc.
-          We're using events in this example.
-
-        * examples/Hello/step-by-step.html:
-          Added the -e option to the description of generate_component_mpc.
-
-Fri Jun 17 11:33:44 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * examples/Hello/descriptors/PlanLocality_DifferentProcesses.cdp:
-        * examples/Hello/descriptors/PlanLocality_SameProcess.cdp:
-          According to latest version of the Hello example.
-
-Fri Jun 17 11:23:32 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * examples/Hello/Hello_Base/Hello_Base.mpc:
-        * examples/Hello/Receiver/Receiver.idl:
-        * examples/Hello/Receiver/Receiver.mpc:
-        * examples/Hello/Receiver/Receiver_exec.h:
-        * examples/Hello/Receiver/Receiver_exec.cpp:
-        * examples/Hello/Sender/Sender.idl:
-        * examples/Hello/Sender/Sender.mpc:
-        * examples/Hello/Sender/Sender_exec.h:
-        * examples/Hello/Sender/Sender_exec.cpp:
-        * examples/Hello/descriptors/DeploymentPlan.cdp:
-        * examples/Hello/descriptors/DeploymentPlan_without_ns.cdp:
-        * examples/Hello/step-by-step.html:
-          Rewritten. Regenerated the mpc and executor code. Also
-          using unhomed components. Next step is to test and change
-          the other perl scripts.
-
-Thu Jun 16 11:05:53 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer_exec.cpp:
-          Fixed memory leak in this test
-
-Thu Jun 16 08:36:24 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/TypeSupport.cpp:
-          Fixed runtime issues in close.
-
-        * connectors/dds4ccm/tests/TypeSupport/main.cpp:
-          Expanded test with a few other tests.
-
-Thu Jun 16 07:19:26 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp:
-          Fixed memory leak in this test
-
-Wed Jun 15 13:38:57 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/TypeSupport.h:
-        * connectors/dds4ccm/impl/ndds/TypeSupport.cpp:
-          Optimized management of DomainParticipants and type-factory combinations.
-
-Wed Jun 15 07:30:00 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl:
-          Fixed error in openDDS.
-
-Tue Jun 14 13:36:00 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * tests/DAnCE/Executor-Destructor/Exec_Dest_Status_export.h:
-
-          Fuzz.
-
-Tue Jun 14 12:03:17 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h:
-          Fixed compile issue on openDDS.
-
-Tue Jun 14 08:46:29 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp:
-          Coverity : checked return value of register_type.
-
-Mon Jun 13 09:09:56 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/Plan.cdp:
-          Fixed runtime issue due to renaming action.
-
-Sat Jun 11 08:18:19 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/TypeSupport/main.cpp:
-          Fuzz: no ending new line at the end of the file.
-
-Sat Jun 11 08:17:03 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.mpc:
-        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc:
-        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc:
-          Fixed compile issues after renaming of project names.
-
-Fri Jun 10 15:01:15 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * bin/ciao_tests.lst:
-        * connectors/dds4ccm/tests/TypeSupport:
-        * connectors/dds4ccm/tests/TypeSupport/TypeSupport.mpc:
-        * connectors/dds4ccm/tests/TypeSupport/main.cpp:
-        * connectors/dds4ccm/tests/TypeSupport/run_test.pl:
-          Added a new (regular C++) which tests the TypeSupport class and its
-          internal type factory administration.
-
-Fri Jun 10 14:54:14 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/TypeSupport.h:
-          Code alignment.
-
-        * connectors/dds4ccm/impl/ndds/TypeSupport.cpp:
-          Fuzz. Mismatched trace.
-
-Fri Jun 10 14:48:01 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.mpc:
-        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc:
-        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc:
-          Fuzz. Shorten project names
-
-Fri Jun 10 11:35:16 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * bin/ciao_tests.lst:
-          Added the memory leak test to the test framework
-
-Fri Jun 10 11:17:36 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h:
-        * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp:
-        * connectors/dds4ccm/impl/ndds/TypeSupport.h:
-        * connectors/dds4ccm/impl/ndds/TypeSupport.cpp:
-          Fixed memory leak in the register_type/unregister_type implemenation. This
-          memory existed because of the fact that two different topics where based
-          on the same datatype.
-          To fix this, a new map was created wich contains the DomainParticipant in
-          combination with the already existing type factories. Type factories
-          are now stored and removed per DomainParticipant.
-
-        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration:
-        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base:
-        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl:
-        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.mpc:
-        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component:
-        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.idl:
-        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc:
-        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.h:
-        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.cpp:
-        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector:
-        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl:
-        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc:
-        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors:
-        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/Plan.cdp:
-        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/run_test.pl:
-          Added test to verify whether the memory leak is fixed.
-
-Wed Jun  8 12:32:48 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl:
-          Fixed problem with OpenDDS
-
-Wed Jun  8 07:00:55 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp:
-          Resolved compile error in case NDDS.
-
-Tue Jun  7 12:34:23 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp:
-          Removed unused declaration
-
-Tue Jun  7 11:56:36 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp:
-          Fixed warning.
-
-Mon Jun  6 15:08:05 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/idl/dds_rtf2_dcps.idl:
-          Extended support
-
-Wed Jun  1 12:56:35 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp:
-          Don't use the invalid macros but just use !=  for handle comparison
-
-Wed Jun  1 08:27:26 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc:
-          Fixed export macro for OpenDDS
-
-Wed Jun  1 01:56:05 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * tests/DAnCE/Executor-Destructor/Exec_Dest_Status.h:
-        * tests/DAnCE/Executor-Destructor/Exec_Dest_Status.cpp:
-        * tests/DAnCE/Executor-Destructor/Exec_Dest_Status_export.h:
-        * tests/DAnCE/Executor-Destructor/Executor_Destructor.mpc:
-        * tests/DAnCE/Executor-Destructor/Executor_Destructor_Interceptor.cpp:
-
-          Fix for bugzilla 3963.  On certain platforms (e.g., FC15), when
-        a library which is dlopened links another library which is
-        dlopened, this may cause spurious error messages upon exit
-        exit of the LocalityManager from ld.so.
-
-Tue May 31 12:27:54 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl:
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl:
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl:
-        * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl:
-        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl:
-        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl:
-          Disable some parts for opendds
-
-Tue May 31 08:56:09 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl:
-        * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl:
-          OpenDDS doesn't support a topic with a valuetype member
-
-Mon May 30 12:07:40 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp:
-          Removed unused ACE_ARG_UNUSED.
-
-        * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc:
-          PSAT stub project was using the *.cxx, generated by the
-          DDS IDL compiler. Fixed this by merging two projects
-          (idl_gen and _stub) into one (_stub).
-
-Sun May 29 17:31:41 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * MPC/config/dds4ccm_ts_default.mpb:
-          Specify some more opendds ts flags
-
-Sun May 29 17:22:08 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc:
-        * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc:
-        * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc:
-        * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc:
-          These components use ndds specific features
-
-Fri May 27 12:44:32 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp:
-          Resolved errors in builds with other DDS vendors then ndds
-
-Thu May 26 20:29:07 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * tests/DAnCE/Progressive_Deployments/run_test.pl:
-          ../lib is not necessary; it doesn't even exist.
-
-Thu May 26 07:13:15 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp:
-          Fixed compile error
-
-Wed May 25 10:56:26 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp:
-        * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp:
-        * connectors/dds4ccm/impl/DDS_Update_T.cpp:
-        * connectors/dds4ccm/impl/DDS_Write_T.cpp:
-          Fixed argument not used warnings
-
-Tue May 24 18:52:31 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp:
-        * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp:
-        * connectors/dds4ccm/impl/DDS_Update_T.cpp:
-        * connectors/dds4ccm/impl/DDS_Write_T.cpp:
-          Improved portability
-
-Tue May 24 11:17:37 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc:
-        * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc:
-        * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp:
-        * connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp:
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc:
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc:
-        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl:
-        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl:
-        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl:
-          Increased portability
-
-Tue May 24 09:12:37 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/ConditionManager.cpp:
-        * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp:
-          Increased portability
-
-Tue May 24 08:26:15 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/dds4ccm_conf.h:
-          Increased portability
-
-Mon May 23 18:24:38 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp:
-        * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp:
-        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc:
-          Increased portability
-
-Mon May 23 15:07:33 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/PublisherListener.cpp:
-        * connectors/dds4ccm/impl/dds4ccm_conf.h:
-        * connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl:
-        * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp:
-        * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp:
-        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl:
-        * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp:
-        * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp:
-        * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl:
-        * connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl:
-        * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl:
-        * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl:
-        * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl:
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl:
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl:
-        * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp:
-        * connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp:
-          Increased portability
-
-Mon May 23 10:49:10 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl:
-        * connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl:
-        * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl:
-        * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl:
-        * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl:
-        * connectors/dds4ccm/tests/NoModule/NoModule.idl:
-        * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl:
-        * connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl:
-        * connectors/dds4ccm/tests/PSAT/psat_type.idl:
-        * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl:
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl:
-          Added needed pragma's for OpenDDS
-
-Mon May 23 09:49:50 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/tests/AMIDDS/Base/AmiDds_DDS.idl:
-          Added needed pragma's for OpenDDS
-
-Mon May 23 09:37:23 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * MPC/config/dds4ccm.mpb:
-          Attempt to give dds4ccm libraries the correct version number when
-          OpenDDS isenabled
-
-        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl:
-        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl:
-        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl:
-          Added needed pragma's for OpenDDS
-
-Mon May 23 09:00:14 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl:
-          Added needed pragma's for OpenDDS
-
-Mon May 23 08:36:09 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/dds4ccm_conf.h:
-          Added DDS_INSTANCE_HANDLE_VALID
-
-Mon May 23 07:41:20 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl:
-        * connectors/dds4ccm/tests/NoModule/NoModule.idl:
-        * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl:
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl:
-        * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl:
-        * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl:
-        * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl:
-        * connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl:
-        * connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl:
-        * connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl:
-        * connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl:
-        * connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl:
-        * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl:
-        * connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl:
-        * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl:
-        * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl:
-        * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl:
-        * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl:
-        * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl:
-        * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl:
-        * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl:
-        * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl:
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl:
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl:
-        * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl:
-        * connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl:
-          Fixes for OpenDDS support
-
-Fri May 20 14:14:32 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl:
-        * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl:
-        * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl:
-        * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl:
-        * connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl:
-        * connectors/dds4ccm/tests/Derived/Derived.idl:
-        * connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl:
-        * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl:
-        * connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl:
-        * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl:
-          Added needed pragma's for OpenDDS
-
-Fri May 20 09:18:56 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl:
-        * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl:
-          Added needed pragma's for OpenDDS
-
-Fri May 20 07:55:44 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl:
-        * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl:
-        * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl:
-        * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl:
-        * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl:
-          Added needed pragma's for OpenDDS
-
-Fri May 13 18:00:06 UTC 2011  James H. Hill  <hillj at cs dot iupui dot edu>
-
-        * tutorials/Quoter/Simple/03.html:
-
-          Updated the stock quoter example.
-
-Tue May 11 13:21:37 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
-        * examples\Display\NavDisplayGUI_exec\DetailView.h:
-        * examples\Display\NavDisplayGUI_exec\RootPanel.cpp:
-        * examples\Display\NavDisplayGUI_exec\NodeItem.cpp:
-        * examples\Display\NavDisplayGUI_exec\RootPanel.h:
-        * examples\Display\NavDisplayGUI_exec\NodeItem.h:
-        * examples\Display\NavDisplayGUI_exec\Worker.cpp:
-        * examples\Display\NavDisplayGUI_exec\MapView.h:
-        * examples\Display\NavDisplayGUI_exec\Command.h:
-        * examples\Display\NavDisplayGUI_exec\NavDisplayGUI_exec.cpp:
-        * examples\Display\NavDisplayGUI_exec\NavUnit.cpp:
-        * examples\Display\NavDisplayGUI_exec\UpdatePositionCmd.cpp:
-        * examples\Display\NavDisplayGUI_exec\DetailView.cpp:
-        * examples\Display\GPS\GPS_exec.h:
-        * examples\Display\GPS\GPS_exec.cpp:
-        * examples\Display\README.html:
-        Made example running on Windows, changed deprecated Qt includes.
-
-
-Tue May 11 08:15:37 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
-        * examples/Display/README.html:
-        * examples/Display/example.gif:
-        Add image to readme.
-
-Tue May 11 07:09:37 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
-        * examples/Display/descriptors/run_test_more.pl:
-        * examples/Display/descriptors/deploymentplanone.cdp:
-        * examples/Display/descriptors/deploymentplanmore.cdp:
-        * examples/Display/descriptors/run_test_more_contr.pl:
-        * examples/Display/descriptors/flattened_deploymentplannat.cdp:
-        * examples/Display/descriptors/run_all_in_one.pl:
-        * examples/Display/descriptors/run_test.pl:
-        * examples/Display/descriptors/run_test_one.pl:
-        Solved Fuzz errors.
-
-Wed May 11 05:32:01 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * MPC/config/dds4ccm.mpb:
-          Fixed problem with last commit
-
-Tue May 10 18:32:40 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * MPC/config/dds4ccm.mpb:
-          Added include paths
-
-        * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h:
-        * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp:
-          Fixed Coverity errors
-
-Tue May 10 12:38:37 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
-        * bin/ciao_tests.lst:
-        * examples/Display/Display_Base/Display_Base.idl:
-        * examples/Display/descriptors/flattened_deploymentplannat.cdp:
-        * examples/Display/descriptors/run_test.pl:
-        * examples/Display/NavDisplayGUI_exec/DetailView.h:
-        * examples/Display/NavDisplayGUI_exec/RootPanel.cpp:
-        * examples/Display/NavDisplayGUI_exec/NodeItem.cpp:
-        * examples/Display/NavDisplayGUI_exec/MapView.cpp:
-        * examples/Display/NavDisplayGUI_exec/RootPanel.h:
-        * examples/Display/NavDisplayGUI_exec/NodeItem.h:
-        * examples/Display/NavDisplayGUI_exec/Worker.cpp:
-        * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc:
-        * examples/Display/NavDisplayGUI_exec/MapView.h:
-        * examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp:
-        * examples/Display/NavDisplayGUI_exec/NavUnit.cpp:
-        * examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h:
-        * examples/Display/NavDisplayGUI_exec/NavUnit.h:
-        * examples/Display/NavDisplayGUI_exec/DetailView.cpp:
-        * examples/Display/RateGen/controller.cpp:
-        * examples/Display/RateGen/RateGen_exec.cpp:
-        * examples/Display/GPS/GPS.idl:
-        * examples/Display/GPS/GPS_exec.h:
-        * examples/Display/GPS/GPS_exec.cpp:
-        * examples/Display/NavDisplay/NavDisplay_exec.cpp:
-        * examples/Display/NavDisplay/NavDisplay.idl:
-        * examples/Display/NavDisplay/NavDisplay_exec.h:
-
-          Made test working again with GUI display, using one or more GPS
-          devices.  Used only QT4, removed qt3support. Not yet tested on
-          Windows.
-
-        * examples/Display/descriptors/basicNodeDaemon.pl:
-        * examples/Display/descriptors/flattened_deploymentplan.cdp:
-        * examples/Display/descriptors/DeploymentPlan.cdp:
-        * examples/Display/GPS/GPS_tracing_exec.cpp:
-        * examples/Display/GPS/GPS_tracing_exec.h:
-        Deleted this files. Not used anymore.
-
-          Deleted this files. Not used anymore.
-
-        * examples/Display/descriptors/deploymentplanmore.cdp:
-        * examples/Display/descriptors/run_test_one_contr.pl:
-        * examples/Display/descriptors/run_all_in_one.pl:
-        * examples/Display/descriptors/run_test_more.pl:
-        * examples/Display/descriptors/deploymentplanone.cdp:
-        * examples/Display/descriptors/run_test_more_contr.pl:
-        * examples/Display/descriptors/run_test_one.pl:
-        Added scripts for running GUI test (one and more) and test_all_in_one for testsuite.
-
-          Added scripts for running GUI test (one and more) and
-          test_all_in_one for testsuite.
-
-Tue May 10 06:25:37 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/WaitSet.cpp:
-
-          Resolved coverity errors/warnings. Check pointer if nil before
-          using it.
-
-Mon May  9 10:58:16 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp:
-        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp:
-        * connectors/dds4ccm/impl/ndds/Publisher.cpp:
-        * connectors/dds4ccm/impl/ndds/Subscriber.cpp:
-        * connectors/dds4ccm/impl/ndds/Utils.cpp:
-          Don't throw an exception when a wrong QosProfile is applied. In the
-          end the creation of the DDS entity will fail. As a result to that, an
-          exception is thrown. This'll simply code and logging.
-
-        * connectors/dds4ccm/tests/QosProfile/descriptors/PlanMultipleHashes.cdp:
-          Added another test.
-
-Mon May  9 08:56:04 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/DDS_StateListen_T.h:
-        * connectors/dds4ccm/impl/DataReaderHandler_T.h:
-        * connectors/dds4ccm/impl/DataReaderHandler_T.cpp:
-        * connectors/dds4ccm/impl/DataReaderListener_T.h:
-        * connectors/dds4ccm/impl/DataReaderStateListener_T.h:
-          Created a template class for the DataReaderListener and DataReaderStateListener
-          threadswitch. This'll reduce double code.
-
-Sun May  8 19:05:42 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/Updater_T.cpp:
-          Give local variable unique name
-
-        * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/Throughput_Receiver.cpp:
-          Fixed possible memory leaks
-
-Thu May  5 08:26:59 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl:
-          Only asign status when things go wrong.
-
-Wed May  4 11:37:31 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp:
-        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp:
-        * connectors/dds4ccm/impl/ndds/Publisher.cpp:
-        * connectors/dds4ccm/impl/ndds/Subscriber.cpp:
-        * connectors/dds4ccm/impl/ndds/Utils.cpp:
-          Improved handling of Qos profile string. Throwing a ::CORBA::INTERAL
-          when the Qos profile string does not meet the requirements
-          (i.e. containing a '#'-sign).
-
-        * connectors/dds4ccm/tests/QosProfile/descriptors/PlanNoHash.cdp:
-        * connectors/dds4ccm/tests/QosProfile/descriptors/PlanWrongNames.cdp:
-        * connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl:
-          Extended this test with a malformed Qos profile string.
-
-        * connectors/dds4ccm/tests/QosProfile/descriptors/Plan.cdp:
-          Removed this file.
-
-Thu Apr 28 14:00:42 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * bin/generate_component_mpc.pl:
-          Added a -I as commandline parameter. This will set an
-          include directory for all projects (cpp and idl).
-
-        * connectors/dds4ccm/impl/DataReaderHandler_T.h:
-        * connectors/dds4ccm/impl/DataReaderHandler_T.cpp:
-          Adding and removing reference manually. This'll prevent removing the
-          listener while the reactor still has messages to handle.
-
-Tue Apr 26 13:57:23 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
-        * examples/Display/descriptors/run_test_without_ns.pl:
-        * examples/Display/descriptors/NodeManagerMap.cdd:
-        * examples/Display/descriptors/run_NodeDaemons.pl:
-        Deleted unused files.
-
-        * examples/Display/README.html:
-        * examples/Display/RateGen/RateGen_exec.cpp:
-        * examples/Display/GPS/GPS_exec.cpp:
-        Changed to make test working again.
-
-        * examples/Display/ run_test_contr.pl:
-        * examples/Display/flattened_deploymentplannat.cdp:
-        * examples/Display/run_test.pl:
-        Added for running test in console mode.
-
-
-Sat Apr 23 19:48:23 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp:
-        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp:
-        * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp:
-        * connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.cpp:
-          Deleting the ticker in a consistent manner. Created in the constructor,
-          deleting it in the destructor.
-
-Fri Apr 22 19:26:37 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/Updater_T.cpp:
-          Give local variable a different name to not match argument
-
-Fri Apr 22 13:01:26 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp:
-        * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp:
-        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp:
-        * connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp:
-        * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp:
-        * connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.cpp:
-          Always delete stuf which was created in the constructor.
-
-Fri Apr 22 08:24:41 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp:
-        * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp:
-        * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp:
-          Added missing breaks
-
-Fri Apr 22 07:35:30 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * performance-tests/Protocols/descriptors/svc.conf:
-          Fuzz: Added $Id string.
-
-Thu Apr 21 09:38:23 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * MPC/config/dds4ccm.mpb:
-        * MPC/config/dds4ccm_base.mpb:
-        * MPC/config/dds4ccm_impl.mpb:
-        * MPC/config/dds4ccm_ts_default.mpb:
-          Extended base projects
-
-Thu Apr 21 08:29:25 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * MPC/config/ndds_idltocpp_ts_defaults.mpb:
-          Added taolib
-
-Wed Apr 20 08:11:49 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * CIAO_TAO_DAnCE.mwc:
-        * MPC/config/dds4ccm_ts_default.mpb:
-        * MPC/config/ndds_idltocpp.mpb:
-        * MPC/config/ndds_idltocpp_stub.mpb:
-        * MPC/config/ndds_idltocpp_ts_defaults.mpb:
-        * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl:
-        * connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl:
-        * connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc:
-        * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl:
-        * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl:
-        * connectors/dds4ccm/idl/dds4ccm_Base.idl:
-        * connectors/dds4ccm/idl/dds4ccm_QueryFilter.idl:
-        * connectors/dds4ccm/idl/dds4ccm_skel.mpc:
-        * connectors/dds4ccm/idl/dds4ccm_stub.mpc:
-        * connectors/dds4ccm/idl/ndds/ndds_dcps.idl:
-        * connectors/dds4ccm/impl/CCM_DataReader.h:
-        * connectors/dds4ccm/impl/CCM_DataReader.cpp:
-        * connectors/dds4ccm/impl/CCM_DataWriter.h:
-        * connectors/dds4ccm/impl/CCM_DataWriter.cpp:
-        * connectors/dds4ccm/impl/ConditionManager.h:
-        * connectors/dds4ccm/impl/ConditionManager.cpp:
-        * connectors/dds4ccm/impl/DDS_Base_Connector_T.h:
-        * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp:
-        * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp:
-        * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp:
-        * connectors/dds4ccm/impl/DDS_Update_T.cpp:
-        * connectors/dds4ccm/impl/DDS_Write_T.cpp:
-        * connectors/dds4ccm/impl/InstanceHandleManager_T.h:
-        * connectors/dds4ccm/impl/InstanceHandleManager_T.cpp:
-        * connectors/dds4ccm/impl/PortStatusListener.cpp:
-        * connectors/dds4ccm/impl/PublisherListener.cpp:
-        * connectors/dds4ccm/impl/Reader_T.h:
-        * connectors/dds4ccm/impl/Reader_T.cpp:
-        * connectors/dds4ccm/impl/SubscriberListener.cpp:
-        * connectors/dds4ccm/impl/Updater_T.h:
-        * connectors/dds4ccm/impl/Updater_T.cpp:
-        * connectors/dds4ccm/impl/Writer_T.h:
-        * connectors/dds4ccm/impl/Writer_T.cpp:
-        * connectors/dds4ccm/impl/dds4ccm_conf.h:
-        * connectors/dds4ccm/impl/dds4ccm_impl.mpc:
-        * connectors/dds4ccm/impl/ndds/WaitSet.h:
-        * connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl:
-        * connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl:
-        * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl:
-        * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc:
-        * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl:
-        * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl:
-        * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl:
-        * connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl:
-        * connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl:
-        * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl:
-        * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl:
-        * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl:
-        * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl:
-        * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl:
-        * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl:
-        * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp:
-        * connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl:
-        * connectors/dds4ccm/tests/Derived/Derived.idl:
-        * connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl:
-        * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl:
-        * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl:
-        * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl:
-        * connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl:
-        * connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl:
-        * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl:
-        * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl:
-        * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl:
-        * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl:
-        * connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl:
-        * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl:
-        * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl:
-        * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl:
-        * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl:
-        * connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl:
-        * connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl:
-        * connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl:
-        * connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl:
-        * connectors/dds4ccm/tests/NoModule/NoModule.idl:
-        * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl:
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl:
-        * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl:
-        * connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl:
-        * connectors/dds4ccm/tests/PSAT/psat_type.idl:
-        * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl:
-        * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl:
-        * connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl:
-        * connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl:
-        * connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl:
-        * connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl:
-        * connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl:
-        * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl:
-        * connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl:
-        * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl:
-        * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl:
-        * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl:
-        * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl:
-        * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl:
-        * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl:
-        * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl:
-        * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl:
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl:
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl:
-        * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl:
-        * connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl:
-        * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl:
-        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl:
-        * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl:
-        * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl:
-        * connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl:
-        * connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl:
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl:
-        * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl:
-        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl:
-          Extended portability for dds4ccm
-
-Wed Apr 20 09:52:52 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * CIAO version 1.0.2 released.
-
 Local Variables:
 mode: change-log
 add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time))
diff --git a/CIAO/ChangeLog.BRANCH b/CIAO/ChangeLog.BRANCH
deleted file mode 100644
index 6a9f45ffd55..00000000000
--- a/CIAO/ChangeLog.BRANCH
+++ /dev/null
@@ -1,89 +0,0 @@
-Thu Dec  1 09:50:06 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
-        * connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp:
-        * connectors/ami4ccm/examples/Hello/descriptors/PlanSyncPort.cdp:
-        * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl:
-        * connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl:
-        * connectors/ami4ccm/tests/UsesMulti/descriptors/PlanSyncPort.cdp:
-        * connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl:
-        Changes for using now sync port ami connector beside Sender-Receiver connection
-
-Thu Dec  1 09:15:53 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
-        * connectors/ami4ccm/tests/InterMulti/descriptors/PlanSyncPort.cdp:
-        * connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl:
-
-        * connectors/ami4ccm/tests/UsesMulti/descriptors/PlanSyncPort.cdp:
-        * connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl:
-        Changes for using now sync port ami connector beside Sender-Receiver connection
-
-Wed Nov 30 16:11:09 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
-
-        * connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp:
-        * connectors/ami4ccm/tests/InterReturn/descriptors/Plan.cdp:
-        * connectors/ami4ccm/tests/InterReturn/descriptors/PlanSyncPort.cdp:
-        * connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl:
-        Run test also with sync port on AMI connector.
-
-Mon Nov 21 15:10:06 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
-        * bin/ciao_tests.lst:
-        * connectors/ami4ccm/tests/SyncPortConn:
-        * connectors/ami4ccm/tests/SyncPortConn/Base:
-        * connectors/ami4ccm/tests/SyncPortConn/Base/Hello.idl:
-        * connectors/ami4ccm/tests/SyncPortConn/Base/SyncPortConn.mpc:
-        * connectors/ami4ccm/tests/SyncPortConn/Receiver:
-        * connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.idl:
-        * connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.mpc:
-        * connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.h:
-        * connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.cpp:
-        * connectors/ami4ccm/tests/SyncPortConn/Sender:
-        * connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.idl:
-        * connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.mpc:
-        * connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.h:
-        * connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.cpp:
-        * connectors/ami4ccm/tests/SyncPortConn/descriptors:
-        * connectors/ami4ccm/tests/SyncPortConn/descriptors/.dance_artifacts:
-        * connectors/ami4ccm/tests/SyncPortConn/descriptors/Plan.cdp:
-        * connectors/ami4ccm/tests/SyncPortConn/descriptors/Plan_no_sync_amiconn.cdp:
-        * connectors/ami4ccm/tests/SyncPortConn/descriptors/run_test.pl:
-        Test using sync port on AMI connector.
-
-Mon Nov 21 13:30:15 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
-
-        * connectors/ami4ccm/ami4ccm/ami4ccm.idl:
-        Add sync port to connector
-
-Tue Nov  8 08:53:04 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
-        * connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.mpc:
-        Missing file.
-
-Mon Nov  7 13:29:04 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
-        * bin/ciao_tests.lst:
-        * connectors/ami4ccm/tests/PragmaT:
-        * connectors/ami4ccm/tests/PragmaT/Base:
-        * connectors/ami4ccm/tests/PragmaT/Base/PragmaT.idl:
-        * connectors/ami4ccm/tests/PragmaT/Base/PragmaT.mpc:
-        * connectors/ami4ccm/tests/PragmaT/README:
-        * connectors/ami4ccm/tests/PragmaT/Receiver:
-        * connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.idl:
-        * connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.h:
-        * connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.cpp:
-        * connectors/ami4ccm/tests/PragmaT/Sender:
-        * connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.idl:
-        * connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.mpc:
-        * connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.h:
-        * connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.cpp:
-        * connectors/ami4ccm/tests/PragmaT/descriptors:
-        * connectors/ami4ccm/tests/PragmaT/descriptors/Plan.cdp:
-        * connectors/ami4ccm/tests/PragmaT/descriptors/run_test.pl:
-        Test use of new pragma's 'ami4ccm interface', 'ami4ccm receptacle' and 'ami4ccm idl'.
-        New pragma's work besides old ones 'ciao ami4ccm ...' .
-
-Local Variables:
-mode: change-log
-add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time))
-indent-tabs-mode: nil
-End:
diff --git a/CIAO/ChangeLogs/ChangeLog-2011b b/CIAO/ChangeLogs/ChangeLog-2011b
new file mode 100644
index 00000000000..3014fb9a8db
--- /dev/null
+++ b/CIAO/ChangeLogs/ChangeLog-2011b
@@ -0,0 +1,2172 @@
+Sun Dec 04 11:51:30 CET 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * CIAO version 1.0.6 released.
+
+Tue Nov 29 09:55:32 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Servants/Servants.mpc:
+          List the new files so that they are getting installed
+
+Mon Nov 28 09:56:48 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * bin/generate_component_mpc.pl:
+          Also generate an entry for the templated servant files.
+
+        * tutorials/Quoter/Simple/Broker/StockBroker.mpc:
+        * tutorials/Quoter/Simple/Distributor/StockDistributor.mpc:
+        * tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc:
+          Regenerated, using the new generate_component_mpc.
+
+Mon Nov 28 09:17:32 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/IDL_Test/Extension/Cornucopia.mpc:
+          Disable one project I missed
+
+Sun Nov 27 18:19:18 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Merging in our workbranch
+
+        === start changelog ===
+
+        Thu Nov 24 12:31:23 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * tests/IDL_Test/Inherited_Servants/Derived.mpc:
+                  Fixed afters.
+
+        Thu Nov 24 07:40:14 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * tests/IDL_Test/Inherited_Servants/Base.idl:
+                * tests/IDL_Test/Inherited_Servants/Derived.idl:
+                  Enabled all IDL code again and added an extra component
+                  and interface without a module.
+
+        Fri Nov  4 15:47:29 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * *.mpc:
+                  Removed all S.inl entries.
+
+        Fri Nov  4 16:16:35 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * bin/generate_component_mpc.pl:
+                  Removed reference to S.inl
+
+        Mon Nov 21 15:21:00 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * tests/IDL_Test/Inherited_Servants/Derived.mpc:
+                  Fixed mpc issue
+
+        Thu Nov 17 10:54:54 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * ciao/Servants/Facet_Servant_Base_T.h:
+                * ciao/Servants/Facet_Servant_Base_T.cpp:
+                  Templated base class for facet servants.
+
+                * tests/IDL_Test/Inherited_Servants:
+                * tests/IDL_Test/Inherited_Servants/Base.idl:
+                * tests/IDL_Test/Inherited_Servants/Base.mpc:
+                * tests/IDL_Test/Inherited_Servants/Derived.idl:
+                * tests/IDL_Test/Inherited_Servants/Derived.mpc:
+                * tests/IDL_Test/Inherited_Servants/Tester:
+                * tests/IDL_Test/Inherited_Servants/Tester.cpp:
+                  Added compilation test.
+
+        === end changelog ===
+
+Tue Nov 22 14:04:21 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * ciao/Servants/Home_Servant_Impl_T.h:
+        * ciao/Servants/Home_Servant_Impl_T.cpp:
+
+          Implemented separate method for removal of all components
+          (moving code out of destructor).
+
+Sun Nov 20 19:35:18 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.cpp:
+          Fixed msvc warning
+
+Sun Nov 20 19:34:21 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * tests/IDL_Test/IDL3_Plus/KitchenSink.idl:
+          Fixed incorrect definition of parameters for template module
+          reference definition (only used with full CCM builds).
+
+Thu Nov 17 10:21:55 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/IDL_Test/Cornucopia/Cornucopia.idl:
+          Extended this test with attributes
+
+Fri Nov 11 11:22:13 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        Merged rw_block_strategy branch.
+
+        === start changelog ===
+
+        Thu Nov 10 14:15:13 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+                * bin/ciao_tests.lst:
+                * connectors/ami4ccm/examples/Hello/descriptors/PlanFullBlock.cdp:
+                * connectors/ami4ccm/examples/Hello/descriptors/run_fullblock_test.pl:
+
+                  Added variant of test using full blocking container servers
+                  (LocalityManager).
+
+        === end changelog ===
+
+Thu Nov 03 13:25:13 UTC 2011   Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+        * tests/Collocation/Sender/Sender_exec.cpp:
+        * bin/ciao_tests.lst
+
+          Only if defined CCM_DIRECTCOLL run test.
+
+Thu Nov 03 08:52:13 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp:
+          Fixed WCHAR compile problem.
+
+Wed Nov 02 12:09:13 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+        * tests/Collocation/Receiver/Receiver_exec.cpp:
+        Cancel timer and delete generators
+
+Wed Nov 02 08:04:13 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+        * tests/Collocation/Receiver/Receiver_exec.cpp:
+        * tests/Collocation/Sender/Sender_exec.cpp:
+        Removed unreferenced local variables
+
+
+Wed Nov 02 08:30:13 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        Merged changes from Remedy work branch.
+
+        === start changelog ===
+
+        Tue Nov  1 09:11:13 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * tests/IDL_Test/Inherited_Component/Extended/Base.mpc:
+                  Layout changes.
+
+                * tests/IDL_Test/Inherited_Component/Extended/Derived.mpc:
+                  Linux link error.
+
+        Tue Nov  1 08:48:41 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * tests/IDL_Test/Inherited_Component/Extended/Derived.idl:
+                  Used module name to identify the supported interface.
+
+                * tests/IDL_Test/Inherited_Component/Extended/Derived.mpc:
+                  Fixed link issue on linux
+
+        Mon Oct 31 13:53:36 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * ciao/Containers/Extension/Extension_Container.h:
+                * ciao/Containers/Session/Session_Container.h:
+                * ciao/Contexts/Extension/Extension_Context_T.cpp:
+                * ciao/Deployment/Handlers/CIAO_Handler_Common.cpp:
+                * ciao/Deployment/Handlers/CIAO_State.cpp:
+                * ciao/Deployment/Handlers/Component_Handler.h:
+                * ciao/Deployment/Handlers/Component_Handler.cpp:
+                * ciao/Deployment/Handlers/Connection_Handler.cpp:
+                * ciao/Deployment/Handlers/Container_Handler.cpp:
+                * ciao/Deployment/Handlers/Home_Handler.h:
+                * ciao/Deployment/Handlers/Home_Handler.cpp:
+                * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp:
+                * ciao/Servants/Connector_Servant_Impl_Base.cpp:
+                  Several improvements regarding thread safety. Also
+                  some minor code layout changes.
+
+                * ciao/Containers/Extension/README:
+                * ciao/Contexts/Extension/README:
+                * ciao/Servants/Extension/README:
+                  Added: Extension containers are not ready to use, yet.
+
+        Sat Oct 29 14:25:16 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.mpc:
+                * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc:
+                * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc:
+                * connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc:
+                  Fuzz.
+
+                * connectors/dds4ccm/tests/QueryCondition/DDS/Base/Base.mpc:
+                * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Receiver/DDS_Receiver.mpc:
+                * connectors/dds4ccm/tests/QueryCondition/DDS/DDS_Sender/DDS_Sender.mpc:
+                  Fixed double project names.
+
+        Fri Oct 28 15:55:29 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc:
+                * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc:
+                * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc:
+                  Fixed compile and link issues on windows
+
+        Fri Oct 28 15:04:03 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc:
+                  Fixed another link issue.
+
+        Fri Oct 28 15:00:43 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc:
+                  Fixed link issue on windows.
+
+        Fri Oct 28 14:55:18 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc:
+                  Fixed compile issues on windows.
+
+        Fri Oct 28 14:52:38 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc:
+                  Added libpaths.
+
+        Fri Oct 28 14:49:01 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc:
+                * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc:
+                  Fixed afters.
+
+        Fri Oct 28 14:18:46 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * connectors/dds4ccm/tests/IDL_Test:
+                * connectors/dds4ccm/tests/IDL_Test/Base:
+                * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.idl:
+                * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Base.mpc:
+                * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.idl:
+                * connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc:
+                * connectors/dds4ccm/tests/IDL_Test/Component:
+                * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.idl:
+                * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc:
+                * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.idl:
+                * connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc:
+                * connectors/dds4ccm/tests/IDL_Test/Connector:
+                * connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.idl:
+                * connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc:
+                  Compilation test.
+
+                * tests/IDL_Test/Inherited_Component/IhC_Bar.mpc:
+                  Fixed link issue
+
+        Fri Oct 28 14:17:05 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * tests/IDL_Test/Inherited_Component/Extended:
+
+                * tests/IDL_Test/Inherited_Component/Extended/Base.idl:
+                * tests/IDL_Test/Inherited_Component/Extended/Base.mpc:
+                * tests/IDL_Test/Inherited_Component/Extended/Derived.idl:
+                * tests/IDL_Test/Inherited_Component/Extended/Derived.mpc:
+                * tests/IDL_Test/Inherited_Component/Extended/Tester.cpp:
+                  Compilation test.
+
+        Thu Oct 27 10:10:00 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+                * ciao/Deployment/Interceptors/Deployment_Interceptors.h:
+                * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp:
+
+                  Changed basic CIAO_ReferenceLookup_i to attempt handling resolving
+                  externalReference endpoints as CORBA IOR type references.
+                  Added factory method for creating interceptor.
+
+                * tests/DAnCE/ExecutionManager-Deployments/run_test.pl:
+
+                  Change to allow overruling CIAO_LOG_LEVEL from commandline.
+
+        === end changelog ===
+
+Tue Nov  1 19:23:58 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/ccm_svnt.mpb:
+        * MPC/config/ciao_container_base_stub.mpb:
+          Removed avoids_corba_e_compact, should work now
+
+Tue Nov  1 13:16:16 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp:
+        * tests/DAnCE/ExecutionManager-Deployments/run_test.pl:
+
+          Integrated improvements from Martin Corino <mcorino@remedy.nl>.
+
+Thu Nov 01 10:54:13 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        Merged changes from Remedy SA work branch.
+
+        === start changelog ===
+
+        Tue Nov 01 08:41:15 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+                * tests/Collocation/Sender/Sender_exec.cpp:
+                Add define in test in case of CIAO not build with
+                ccm_direct_colloation.
+
+        Mon Oct 31 13:55:15 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+                * ciao/Containers/Container_Base.idl:
+                * ciao/Containers/Container_Base_T.h:
+                * ciao/Containers/Container_Base_T.cpp:
+                * ciao/Servants/Extension/Extension_Container.h:
+                * ciao/Servants/Connector_Servant_Impl_Base.cpp:
+                * ciao/Servants/Servant_Impl_Base.cpp:
+                * ciao/Servants/Servants.mpc:
+                Removed already disabled lines with servant- and portactivators
+
+                * ciao/Containers/CIAO_Servant_Activator.idl:
+                * ciao/Containers/CIAO_Servant_Activator.mpc:
+                * ciao/Containers/Servant_Activator.h:
+                * ciao/Containers/Servant_Activator.cpp:
+                * ciao/Servants/Port_Activator_T.cpp:
+                * ciao/Servants/Port_Activator_T.h:
+                * ciao/Servants/CIAO_Port_Activator.idl:
+                * ciao/Servants/Port_Activator.h:
+                * ciao/Servants/Port_Activator.cpp:
+                * MPC/config/ciao_port_activator_stub.mpb:
+                * MPC/config/ciao_servant_activator_stub.mpb:
+                * MPC/config/ciao_servant_activator.mpb:
+
+                Deleted this files.
+
+
+
+        Mon Oct 31 13:30:15 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+                * tests/Collocation/README:
+                Explanation of the test
+
+        Mon Oct 31 13:19:15 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+                * tests/Collocation/Coll_Base/Base.idl:
+                * tests/Collocation/Coll_Base/Base.mpc:
+                * tests/Collocation/Receiver/Receiver.idl:
+                * tests/Collocation/Receiver/Receiver_exec.h:
+                * tests/Collocation/Receiver/Receiver_exec.cpp:
+                * tests/Collocation/Sender/Sender.idl:
+                * tests/Collocation/Sender/Sender_exec.h:
+                * tests/Collocation/Sender/Sender_exec.cpp:
+                * tests/Collocation/descriptors/PlanAllOnOne.cdp:
+                * tests/Collocation/descriptors/run_test.pl:
+                Expanded test. Use different CollocationStrategies via
+                attributes in deploymentplans.
+
+        Tue Oct 27 07:16:24 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+              * ciao/Containers/Extension/Extension_Containers.mpc:
+              Remove ciao_port_activator_stub and cia_servant_activator_stub
+              * ciao/Servants/Servant_Impl_Base.cpp:
+              Committed the right file now.
+
+        Wed Oct 26 12:018:24 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+                * ciao/Containers/Session/Session_Containers.mpc:
+              Remove ciao_port_activator_stub and cia_servant_activator_stub
+
+        Wed Oct 26 07:28:24 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+                * ciao/Containers/Containers.mpc:
+              Remove ciao_port_activator_stub and cia_servant_activator_stub
+
+
+        Wed Oct 26 07:28:24 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+                * MPC/config/ciao_extension_container.mpb:
+                * MPC/config/ciao_extension_container_stub.mpb:
+                * MPC/config/ciao_servant.mpb:
+                * MPC/config/ciao_session_container.mpb:
+                * MPC/config/ciao_session_container_stub.mpb:
+                * ciao/Containers/Containers.mpc:
+                * ciao/Containers/Extension/Extension_Container.mpc:
+                * ciao/Containers/Session/Session_Container.mpc:
+                Remove ciao_port_activator_stub and cia_servant_activator_stub
+
+                * ciao/Containers/CIAO_Servant_Activator.idl:
+                * ciao/Containers/CIAO_Servant_Activator.mpc:
+                * ciao/Containers/Servant_Activator.h:
+                * ciao/Containers/Servant_Activator.cpp:
+                * ciao/Servants/Port_Activator_T.cpp:
+                * ciao/Servants/CIAO_Port_Activator.idl:
+                Deactivate content. Later on if build successfull delete files
+
+                * ciao/Containers/Container_Base.idl:
+                * ciao/Containers/Container_Base_T.h:
+                * ciao/Containers/Container_Base_T.cpp:
+                * ciao/Servants/Connector_Servant_Impl_Base.cpp:
+                * ciao/Servants/Servant_Impl_Base.cpp:
+                * ciao/Servants/Servants.mpc:
+                Disable Servant_Activator and Port_Activator functionality,
+                Later on if build successfull delete lines
+
+                * tests/Collocation/Coll_Base/Base.mpc:
+                * tests/Collocation/Receiver/Receiver.mpc:
+                * tests/Collocation/Sender/Sender.mpc:
+                Remove avoids_no_events and -GD (already global defined)
+
+                * tests/Collocation/descriptors/run_test.pl:
+                Disable debug logs
+
+                * bin/ciao_tests.lst:
+                Add CIAO/tests/Collocation
+
+        === end changelog ===
+
+Sun Oct 30 22:39:45 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * ciao/Deployment/Interceptors/Deployment_Interceptors.h:
+        * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp:
+
+          Moved external reference resolution to the interceptor.
+
+Fri Oct 21 07:24:24 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl:
+        * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl:
+        * connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl:
+        * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl:
+        * connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl:
+          Fixed typo
+
+Fri Oct 21 07:06:59 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tests/ResetTopic/README:
+        * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl:
+        * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl:
+        * connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl:
+        * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl:
+        * connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl:
+          Fixed opendds compile errors.
+
+Tue Oct 20 09:30:13 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        Merged changes from Remedy work branch.
+
+        === start changelog ===
+
+        Thu Oct 20 08:56:25 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * ciao/Deployment/Handlers/Connection_Handler.cpp:
+                  Optimized logging
+
+                * tests/DAnCE/Components/SimpleMultipleUser_exec.cpp:
+                  Reverted extra test. More investigation needed.
+
+        Wed Oct 19 14:19:49 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * ciao/Deployment/Handlers/Connection_Handler.cpp:
+                  Fixed some typos in comments.
+
+                * tests/DAnCE/Components/SimpleMultipleUser_exec.cpp:
+                  Added extra tests on exit.
+
+        Tue Oct 18 14:06:44 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * ciao/Servants/Connector_Servant_Impl_Base.cpp:
+                * ciao/Servants/Home_Servant_Impl_T.cpp:
+                * ciao/Servants/Servant_Impl_Base.cpp:
+                * ciao/Servants/Session/Servant_Impl_T.cpp:
+                  Using class variables in a thread safe way.
+                  Code alignment.
+
+        Tue Oct 18 10:02:14 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * NEWS:
+                  Info about thread safety.
+
+                * ciao/Containers/Servant_Activator.cpp:
+                  Minor code updates.
+
+                * ciao/Contexts/Context_Impl_Base_T.cpp:
+                * ciao/Contexts/Session/Session_Context_T.cpp:
+                  Made the container_ variable thread safe.
+
+        Tue Oct 18 08:57:34 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+                * MPC/ccm_direct_collocation.mpb:
+                * MPC/avoids_ccm_direct_collocation.mpb:
+                * MPC/ciaoidldefaults.mpb:
+                * MPC/ccm_svnt.mpb:
+                * MPC/ccm.mpb:
+                * MPC/ciao_base.mpb:
+                * MPC/ciao.mpb:
+                * MPC/ciao_servant.mpb:
+                * MPC/ciao_servant_activator_stub.mpb:
+                Add direct_collocation to projects
+
+
+
+
+        Tue Oct 18 08:31:34 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * ciao/Containers/Container_Base_T.cpp:
+                  Using temporary _var variables in order to be thread safe.
+
+        Mon Oct 17 14:01:44 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * ciao/Deployment/Handlers/CIAO_State.h:
+                * ciao/Deployment/Handlers/CIAO_State.cpp:
+                * ciao/Deployment/Handlers/Connection_Handler.h:
+                * ciao/Deployment/Handlers/Connection_Handler.cpp:
+                  Using mutexes to be threadsafe.
+
+                * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp:
+                  Using this for class variable.
+
+                * ciao/Servants/Extension/Servant_Impl_T.cpp:
+                  Renamed some variables.
+
+        Mon Oct 17 08:31:17 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp:
+                * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp:
+                  A subscriber must be created when just listeners are created.
+
+        Fri Oct 14 12:18:05 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * bin/ciao_tests.lst:
+                * connectors/dds4ccm/tests/ResetTopic/TooLong:
+                * connectors/dds4ccm/tests/ResetTopic/TooLong/Base:
+                * connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.idl:
+                * connectors/dds4ccm/tests/ResetTopic/TooLong/Base/TL_ResetTopic_Base.mpc:
+                * connectors/dds4ccm/tests/ResetTopic/TooLong/Connector:
+                * connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.idl:
+                * connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc:
+                * connectors/dds4ccm/tests/ResetTopic/TooLong/Sender:
+                * connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/SenderDriver.cpp:
+                * connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.idl:
+                * connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc:
+                * connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.h:
+                * connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender_exec.cpp:
+                * connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors:
+                * connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/Plan.cdp:
+                * connectors/dds4ccm/tests/ResetTopic/TooLong/descriptors/run_test.pl:
+                  Added a test which test whether the correct exception is thrown when a topic cannot
+                  be created by DDS.
+
+        Thu Oct 13 06:30:15 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * connectors/dds4ccm/impl/logger/Log_Macros.h:
+                  Fixed compile errors when all logging is disabled. Seems that no space
+                  is allowed between the declaration and the first bracket ( "XXX (Y)" should
+                  be "XXX(Y)" ).
+
+        Wed Oct 12 13:10:27 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * ciao/Base/CIAO_Base.mpc:
+                * ciao/Deployment/Interceptors/CIAO_Deployment_Interceptors.mpc:
+                * connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc:
+                * connectors/dds4ccm/idl/dds4ccm_skel.mpc:
+                * connectors/dds4ccm/idl/dds4ccm_stub.mpc:
+                * connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc:
+                * connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc:
+                * connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc:
+                * connectors/dds4ccm/impl/dds4ccm_impl.mpc:
+                * connectors/dds4ccm/impl/logger/dds4ccm_logger.mpc:
+                * connectors/dds4ccm/impl/ndds/ndds_idltocpp.mpc:
+                  Fixed several install issues.
+
+        Wed Oct 12 12:37:47 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * bin/ciao_tests.lst:
+                * connectors/dds4ccm/tests/CollocatedPubSub:
+                * connectors/dds4ccm/tests/CollocatedPubSub/Base:
+                * connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.idl:
+                * connectors/dds4ccm/tests/CollocatedPubSub/Base/Collocated_Base.mpc:
+                * connectors/dds4ccm/tests/CollocatedPubSub/Connector:
+                * connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.idl:
+                * connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc:
+                * connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent:
+                * connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.idl:
+                * connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc:
+                * connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.h:
+                * connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.cpp:
+                * connectors/dds4ccm/tests/CollocatedPubSub/SubComponent:
+                * connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.idl:
+                * connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc:
+                * connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.h:
+                * connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component_exec.cpp:
+                * connectors/dds4ccm/tests/CollocatedPubSub/descriptors:
+                * connectors/dds4ccm/tests/CollocatedPubSub/descriptors/Plan.cdp:
+                * connectors/dds4ccm/tests/CollocatedPubSub/descriptors/run_test.pl:
+                  New test. Three components running on the same node. One writes the samples
+                  to DDS and collects these sample at the same time. The other two components just
+                  listen. All listeners have a QueryFilter applied.
+
+        Wed Oct 12 12:25:34 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+                * tests/Collocation:
+                * tests/Collocation/Sender:
+                * tests/Collocation/Sender/Sender.idl:
+                * tests/Collocation/Sender/Sender_exec.cpp:
+                * tests/Collocation/Sender/Sender.mpc:
+                * tests/Collocation/Sender/Sender_exec.h:
+                * tests/Collocation/.project:
+                * tests/Collocation/Coll_Base:
+                * tests/Collocation/Coll_Base/Base.mpc:
+                * tests/Collocation/Coll_Base/Base.idl:
+                * tests/Collocation/descriptors:
+                * tests/Collocation/descriptors/run_test.pl:
+                * tests/Collocation/descriptors/PlanAllOnOne.cdp:
+                * tests/Collocation/Receiver:
+                * tests/Collocation/Receiver/Receiver.mpc:
+                * tests/Collocation/Receiver/Receiver_exec.h:
+                * tests/Collocation/Receiver/Receiver_exec.cpp:
+                * tests/Collocation/Receiver/Receiver.idl:
+                Test for collocation, for playing with results change OrbStrategy in cdp plan
+
+        Wed Oct 12 09:07:34 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp:
+                  We also need to create a subscriber and publisher when the user
+                  is using a ConnectorStatusListener; the Subscriber Listener and
+                  Publisher Listener are involved in the ConnectorStatusListener.
+
+        Wed Oct 12 08:58:10 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.cpp:
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.cpp:
+                  Extended this test a bit more.
+
+        Tue Oct 11 14:27:23 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * connectors/dds4ccm/idl/ndds/ndds_dcps.idl:
+                  Layout changes.
+
+                * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp:
+                  Fixed warnings.
+
+        Tue Oct 11 09:34:02 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * NEWS:
+                  Updated.
+
+                * ciao/Deployment/Handlers/Connection_Handler.h:
+                * ciao/Deployment/Handlers/Connection_Handler.cpp:
+                  Improved logging: mentioning the connection which has
+                  been pre-established.
+
+                * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp:
+                * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp:
+                * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h:
+                * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp:
+                  Prevent the creation of a subscriber or publisher when
+                  they are not needed.
+
+                * connectors/dds4ccm/tests/ResetTopic/README:
+                  Updated.
+
+        Mon Oct 10 14:11:45 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * ciao/Deployment/Handlers/Connection_Handler.h:
+                * ciao/Deployment/Handlers/Connection_Handler.cpp:
+                  Added validate_connection when a user want's the connections to
+                  be connected during deployment (instead of on first usage). This can
+                  be switched on by setting the CIAO_PRE_ESTABLISH_CONNECTIONS define
+
+        Mon Oct 10 08:03:56 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp:
+                  No need to check of the NonChangeable exception, since the topic name can be reset.
+
+        Mon Oct 10 07:55:48 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h:
+                * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp:
+                  No need to check of the NonChangeable exception. Since the topic name can be reset.
+
+        Mon Oct 10 07:46:35 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h:
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp:
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h:
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp:
+                  Fixed ref count issue. Because of this, the core crashed on exit.
+
+        Fri Oct  7 15:41:09 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h:
+                  Minor change of names.
+
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h:
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp:
+                  Some extra check on whether samples were received during each run.
+
+        Fri Oct  7 15:30:37 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h:
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp:
+                  Some extra check on whether samples were received during each run.
+
+        Thu Oct  6 11:34:13 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp:
+                * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp:
+                * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp:
+
+                * connectors/dds4ccm/impl/ndds/DomainParticipantManager.cpp:
+                  Optimized logging.
+
+                * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp:
+                * connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp:
+                  Removed unnecessary logging.
+
+                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc:
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc:
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc:
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc:
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc:
+                  Fixed warnings on FC15.
+
+        Wed Oct  5 15:12:49 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.h:
+                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.cpp:
+                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/Plan.cdp:
+                  Enabled test for state connector.
+
+        Wed Oct  5 14:16:49 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp:
+                * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp:
+                  Start DDS when the topic name is not empty.
+
+                * bin/ciao_tests.lst:
+                * connectors/dds4ccm/tests/ResetTopic/ToEmpty:
+                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base:
+                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.idl:
+                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Base/TE_ResetTopic_Base.mpc:
+                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector:
+                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.idl:
+                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc:
+                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender:
+                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/SenderDriver.cpp:
+                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.idl:
+                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc:
+                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.h:
+                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender_exec.cpp:
+                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors:
+                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/Plan.cdp:
+                * connectors/dds4ccm/tests/ResetTopic/ToEmpty/descriptors/run_test.pl:
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp:
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp:
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp:
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp:
+                  Clearing topic name on a running DDS connector. After clearing, start writing.
+                  The connector should throw a bad_inv_order exception. Setting the topic name again.
+                  The sender should be able to write again. Need to expanded with an updater
+                  (state connector).
+
+        Wed Oct  5 12:39:54 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp:
+                * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp:
+                  Components are always set when a port is obtained. This does not
+                  depend on whether the topic name has been set.
+
+        Wed Oct  5 12:29:41 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+
+                * connectors/dds4ccm/impl/DDS_Event_Connector_T.h:
+                * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp:
+                * connectors/dds4ccm/impl/DDS_State_Connector_T.h:
+                * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp:
+                  Reset the components in the ccm_remove method itself since this is
+                  the only place where these components need to be reset.
+
+                * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.h:
+                * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender_exec.cpp:
+                  Applied coding conventions.
+
+                * bin/ciao_tests.lst:
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen:
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base:
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.idl:
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Base/UL_ResetTopic_Base.mpc:
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector:
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.idl:
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc:
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver:
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/ReceiverDriver.cpp:
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.idl:
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc:
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.h:
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver_exec.cpp:
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender:
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/SenderDriver.cpp:
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.idl:
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc:
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.h:
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender_exec.cpp:
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors:
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/Plan.cdp:
+                * connectors/dds4ccm/tests/ResetTopic/UpdateListen/descriptors/run_test.pl:
+                  A new test which tests the reset of topic names in the state connector.
+
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp:
+                  Removed unnecessary logging
+
+        Wed Oct  5 07:58:13 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * bin/ciao_tests.lst:
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen:
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Base:
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.idl:
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Base/WL_ResetTopic_Base.mpc:
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector:
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.idl:
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc:
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver:
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/ReceiverDriver.cpp:
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.idl:
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc:
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.h:
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver_exec.cpp:
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender:
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/SenderDriver.cpp:
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.idl:
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc:
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.h:
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender_exec.cpp:
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors:
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/Plan.cdp:
+                * connectors/dds4ccm/tests/ResetTopic/WriteListen/descriptors/run_test.pl:
+                  Reset of topic name during write and listen operations.
+
+        Mon Oct  3 14:18:35 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp:
+                * connectors/dds4ccm/impl/DDS_Get_T.h:
+                * connectors/dds4ccm/impl/DDS_Get_T.cpp:
+                * connectors/dds4ccm/impl/DDS_Listen_T.h:
+                * connectors/dds4ccm/impl/DDS_Listen_T.cpp:
+                * connectors/dds4ccm/impl/DDS_StateListen_T.h:
+                * connectors/dds4ccm/impl/DDS_StateListen_T.cpp:
+                * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp:
+                * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h:
+                * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp:
+                * connectors/dds4ccm/impl/DDS_Update_T.h:
+                * connectors/dds4ccm/impl/DDS_Update_T.cpp:
+                * connectors/dds4ccm/impl/DDS_Write_T.h:
+                * connectors/dds4ccm/impl/DDS_Write_T.cpp:
+                  Setting the component to nil in the State connector and Event connector,
+                  instead of setting it in the extended ports.
+
+        Fri Sep 30 16:27:55 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc:
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc:
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc:
+                  Fixed duplicate project names.
+
+        Fri Sep 30 08:28:31 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * bin/ciao_tests.lst:
+                  Added new test to the test framework
+
+        Fri Sep 30 08:08:14 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc:
+                * connectors/dds4ccm/idl/dds4ccm_skel.mpc:
+                  Layout changes
+
+                * connectors/dds4ccm/impl/CCM_DataReader.cpp:
+                * connectors/dds4ccm/impl/DDS_Event_Connector_T.h:
+                * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp:
+                * connectors/dds4ccm/impl/DDS_Get_T.h:
+                * connectors/dds4ccm/impl/DDS_Get_T.cpp:
+                * connectors/dds4ccm/impl/DDS_Listen_T.h:
+                * connectors/dds4ccm/impl/DDS_Listen_T.cpp:
+                * connectors/dds4ccm/impl/DDS_StateListen_T.h:
+                * connectors/dds4ccm/impl/DDS_StateListen_T.cpp:
+                * connectors/dds4ccm/impl/DDS_State_Connector_T.h:
+                * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp:
+                * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h:
+                * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp:
+                * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h:
+                * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp:
+                * connectors/dds4ccm/impl/DDS_Update_T.h:
+                * connectors/dds4ccm/impl/DDS_Update_T.cpp:
+                * connectors/dds4ccm/impl/DDS_Write_T.h:
+                * connectors/dds4ccm/impl/DDS_Write_T.cpp:
+                * connectors/dds4ccm/impl/Getter_T.cpp:
+                * connectors/dds4ccm/impl/Reader_T.cpp:
+                  Ability to change the topic name. When a topic name changes,
+                  DDS will be restarted. After restart, the connector manages the
+                  new topic.
+
+                * connectors/dds4ccm/impl/ndds/DomainParticipantManager.cpp:
+                  Improved logging
+
+                * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp:
+                * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h:
+                * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp:
+                * connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp:
+                  Removed test for NonChangeable exception.
+
+
+                * connectors/dds4ccm/tests/ResetTopic:
+                * connectors/dds4ccm/tests/ResetTopic/README:
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet:
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base:
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl:
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.mpc:
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl:
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc:
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector:
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.idl:
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc:
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver:
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.idl:
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc:
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.h:
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_exec.cpp:
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.h:
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver_impl.cpp:
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender:
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.idl:
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc:
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.h:
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender_exec.cpp:
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors:
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/Plan.cdp:
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml:
+                * connectors/dds4ccm/tests/ResetTopic/ReadGet/descriptors/run_test.pl:
+                  Added test which test the reset DDS within the connector. See readme for more information.
+
+        === end changelog ===
+
+Thu Oct 13 19:09:42 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * ciao/Deployment/Handlers/Container_Handler.cpp:
+
+          File missing from previous commit.
+
+Thu Oct 13 19:04:17 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * ciao/Base/CIAO_Properties.idl:
+        * ciao/Deployment/Handlers/Component_Handler.cpp:
+        * ciao/Deployment/Handlers/Home_Handler.cpp:
+        * ciao/Deployment/Handlers/Homed_Component_Handler.cpp:
+
+          Changed to use constants in the CIAO_Properties file to identify
+          implementation type.
+
+Mon Oct 10 08:48:51 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * CIAO version 1.0.5 released.
+
+Sat Oct  8 08:45:40 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/performance-tests/DDSLatency/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/Getter/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/SLManyByMany/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/SLOneByOne/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml:
+          Fixed runtime issue. XML doesn't allow comments before the <xml ... > tag.
+
+Fri Oct  7 09:46:31 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * docs/CIAO_Style_Guide.txt:
+        * docs/Porting_Hints.txt:
+        * performance-tests/Benchmark/descriptors/NOTE.txt:
+          Fuzz.
+
+Fri Oct  7 09:20:40 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/ami4ccm/tests/ThreeComp/README.txt:
+        * connectors/dds4ccm/performance-tests/Latency/descriptors/README:
+        * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/README:
+        * connectors/dds4ccm/tests/DDSEntity/README:
+        * connectors/dds4ccm/tests/Event_Connection_Test/README:
+        * connectors/dds4ccm/tests/Getter/README:
+        * connectors/dds4ccm/tests/InstanceHandle/README:
+        * connectors/dds4ccm/tests/KeyedSamples/README:
+        * connectors/dds4ccm/tests/LateBinding/README:
+        * connectors/dds4ccm/tests/ListenManyByMany/README:
+        * connectors/dds4ccm/tests/ListenNotEnabled/README:
+        * connectors/dds4ccm/tests/ListenOneByOne/README:
+        * connectors/dds4ccm/tests/NonChangeableAttribute/README:
+        * connectors/dds4ccm/tests/QueryCondition/DDS/README:
+        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/README:
+        * connectors/dds4ccm/tests/QueryCondition/Different/README:
+        * connectors/dds4ccm/tests/QueryCondition/TwoQueries/README:
+        * connectors/dds4ccm/tests/Reader/README:
+        * connectors/dds4ccm/tests/SetConnectorAttributes/README:
+        * connectors/dds4ccm/tests/SharedDomainParticipant/README:
+        * connectors/dds4ccm/tests/State_Connection_Test/README:
+        * connectors/dds4ccm/tests/UnkeyedSamples/README:
+        * connectors/tests/AMIDDS/README.txt:
+        * examples/BasicSP/EC/README:
+        * examples/DevGuideExamples/readme.txt:
+        * tests/CIDL/CodeGen/README:
+        * tests/DAnCE/EM-Launch-Failures/README.txt:
+        * tests/DAnCE/EM-Redeployment/README.txt:
+        * tests/DAnCE/EM-Shutdown-Failures/README.txt:
+        * tests/DAnCE/Threading/README:
+        * tests/IDL3/Connectors/README.txt:
+        * tests/IDL3/Events/Any/README:
+        * tests/IDL3/Lookup/README:
+        * tests/IDL3_to_XMI/Forward_Declared/README:
+        * tests/IDL_Test/IDL3_Plus/README:
+        * tests/IDL_Test/Reused_Facet_Interface/README:
+        * tests/Thread/README.txt:
+          Fuzz: Id-tags.
+
+Fri Oct  7 07:59:11 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml:
+          Fuzz: Trailing whitespace
+
+Fri Oct  7 07:08:30 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc:
+          Changed Id tag so that it's recognized by svn.
+
+Fri Oct  7 07:07:19 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc:
+          Reverted last changes.
+
+Thu Oct  6 12:07:52 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/examples/Hello/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp:
+        * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp:
+        * connectors/dds4ccm/performance-tests/DDSLatency/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp:
+        * connectors/dds4ccm/performance-tests/DDSThroughput/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/performance-tests/Throughput/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/CSLDeadline/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/CSLQoS/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/CoherentUpdater/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/CoherentWriter/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/Getter/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/ListenManyByMany/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/PSLSampleLost/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/Proxies/ReadWrite/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/QosProfile/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/QueryCondition/DDS/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/QueryCondition/DDS_OneByOne/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/QueryCondition/Different/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/QueryCondition/TwoQueries/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc:
+        * connectors/dds4ccm/tests/Reader/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/SLManyByMany/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/SLOneByOne/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc:
+          Fuzz. Added Id string.
+
+        * tests/CIF/Common/CIF_Common.cpp:
+          Check on orb is not nil.
+
+Tue Aug 23 18:18:23 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * NEWS:
+          Prepared for next release
+
+Tue Aug 23 19:01:44 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * CIAO version 1.0.4 released.
+
+Sun Aug 14 10:32:36 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/ndds/DataReader_T.cpp:
+        * connectors/dds4ccm/impl/ndds/DataWriter_T.cpp:
+        * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp:
+        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp:
+        * connectors/dds4ccm/impl/ndds/Publisher.cpp:
+        * connectors/dds4ccm/impl/ndds/Subscriber.cpp:
+        * connectors/dds4ccm/impl/ndds/Topic.cpp:
+        * connectors/dds4ccm/impl/ndds/TypeSupport.cpp:
+          Improved support for creating DDS entities with a OoS directly.
+          Because not all vendor specific extensions are available through
+          the IDL to C++ wrapper we first have to retrieve the QoS and than
+          only change the QoS that are available through the IDL to C++
+          wrapper. This way we set at least valid values for the vendor
+          specific extensions
+
+Fri Aug 12 07:24:01 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/ndds/DataWriter_T.cpp:
+        * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp:
+        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp:
+        * connectors/dds4ccm/impl/ndds/Publisher.cpp:
+        * connectors/dds4ccm/impl/ndds/Subscriber.cpp:
+          Reverted change of yesterday, breaks the dds4ccm tests that don't
+          have a QoS file
+
+Thu Aug 11 13:34:51 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/Writer_T.cpp:
+        * connectors/dds4ccm/impl/ndds/DataWriter_T.cpp:
+        * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp:
+        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp:
+        * connectors/dds4ccm/impl/ndds/Publisher.cpp:
+        * connectors/dds4ccm/impl/ndds/Subscriber.cpp:
+          Initialize all NDDS QoS variables with their default value, than
+          we get correct values for all non standard extensions.
+
+Thu Aug 11 11:04:12 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/idl/ndds/ndds_dcps.idl:
+        * connectors/dds4ccm/impl/ndds/convertors/DataReaderQos.h:
+        * connectors/dds4ccm/impl/ndds/convertors/DataReaderResourceLimitsQosPolicy.h:
+        * connectors/dds4ccm/impl/ndds/convertors/DataWriterQos.h:
+        * connectors/dds4ccm/impl/ndds/convertors/DataWriterResourceLimitsQosPolicy.h:
+        * connectors/dds4ccm/impl/ndds/convertors/DestinationOrderQosPolicy.h:
+        * connectors/dds4ccm/impl/ndds/convertors/HistoryQosPolicy.h:
+          Extended IDL QoS representation with several NDDS specific fields
+
+Thu Aug 11 07:01:53 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/dds4ccm_conf.h:
+          Fixed typo in error message
+
+Thu Aug 11 06:54:09 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/ndds/DataReader_T.h:
+        * connectors/dds4ccm/impl/ndds/DataReader_T.cpp:
+        * connectors/dds4ccm/impl/ndds/DataWriter_T.cpp:
+        * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp:
+        * connectors/dds4ccm/impl/ndds/Publisher.cpp:
+        * connectors/dds4ccm/impl/ndds/Subscriber.cpp:
+        * connectors/dds4ccm/impl/ndds/Topic.cpp:
+          Fixed possible race condition in the set_listener methods
+
+Wed Aug 10 12:43:08 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/dds4ccm_conf.h:
+          When the thread switch feature is enabled in DDS4CCM, we do require
+          the user to have ACE_HAS_REACTOR_NOTIFICATION_QUEUE to be enabled.
+          Without this option we could overflow the ACE reactor queue leading
+          to blocking
+
+Wed Aug 10 09:27:06 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp:
+          Removed OpenDDS code that is not needed anymore
+
+Tue Aug  9 14:56:12 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/DDS_Base_Connector_T.h:
+          Removed OpenDDS include that no longer exists
+
+Mon Aug  8 14:28:31 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc:
+          Disable cdr streaming
+
+Mon Aug  8 10:59:50 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/ndds/TypeSupport.cpp:
+          Improved logging
+
+Mon Aug  8 10:57:32 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/idl/ndds/ndds_dcps.idl:
+        * connectors/dds4ccm/impl/ndds/convertors/ResourceLimitsQosPolicy.h:
+          Provide access to some RTI specific QoS values
+
+Mon Aug  8 10:53:42 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ciao/Deployment/Handlers/Component_Handler.cpp:
+          When we catch an exception log for which instance
+
+Mon Aug  8 09:04:55 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/ndds_idltocpp.mpb:
+          Don't generate CDR streaming operations
+
+Mon Aug  8 08:35:38 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/ndds_idltocpp.mpb:
+          Don't generate arg traits, not needed for datatypes that are only
+          are intended to go through local interfaces
+
+        * connectors/dds4ccm/idl/dds_rtf2_dcps.idl:
+          Add include open OpenSplice
+
+Fri Jul 29 14:17:56 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * ciao/Containers/Container_Base_T.cpp:
+
+          unfuzz.
+
+Wed Jul 27 08:42:34 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * ciao/Containers/Container_Base_T.cpp:
+
+          Fixed some errors in the logging messages that would cause segfaults
+          on some platforms.
+
+Wed Jun 29 19:12:21 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/DDS_Base_Connector_T.h:
+        * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp:
+        * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp:
+        * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp:
+        * connectors/dds4ccm/impl/DDS_Update_T.cpp:
+        * connectors/dds4ccm/impl/DDS_Write_T.cpp:
+        * connectors/dds4ccm/impl/Getter_T.cpp:
+        * connectors/dds4ccm/impl/InstanceHandleManager_T.cpp:
+        * connectors/dds4ccm/impl/Reader_T.cpp:
+          Extended portability and improved some error handling
+
+Wed Jun 29 14:03:36 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/dds4ccm_impl.mpb:
+        * connectors/dds4ccm/impl/DDS_Base_Connector_T.h:
+        * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp:
+          Extended OpenDDS support
+
+Thu Jun 23 15:00:01 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/IDL_Test/Cornucopia/Cornucopia.doxygen:
+          Disable html help, seems doxygen now disables the search option
+          when html help is enabled
+
+Thu Jun 23 12:39:08 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * etc/*.doxygen:
+          Disable html help, seems doxygen now disables the search option
+          when html help is enabled
+
+Thu Jun 23 13:46:08 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * CIAO version 1.0.3 released.
+
+Mon Jun 20 15:38:24 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/DevGuideExamples/Messenger/Administrator_exec_i.h:
+        * examples/DevGuideExamples/Messenger/History_exec_i.cpp:
+        * examples/DevGuideExamples/Messenger/Messenger.mpc:
+        * examples/DevGuideExamples/Messenger/Messenger_exec_i.h:
+        * examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp:
+        * examples/DevGuideExamples/Messenger/Receiver_exec_i.h:
+        * examples/DevGuideExamples/Messenger/descriptors/run_test.pl:
+          Some cleanup and simplifications but this example doesn't deploy yet
+
+Mon Jun 20 13:58:32 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component_exec.cpp:
+          Fixed coverity errors
+
+Mon Jun 20 08:02:38 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/docs/TestCoverage.ods:
+          Updated.
+
+        * connectors/dds4ccm/tests/Derived/Derived.idl:
+        * connectors/dds4ccm/tests/Derived/Derived_Connector.idl:
+        * connectors/dds4ccm/tests/Derived/Derived_Connector.mpc:
+          Code alignment. Corrected some incorrect names.
+
+        * connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h:
+          Code alignment.
+
+Sun Jun 19 18:00:12 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Hello/Sender/Sender_exec.cpp:
+          Fixed memory leak
+
+Sat Jun 18 08:14:04 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * examples/Hello/Receiver/Receiver_exec.cpp:
+          Fixed compiler error on windows.
+
+Fri Jun 17 13:53:44 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * examples/Hello/descriptors/PlanLocality_DifferentProcesses.cdp:
+          Renamed "SameProcess" to "DifferentProcess"
+
+        * examples/Hello/step-by-step.html:
+          Update. Fixed some typos.
+
+Fri Jun 17 12:47:24 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * examples/Hello/step-by-step.html:
+          Update. Started rewriting Assemble.
+
+        * examples/Null_Component/Null_Component.mpc:
+        * examples/Null_Component_Glfa/Null_Component.mpc:
+          Let the TAO IDL compiler generate the executor files.
+
+        * examples/Null_Component/Null_Component_exec.h:
+        * examples/Null_Component/Null_Component_exec.cpp:
+        * examples/Null_Component/plan.h:
+        * examples/Null_Component_Glfa/Null_Component_exec.h:
+        * examples/Null_Component_Glfa/Null_Component_exec.cpp:
+          Removed since the TAO IDL compiler generates these files
+          on the fly.
+
+        * examples/Philosophers:
+        * examples/Philosophers/Philosophers.idl:
+        * examples/Philosophers/README:
+          Removed these files.
+
+Fri Jun 17 12:21:03 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * examples/Hello/step-by-step.html:
+          Describing ccm_noevent in default.features. Made an extra
+          link to the description of "starter".
+
+        * examples/Hello/descriptors/Domain.cdd:
+        * examples/Hello/descriptors/Hello.pcd:
+        * examples/Hello/descriptors/package.tpd:
+        * examples/Hello/descriptors/svc_em.conf:
+          Removed these files since they may confuse the user.
+
+Fri Jun 17 11:52:57 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * examples/Hello/Hello_Base/Hello_Base.mpc:
+        * examples/Hello/Receiver/Receiver.mpc:
+        * examples/Hello/Sender/Sender.mpc:
+          Regenerated, using the -e option in generate_component_mpc.
+          We're using events in this example.
+
+        * examples/Hello/step-by-step.html:
+          Added the -e option to the description of generate_component_mpc.
+
+Fri Jun 17 11:33:44 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * examples/Hello/descriptors/PlanLocality_DifferentProcesses.cdp:
+        * examples/Hello/descriptors/PlanLocality_SameProcess.cdp:
+          According to latest version of the Hello example.
+
+Fri Jun 17 11:23:32 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * examples/Hello/Hello_Base/Hello_Base.mpc:
+        * examples/Hello/Receiver/Receiver.idl:
+        * examples/Hello/Receiver/Receiver.mpc:
+        * examples/Hello/Receiver/Receiver_exec.h:
+        * examples/Hello/Receiver/Receiver_exec.cpp:
+        * examples/Hello/Sender/Sender.idl:
+        * examples/Hello/Sender/Sender.mpc:
+        * examples/Hello/Sender/Sender_exec.h:
+        * examples/Hello/Sender/Sender_exec.cpp:
+        * examples/Hello/descriptors/DeploymentPlan.cdp:
+        * examples/Hello/descriptors/DeploymentPlan_without_ns.cdp:
+        * examples/Hello/step-by-step.html:
+          Rewritten. Regenerated the mpc and executor code. Also
+          using unhomed components. Next step is to test and change
+          the other perl scripts.
+
+Thu Jun 16 11:05:53 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer_exec.cpp:
+          Fixed memory leak in this test
+
+Thu Jun 16 08:36:24 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/impl/ndds/TypeSupport.cpp:
+          Fixed runtime issues in close.
+
+        * connectors/dds4ccm/tests/TypeSupport/main.cpp:
+          Expanded test with a few other tests.
+
+Thu Jun 16 07:19:26 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp:
+          Fixed memory leak in this test
+
+Wed Jun 15 13:38:57 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/impl/ndds/TypeSupport.h:
+        * connectors/dds4ccm/impl/ndds/TypeSupport.cpp:
+          Optimized management of DomainParticipants and type-factory combinations.
+
+Wed Jun 15 07:30:00 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl:
+          Fixed error in openDDS.
+
+Tue Jun 14 13:36:00 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tests/DAnCE/Executor-Destructor/Exec_Dest_Status_export.h:
+
+          Fuzz.
+
+Tue Jun 14 12:03:17 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h:
+          Fixed compile issue on openDDS.
+
+Tue Jun 14 08:46:29 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp:
+          Coverity : checked return value of register_type.
+
+Mon Jun 13 09:09:56 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/Plan.cdp:
+          Fixed runtime issue due to renaming action.
+
+Sat Jun 11 08:18:19 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tests/TypeSupport/main.cpp:
+          Fuzz: no ending new line at the end of the file.
+
+Sat Jun 11 08:17:03 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.mpc:
+        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc:
+        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc:
+          Fixed compile issues after renaming of project names.
+
+Fri Jun 10 15:01:15 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * bin/ciao_tests.lst:
+        * connectors/dds4ccm/tests/TypeSupport:
+        * connectors/dds4ccm/tests/TypeSupport/TypeSupport.mpc:
+        * connectors/dds4ccm/tests/TypeSupport/main.cpp:
+        * connectors/dds4ccm/tests/TypeSupport/run_test.pl:
+          Added a new (regular C++) which tests the TypeSupport class and its
+          internal type factory administration.
+
+Fri Jun 10 14:54:14 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/impl/ndds/TypeSupport.h:
+          Code alignment.
+
+        * connectors/dds4ccm/impl/ndds/TypeSupport.cpp:
+          Fuzz. Mismatched trace.
+
+Fri Jun 10 14:48:01 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.mpc:
+        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc:
+        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc:
+          Fuzz. Shorten project names
+
+Fri Jun 10 11:35:16 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * bin/ciao_tests.lst:
+          Added the memory leak test to the test framework
+
+Fri Jun 10 11:17:36 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h:
+        * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp:
+        * connectors/dds4ccm/impl/ndds/TypeSupport.h:
+        * connectors/dds4ccm/impl/ndds/TypeSupport.cpp:
+          Fixed memory leak in the register_type/unregister_type implemenation. This
+          memory existed because of the fact that two different topics where based
+          on the same datatype.
+          To fix this, a new map was created wich contains the DomainParticipant in
+          combination with the already existing type factories. Type factories
+          are now stored and removed per DomainParticipant.
+
+        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration:
+        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base:
+        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.idl:
+        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Base/TypeRegistration_Test_Base.mpc:
+        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component:
+        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.idl:
+        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc:
+        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.h:
+        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component_exec.cpp:
+        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector:
+        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.idl:
+        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc:
+        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors:
+        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/Plan.cdp:
+        * connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/descriptors/run_test.pl:
+          Added test to verify whether the memory leak is fixed.
+
+Wed Jun  8 12:32:48 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl:
+          Fixed problem with OpenDDS
+
+Wed Jun  8 07:00:55 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp:
+          Resolved compile error in case NDDS.
+
+Tue Jun  7 12:34:23 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp:
+          Removed unused declaration
+
+Tue Jun  7 11:56:36 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp:
+          Fixed warning.
+
+Mon Jun  6 15:08:05 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/idl/dds_rtf2_dcps.idl:
+          Extended support
+
+Wed Jun  1 12:56:35 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp:
+          Don't use the invalid macros but just use !=  for handle comparison
+
+Wed Jun  1 08:27:26 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.mpc:
+          Fixed export macro for OpenDDS
+
+Wed Jun  1 01:56:05 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tests/DAnCE/Executor-Destructor/Exec_Dest_Status.h:
+        * tests/DAnCE/Executor-Destructor/Exec_Dest_Status.cpp:
+        * tests/DAnCE/Executor-Destructor/Exec_Dest_Status_export.h:
+        * tests/DAnCE/Executor-Destructor/Executor_Destructor.mpc:
+        * tests/DAnCE/Executor-Destructor/Executor_Destructor_Interceptor.cpp:
+
+          Fix for bugzilla 3963.  On certain platforms (e.g., FC15), when
+        a library which is dlopened links another library which is
+        dlopened, this may cause spurious error messages upon exit
+        exit of the LocalityManager from ld.so.
+
+Tue May 31 12:27:54 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl:
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.idl:
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.idl:
+        * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl:
+        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.idl:
+        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.idl:
+          Disable some parts for opendds
+
+Tue May 31 08:56:09 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl:
+        * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl:
+          OpenDDS doesn't support a topic with a valuetype member
+
+Mon May 30 12:07:40 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp:
+          Removed unused ACE_ARG_UNUSED.
+
+        * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc:
+          PSAT stub project was using the *.cxx, generated by the
+          DDS IDL compiler. Fixed this by merging two projects
+          (idl_gen and _stub) into one (_stub).
+
+Sun May 29 17:31:41 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/dds4ccm_ts_default.mpb:
+          Specify some more opendds ts flags
+
+Sun May 29 17:22:08 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc:
+        * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc:
+        * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc:
+        * connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc:
+          These components use ndds specific features
+
+Fri May 27 12:44:32 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp:
+          Resolved errors in builds with other DDS vendors then ndds
+
+Thu May 26 20:29:07 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * tests/DAnCE/Progressive_Deployments/run_test.pl:
+          ../lib is not necessary; it doesn't even exist.
+
+Thu May 26 07:13:15 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp:
+          Fixed compile error
+
+Wed May 25 10:56:26 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp:
+        * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp:
+        * connectors/dds4ccm/impl/DDS_Update_T.cpp:
+        * connectors/dds4ccm/impl/DDS_Write_T.cpp:
+          Fixed argument not used warnings
+
+Tue May 24 18:52:31 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp:
+        * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp:
+        * connectors/dds4ccm/impl/DDS_Update_T.cpp:
+        * connectors/dds4ccm/impl/DDS_Write_T.cpp:
+          Improved portability
+
+Tue May 24 11:17:37 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc:
+        * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc:
+        * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp:
+        * connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component_exec.cpp:
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc:
+        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc:
+        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl:
+        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl:
+          Increased portability
+
+Tue May 24 09:12:37 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/ConditionManager.cpp:
+        * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp:
+          Increased portability
+
+Tue May 24 08:26:15 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/dds4ccm_conf.h:
+          Increased portability
+
+Mon May 23 18:24:38 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc:
+          Increased portability
+
+Mon May 23 15:07:33 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/PublisherListener.cpp:
+        * connectors/dds4ccm/impl/dds4ccm_conf.h:
+        * connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl:
+        * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl:
+        * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl:
+        * connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl:
+        * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl:
+        * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl:
+        * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl:
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl:
+        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl:
+        * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender_exec.cpp:
+        * connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp:
+          Increased portability
+
+Mon May 23 10:49:10 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl:
+        * connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl:
+        * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl:
+        * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl:
+        * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl:
+        * connectors/dds4ccm/tests/NoModule/NoModule.idl:
+        * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl:
+        * connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl:
+        * connectors/dds4ccm/tests/PSAT/psat_type.idl:
+        * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl:
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl:
+          Added needed pragma's for OpenDDS
+
+Mon May 23 09:49:50 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/tests/AMIDDS/Base/AmiDds_DDS.idl:
+          Added needed pragma's for OpenDDS
+
+Mon May 23 09:37:23 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/dds4ccm.mpb:
+          Attempt to give dds4ccm libraries the correct version number when
+          OpenDDS isenabled
+
+        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl:
+        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl:
+        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl:
+          Added needed pragma's for OpenDDS
+
+Mon May 23 09:00:14 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl:
+          Added needed pragma's for OpenDDS
+
+Mon May 23 08:36:09 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/dds4ccm_conf.h:
+          Added DDS_INSTANCE_HANDLE_VALID
+
+Mon May 23 07:41:20 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl:
+        * connectors/dds4ccm/tests/NoModule/NoModule.idl:
+        * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl:
+        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl:
+        * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl:
+        * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl:
+        * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl:
+        * connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl:
+        * connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl:
+        * connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl:
+        * connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl:
+        * connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl:
+        * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl:
+        * connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl:
+        * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl:
+        * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl:
+        * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl:
+        * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl:
+        * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl:
+        * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl:
+        * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl:
+        * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl:
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl:
+        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl:
+        * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl:
+        * connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl:
+          Fixes for OpenDDS support
+
+Fri May 20 14:14:32 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl:
+        * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl:
+        * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl:
+        * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl:
+        * connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl:
+        * connectors/dds4ccm/tests/Derived/Derived.idl:
+        * connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl:
+        * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl:
+        * connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl:
+        * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl:
+          Added needed pragma's for OpenDDS
+
+Fri May 20 09:18:56 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl:
+        * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl:
+          Added needed pragma's for OpenDDS
+
+Fri May 20 07:55:44 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl:
+        * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl:
+        * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl:
+        * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl:
+        * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl:
+          Added needed pragma's for OpenDDS
+
+Fri May 13 18:00:06 UTC 2011  James H. Hill  <hillj at cs dot iupui dot edu>
+
+        * tutorials/Quoter/Simple/03.html:
+
+          Updated the stock quoter example.
+
+Tue May 11 13:21:37 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+        * examples\Display\NavDisplayGUI_exec\DetailView.h:
+        * examples\Display\NavDisplayGUI_exec\RootPanel.cpp:
+        * examples\Display\NavDisplayGUI_exec\NodeItem.cpp:
+        * examples\Display\NavDisplayGUI_exec\RootPanel.h:
+        * examples\Display\NavDisplayGUI_exec\NodeItem.h:
+        * examples\Display\NavDisplayGUI_exec\Worker.cpp:
+        * examples\Display\NavDisplayGUI_exec\MapView.h:
+        * examples\Display\NavDisplayGUI_exec\Command.h:
+        * examples\Display\NavDisplayGUI_exec\NavDisplayGUI_exec.cpp:
+        * examples\Display\NavDisplayGUI_exec\NavUnit.cpp:
+        * examples\Display\NavDisplayGUI_exec\UpdatePositionCmd.cpp:
+        * examples\Display\NavDisplayGUI_exec\DetailView.cpp:
+        * examples\Display\GPS\GPS_exec.h:
+        * examples\Display\GPS\GPS_exec.cpp:
+        * examples\Display\README.html:
+        Made example running on Windows, changed deprecated Qt includes.
+
+
+Tue May 11 08:15:37 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+        * examples/Display/README.html:
+        * examples/Display/example.gif:
+        Add image to readme.
+
+Tue May 11 07:09:37 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+        * examples/Display/descriptors/run_test_more.pl:
+        * examples/Display/descriptors/deploymentplanone.cdp:
+        * examples/Display/descriptors/deploymentplanmore.cdp:
+        * examples/Display/descriptors/run_test_more_contr.pl:
+        * examples/Display/descriptors/flattened_deploymentplannat.cdp:
+        * examples/Display/descriptors/run_all_in_one.pl:
+        * examples/Display/descriptors/run_test.pl:
+        * examples/Display/descriptors/run_test_one.pl:
+        Solved Fuzz errors.
+
+Wed May 11 05:32:01 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/dds4ccm.mpb:
+          Fixed problem with last commit
+
+Tue May 10 18:32:40 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/dds4ccm.mpb:
+          Added include paths
+
+        * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h:
+        * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp:
+          Fixed Coverity errors
+
+Tue May 10 12:38:37 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+        * bin/ciao_tests.lst:
+        * examples/Display/Display_Base/Display_Base.idl:
+        * examples/Display/descriptors/flattened_deploymentplannat.cdp:
+        * examples/Display/descriptors/run_test.pl:
+        * examples/Display/NavDisplayGUI_exec/DetailView.h:
+        * examples/Display/NavDisplayGUI_exec/RootPanel.cpp:
+        * examples/Display/NavDisplayGUI_exec/NodeItem.cpp:
+        * examples/Display/NavDisplayGUI_exec/MapView.cpp:
+        * examples/Display/NavDisplayGUI_exec/RootPanel.h:
+        * examples/Display/NavDisplayGUI_exec/NodeItem.h:
+        * examples/Display/NavDisplayGUI_exec/Worker.cpp:
+        * examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc:
+        * examples/Display/NavDisplayGUI_exec/MapView.h:
+        * examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.cpp:
+        * examples/Display/NavDisplayGUI_exec/NavUnit.cpp:
+        * examples/Display/NavDisplayGUI_exec/NavDisplayGUI_exec.h:
+        * examples/Display/NavDisplayGUI_exec/NavUnit.h:
+        * examples/Display/NavDisplayGUI_exec/DetailView.cpp:
+        * examples/Display/RateGen/controller.cpp:
+        * examples/Display/RateGen/RateGen_exec.cpp:
+        * examples/Display/GPS/GPS.idl:
+        * examples/Display/GPS/GPS_exec.h:
+        * examples/Display/GPS/GPS_exec.cpp:
+        * examples/Display/NavDisplay/NavDisplay_exec.cpp:
+        * examples/Display/NavDisplay/NavDisplay.idl:
+        * examples/Display/NavDisplay/NavDisplay_exec.h:
+
+          Made test working again with GUI display, using one or more GPS
+          devices.  Used only QT4, removed qt3support. Not yet tested on
+          Windows.
+
+        * examples/Display/descriptors/basicNodeDaemon.pl:
+        * examples/Display/descriptors/flattened_deploymentplan.cdp:
+        * examples/Display/descriptors/DeploymentPlan.cdp:
+        * examples/Display/GPS/GPS_tracing_exec.cpp:
+        * examples/Display/GPS/GPS_tracing_exec.h:
+        Deleted this files. Not used anymore.
+
+          Deleted this files. Not used anymore.
+
+        * examples/Display/descriptors/deploymentplanmore.cdp:
+        * examples/Display/descriptors/run_test_one_contr.pl:
+        * examples/Display/descriptors/run_all_in_one.pl:
+        * examples/Display/descriptors/run_test_more.pl:
+        * examples/Display/descriptors/deploymentplanone.cdp:
+        * examples/Display/descriptors/run_test_more_contr.pl:
+        * examples/Display/descriptors/run_test_one.pl:
+        Added scripts for running GUI test (one and more) and test_all_in_one for testsuite.
+
+          Added scripts for running GUI test (one and more) and
+          test_all_in_one for testsuite.
+
+Tue May 10 06:25:37 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/impl/ndds/WaitSet.cpp:
+
+          Resolved coverity errors/warnings. Check pointer if nil before
+          using it.
+
+Mon May  9 10:58:16 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp:
+        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp:
+        * connectors/dds4ccm/impl/ndds/Publisher.cpp:
+        * connectors/dds4ccm/impl/ndds/Subscriber.cpp:
+        * connectors/dds4ccm/impl/ndds/Utils.cpp:
+          Don't throw an exception when a wrong QosProfile is applied. In the
+          end the creation of the DDS entity will fail. As a result to that, an
+          exception is thrown. This'll simply code and logging.
+
+        * connectors/dds4ccm/tests/QosProfile/descriptors/PlanMultipleHashes.cdp:
+          Added another test.
+
+Mon May  9 08:56:04 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/impl/DDS_StateListen_T.h:
+        * connectors/dds4ccm/impl/DataReaderHandler_T.h:
+        * connectors/dds4ccm/impl/DataReaderHandler_T.cpp:
+        * connectors/dds4ccm/impl/DataReaderListener_T.h:
+        * connectors/dds4ccm/impl/DataReaderStateListener_T.h:
+          Created a template class for the DataReaderListener and DataReaderStateListener
+          threadswitch. This'll reduce double code.
+
+Sun May  8 19:05:42 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/Updater_T.cpp:
+          Give local variable unique name
+
+        * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Receiver/Throughput_Receiver.cpp:
+          Fixed possible memory leaks
+
+Thu May  5 08:26:59 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl:
+          Only asign status when things go wrong.
+
+Wed May  4 11:37:31 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp:
+        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp:
+        * connectors/dds4ccm/impl/ndds/Publisher.cpp:
+        * connectors/dds4ccm/impl/ndds/Subscriber.cpp:
+        * connectors/dds4ccm/impl/ndds/Utils.cpp:
+          Improved handling of Qos profile string. Throwing a ::CORBA::INTERAL
+          when the Qos profile string does not meet the requirements
+          (i.e. containing a '#'-sign).
+
+        * connectors/dds4ccm/tests/QosProfile/descriptors/PlanNoHash.cdp:
+        * connectors/dds4ccm/tests/QosProfile/descriptors/PlanWrongNames.cdp:
+        * connectors/dds4ccm/tests/QosProfile/descriptors/run_test.pl:
+          Extended this test with a malformed Qos profile string.
+
+        * connectors/dds4ccm/tests/QosProfile/descriptors/Plan.cdp:
+          Removed this file.
+
+Thu Apr 28 14:00:42 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * bin/generate_component_mpc.pl:
+          Added a -I as commandline parameter. This will set an
+          include directory for all projects (cpp and idl).
+
+        * connectors/dds4ccm/impl/DataReaderHandler_T.h:
+        * connectors/dds4ccm/impl/DataReaderHandler_T.cpp:
+          Adding and removing reference manually. This'll prevent removing the
+          listener while the reactor still has messages to handle.
+
+Tue Apr 26 13:57:23 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+        * examples/Display/descriptors/run_test_without_ns.pl:
+        * examples/Display/descriptors/NodeManagerMap.cdd:
+        * examples/Display/descriptors/run_NodeDaemons.pl:
+        Deleted unused files.
+
+        * examples/Display/README.html:
+        * examples/Display/RateGen/RateGen_exec.cpp:
+        * examples/Display/GPS/GPS_exec.cpp:
+        Changed to make test working again.
+
+        * examples/Display/ run_test_contr.pl:
+        * examples/Display/flattened_deploymentplannat.cdp:
+        * examples/Display/run_test.pl:
+        Added for running test in console mode.
+
+
+Sat Apr 23 19:48:23 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp:
+        * connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.cpp:
+          Deleting the ticker in a consistent manner. Created in the constructor,
+          deleting it in the destructor.
+
+Fri Apr 22 19:26:37 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/impl/Updater_T.cpp:
+          Give local variable a different name to not match argument
+
+Fri Apr 22 13:01:26 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp:
+        * connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.cpp:
+          Always delete stuf which was created in the constructor.
+
+Fri Apr 22 08:24:41 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp:
+          Added missing breaks
+
+Fri Apr 22 07:35:30 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * performance-tests/Protocols/descriptors/svc.conf:
+          Fuzz: Added $Id string.
+
+Thu Apr 21 09:38:23 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/dds4ccm.mpb:
+        * MPC/config/dds4ccm_base.mpb:
+        * MPC/config/dds4ccm_impl.mpb:
+        * MPC/config/dds4ccm_ts_default.mpb:
+          Extended base projects
+
+Thu Apr 21 08:29:25 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/ndds_idltocpp_ts_defaults.mpb:
+          Added taolib
+
+Wed Apr 20 08:11:49 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * CIAO_TAO_DAnCE.mwc:
+        * MPC/config/dds4ccm_ts_default.mpb:
+        * MPC/config/ndds_idltocpp.mpb:
+        * MPC/config/ndds_idltocpp_stub.mpb:
+        * MPC/config/ndds_idltocpp_ts_defaults.mpb:
+        * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl:
+        * connectors/dds4ccm/examples/Large_Deployment/Common/Common.idl:
+        * connectors/dds4ccm/examples/Large_Deployment/Common/Common.mpc:
+        * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl:
+        * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl:
+        * connectors/dds4ccm/idl/dds4ccm_Base.idl:
+        * connectors/dds4ccm/idl/dds4ccm_QueryFilter.idl:
+        * connectors/dds4ccm/idl/dds4ccm_skel.mpc:
+        * connectors/dds4ccm/idl/dds4ccm_stub.mpc:
+        * connectors/dds4ccm/idl/ndds/ndds_dcps.idl:
+        * connectors/dds4ccm/impl/CCM_DataReader.h:
+        * connectors/dds4ccm/impl/CCM_DataReader.cpp:
+        * connectors/dds4ccm/impl/CCM_DataWriter.h:
+        * connectors/dds4ccm/impl/CCM_DataWriter.cpp:
+        * connectors/dds4ccm/impl/ConditionManager.h:
+        * connectors/dds4ccm/impl/ConditionManager.cpp:
+        * connectors/dds4ccm/impl/DDS_Base_Connector_T.h:
+        * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp:
+        * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp:
+        * connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.cpp:
+        * connectors/dds4ccm/impl/DDS_Update_T.cpp:
+        * connectors/dds4ccm/impl/DDS_Write_T.cpp:
+        * connectors/dds4ccm/impl/InstanceHandleManager_T.h:
+        * connectors/dds4ccm/impl/InstanceHandleManager_T.cpp:
+        * connectors/dds4ccm/impl/PortStatusListener.cpp:
+        * connectors/dds4ccm/impl/PublisherListener.cpp:
+        * connectors/dds4ccm/impl/Reader_T.h:
+        * connectors/dds4ccm/impl/Reader_T.cpp:
+        * connectors/dds4ccm/impl/SubscriberListener.cpp:
+        * connectors/dds4ccm/impl/Updater_T.h:
+        * connectors/dds4ccm/impl/Updater_T.cpp:
+        * connectors/dds4ccm/impl/Writer_T.h:
+        * connectors/dds4ccm/impl/Writer_T.cpp:
+        * connectors/dds4ccm/impl/dds4ccm_conf.h:
+        * connectors/dds4ccm/impl/dds4ccm_impl.mpc:
+        * connectors/dds4ccm/impl/ndds/WaitSet.h:
+        * connectors/dds4ccm/performance-tests/Latency/Base/LatencyTT_Test_Base.idl:
+        * connectors/dds4ccm/performance-tests/Throughput/Base/Throughput_Base.idl:
+        * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl:
+        * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc:
+        * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl:
+        * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl:
+        * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl:
+        * connectors/dds4ccm/tests/CoherentUpdater/Base/CoherentUpdate_Test_Base.idl:
+        * connectors/dds4ccm/tests/CoherentWriter/Base/CoherentWrite_Test_Base.idl:
+        * connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir.idl:
+        * connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Base/CFT_Test_Base.idl:
+        * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Base/CFTLE_Test_Base.idl:
+        * connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Base/Exception_Test_Base.idl:
+        * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Test_Base.idl:
+        * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Base/CFTLS_Test_Base.idl:
+        * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/DDSEntity/Base/Writer_Base.idl:
+        * connectors/dds4ccm/tests/Derived/Derived.idl:
+        * connectors/dds4ccm/tests/DoubleNestedModule/Base/DNM_Base.idl:
+        * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl:
+        * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl:
+        * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl:
+        * connectors/dds4ccm/tests/GetComponent/Event/Base/GCE_Test_Base.idl:
+        * connectors/dds4ccm/tests/GetComponent/State/Base/GCS_Test_Base.idl:
+        * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl:
+        * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl:
+        * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl:
+        * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl:
+        * connectors/dds4ccm/tests/LateBinding/ReadGet/Base/RG_LateBinding_Base.idl:
+        * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Base/WU_LateBinding_Base.idl:
+        * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl:
+        * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl:
+        * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl:
+        * connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Base/Event_MemLeakDetection_Test_Base.idl:
+        * connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Base/State_MemLeakDetection_Test_Base.idl:
+        * connectors/dds4ccm/tests/MultiTopic/Base/MultiTopic_Base.idl:
+        * connectors/dds4ccm/tests/MultipleTemp/Base/MultipleTemp_Base.idl:
+        * connectors/dds4ccm/tests/NoModule/NoModule.idl:
+        * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl:
+        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/OIT_Test_Base.idl:
+        * connectors/dds4ccm/tests/OneFile/Multiple/OFM_Base.idl:
+        * connectors/dds4ccm/tests/OneFile/Single/OneFile_Base.idl:
+        * connectors/dds4ccm/tests/PSAT/psat_type.idl:
+        * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl:
+        * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl:
+        * connectors/dds4ccm/tests/PortUsage/Base/PortUsage_Test_Base.idl:
+        * connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Proxy_RW_Test_Base.idl:
+        * connectors/dds4ccm/tests/QosProfile/Base/QosProfile_Test_Base.idl:
+        * connectors/dds4ccm/tests/QueryCondition/Different/Base/Different_Test_Base.idl:
+        * connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QCLE_Test_Base.idl:
+        * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Test_Base.idl:
+        * connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QCLS_Test_Base.idl:
+        * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Base/QCTL_Test_Base.idl:
+        * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Test_Base.idl:
+        * connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Test_Base.idl:
+        * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl:
+        * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl:
+        * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl:
+        * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl:
+        * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl:
+        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl:
+        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl:
+        * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl:
+        * connectors/dds4ccm/tests/TopicName/Base/TopicName_Test_Base.idl:
+        * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl:
+        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl:
+        * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl:
+        * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl:
+        * connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl:
+        * connectors/dds4ccm/tests/UserdataCopyCount/Base/UCC_Test_Base.idl:
+        * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl:
+        * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl:
+        * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl:
+          Extended portability for dds4ccm
+
+Wed Apr 20 09:52:52 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * CIAO version 1.0.2 released.
+
+Local Variables:
+mode: change-log
+add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time))
+indent-tabs-mode: nil
+End:
diff --git a/CIAO/NEWS b/CIAO/NEWS
index 39477c560ec..a0b5aa9f3a1 100644
--- a/CIAO/NEWS
+++ b/CIAO/NEWS
@@ -1,4 +1,10 @@
-USER VISIBLE CHANGES BETWEEN CIAO-1.0.5 and CIAO-1.1.0
+USER VISIBLE CHANGES BETWEEN CIAO-1.0.6 and CIAO-1.1.0
+=======================================================
+
+. CIAO now supports the synchronous port and the ami4ccm lem pragma as
+  documented in the AMI4CCM Initial submission by Remedy IT (mars/11-06-01)
+
+USER VISIBLE CHANGES BETWEEN CIAO-1.0.5 and CIAO-1.0.6
 =======================================================
 
 . It is now possible to connect connections in a deployment plan
@@ -33,6 +39,15 @@ USER VISIBLE CHANGES BETWEEN CIAO-1.0.5 and CIAO-1.1.0
   user components to be compiled with direct collocation enabled. Enabling
   direct collocation does increase the size of the generated code
 
+. All facet servants are now generated in the new _svnt_T.{h,cpp} files. This
+  is a first step in more refactoring in the CIAO servants. Together with the
+  TAO skeleton refactoring the skeleton for the Null_Component example decreased
+  from 40206 bytes to 24971 bytes, the generated servant from 56959 bytes to
+  54933 bytes. The skeleton for the related Null_Interface reduced from
+  9559 bytes to 4526 bytes.
+
+. Added support for DDS4CCM using RTI DDS 4.5e on RHEL 6.1
+
 USER VISIBLE CHANGES BETWEEN CIAO-1.0.4 and CIAO-1.0.5
 =======================================================
 
diff --git a/CIAO/PROBLEM-REPORT-FORM b/CIAO/PROBLEM-REPORT-FORM
index d58b13740c5..30426e587e2 100644
--- a/CIAO/PROBLEM-REPORT-FORM
+++ b/CIAO/PROBLEM-REPORT-FORM
@@ -41,9 +41,9 @@
 To: ciao-users@list.isis.vanderbilt.edu
 Subject: [area]: [synopsis]
 
-    CIAO VERSION: 1.0.5
-    TAO VERSION : 2.0.5
-    ACE VERSION : 6.0.5
+    CIAO VERSION: 1.0.6
+    TAO VERSION : 2.0.6
+    ACE VERSION : 6.0.6
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/CIAO/VERSION b/CIAO/VERSION
index 6259d70715c..cd7cb8b6f8f 100644
--- a/CIAO/VERSION
+++ b/CIAO/VERSION
@@ -1,4 +1,4 @@
-This is CIAO version 1.0.5, released Mon Oct 10 08:48:51 CEST 2011
+This is CIAO version 1.0.6, released Sun Dec 04 11:51:30 CET 2011
 
 If you have any problems with or questions about CIAO, please send
 e-mail to the CIAO mailing list (ciao-users@list.isis.vanderbilt.edu),
diff --git a/CIAO/bin/ciao_tests.lst b/CIAO/bin/ciao_tests.lst
index 565fc865e22..0d39ffde60d 100644
--- a/CIAO/bin/ciao_tests.lst
+++ b/CIAO/bin/ciao_tests.lst
@@ -18,7 +18,7 @@ TAO/CIAO/examples/Null_Component_Glfa/descriptors/run_test.pl: !STATIC !MINIMUM
 TAO/CIAO/examples/Hello/descriptors/run_test_without_ns.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE !CCM_NOEVENT
 TAO/CIAO/examples/Display/descriptors/run_all_in_one.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE !CCM_NOEVENT
 TAO/CIAO/tutorials/Quoter/Simple/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE !CCM_NOEVENT
-TAO/CIAO/tests/Collocation/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST
+TAO/CIAO/tests/Collocation/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST CCM_DIRECTCOLL
 TAO/CIAO/tests/Bug_3834_Regression/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE
 TAO/CIAO/tests/Bug_3834_Regression/descriptors/run_test_without_ns.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE
 TAO/CIAO/tests/IDL3/Events/Any/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE !CCM_NOEVENT
@@ -43,6 +43,7 @@ TAO/CIAO/tests/Cookies/run_test.pl
 #TAO/CIAO/tests/COPI/Registration/Stub/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST
 TAO/CIAO/connectors/tests/AMIDDS/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
 TAO/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST
+TAO/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_fullblock_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST
 TAO/CIAO/connectors/ami4ccm/examples/Quoter/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST
 TAO/CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST
 TAO/CIAO/connectors/ami4ccm/tests/PragmaT/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST
diff --git a/CIAO/bin/generate_component_mpc.pl b/CIAO/bin/generate_component_mpc.pl
index c915836cd94..6289c75b83d 100755
--- a/CIAO/bin/generate_component_mpc.pl
+++ b/CIAO/bin/generate_component_mpc.pl
@@ -240,6 +240,8 @@ $svr_after = "";
 
 $svr_libs = "$com_name".'_stub '. "$com_name".'_lem_stub ';
 
+$svr_tmpl = '';
+
 if (defined $options{n}) {
     $svr_after = "$unique_prefix"."$com_name".'_stub';
 
@@ -273,8 +275,15 @@ else {
 '
     '."$com_name".'S.h
     '."$com_name".'_svnt.h
+    '."$com_name".'_svnt_T.h
     '."$com_name".'_svnt_export.h
 ';
+
+    $svr_tmpl  =
+'
+    '."$com_name".'_svnt_T.cpp
+';
+
 }
 
 $mpc_template = '// $Id$
@@ -331,9 +340,16 @@ project('."$unique_prefix"."$com_name"."$svr_suffix".') : '."$svr_base". "$base_
   Source_Files {'."$svr_src".'  }
 
   Header_Files {'."$svr_hdr".'  }
+';
+
+if (!defined $options{n}) {
+    $mpc_template = $mpc_template.'
+  Template_Files {'."$svr_tmpl".'  }
+';
+}
 
+$mpc_template = $mpc_template.'
   Inline_Files {
-    '."$com_name".'S.inl
   }
 }
 
diff --git a/CIAO/ccm/CCM_stub.mpc b/CIAO/ccm/CCM_stub.mpc
index 489be0694f0..6d2c581e566 100644
--- a/CIAO/ccm/CCM_stub.mpc
+++ b/CIAO/ccm/CCM_stub.mpc
@@ -38,7 +38,6 @@ project(CCM_stub_idl) : install, ciaolib_with_idl, valuetype {
   }
 
   IDL_Files {
-    idlflags += -Ssi
     CCM_HomeFinder.idl
     CCM_Configurator.idl
     CCM_KeylessCCMHome.idl
@@ -116,12 +115,6 @@ project(CCM_stub) : install, ciaolib_with_idl, ciao_output, valuetype, ifr_clien
     CCM_ReceptacleC.inl
     CCM_StandardConfiguratorC.inl
     CCM_CookieC.inl
-    CCM_HomeConfigurationS.inl
-    CCM_HomeS.inl
-    CCM_HomesS.inl
-    CCM_ObjectS.inl
-    CCM_PrimaryKeyBaseS.inl
-    CCM_StandardConfiguratorS.inl
   }
 
   Source_Files {
diff --git a/CIAO/ccm/Extension/CCM_extension.mpc b/CIAO/ccm/Extension/CCM_extension.mpc
index 819c2c8db03..26e0f5e496d 100644
--- a/CIAO/ccm/Extension/CCM_extension.mpc
+++ b/CIAO/ccm/Extension/CCM_extension.mpc
@@ -33,7 +33,6 @@ project(CCM_extension_stub_idl) : install, ciaolib_with_idl {
   }
 
   IDL_Files {
-    idlflags += -Ssi
     CCM_QoS.idl
   }
 
diff --git a/CIAO/ciao/Containers/Container_Base_T.cpp b/CIAO/ciao/Containers/Container_Base_T.cpp
index fae1812ae4f..7bfc1557bf7 100644
--- a/CIAO/ciao/Containers/Container_Base_T.cpp
+++ b/CIAO/ciao/Containers/Container_Base_T.cpp
@@ -17,7 +17,6 @@ namespace CIAO
                                   PortableServer::POA_ptr root_poa)
     : orb_ (::CORBA::ORB::_duplicate (o)),
       root_poa_ (::PortableServer::POA::_duplicate (root_poa))
-      //, sa_ (0)
   {
   }
 
@@ -30,7 +29,6 @@ namespace CIAO
   void
   Container_i<BASE>::fini (void)
   {
-
     ::PortableServer::POA_var comp_poa_safe = this->component_poa_._retn ();
 
     if (! CORBA::is_nil (comp_poa_safe.in ()))
@@ -95,14 +93,15 @@ namespace CIAO
 
     PortableServer::POA_var poa_safe;
 
-    if (t == Container_Types::COMPONENT_t ||
-        t == Container_Types::HOME_t)
-      {
-        poa_safe = PortableServer::POA::_duplicate(this->component_poa_.in ());
-      }
-    else
+    switch (t)
       {
-        poa_safe = PortableServer::POA::_duplicate(this->facet_cons_poa_.in ());
+        case Container_Types::COMPONENT_t:
+        case Container_Types::HOME_t:
+          poa_safe = PortableServer::POA::_duplicate(this->component_poa_.in ());
+          break;
+        default:
+          poa_safe = PortableServer::POA::_duplicate(this->facet_cons_poa_.in ());
+          break;
       }
 
     PortableServer::ObjectId_var tmp_id = poa_safe->activate_object (p);
diff --git a/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.cpp b/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.cpp
index f1ea6cfc72d..243a447cd40 100644
--- a/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.cpp
+++ b/CIAO/ciao/Deployment/Handlers/CIAO_Handler_Common.cpp
@@ -45,9 +45,9 @@ namespace CIAO
                     "Component_Handler_i::get_implementation - "
                     "Unable to locate artifact <%C>\n",
                     name));
+
     throw ::Deployment::PlanError (name,
                                    "Nonexistent artifact");
-    return 0;
   }
 
   void
diff --git a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp b/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp
index 149a96d2327..4234ccbdbb0 100644
--- a/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp
+++ b/CIAO/ciao/Deployment/Interceptors/Deployment_Interceptors.cpp
@@ -171,16 +171,16 @@ namespace CIAO
             catch (const CORBA::INV_OBJREF&)
               {
                 CIAO_ERROR (6, (LM_INFO, CLINFO
-                                ACE_TEXT("CIAO_ReferenceLookup_i::pre_connect - ")
-                                ACE_TEXT("Unable to resolve external reference for connection %C\n"),
+                                "CIAO_ReferenceLookup_i::pre_connect - "
+                                "Unable to resolve external reference for connection %C\n",
                                 plan.connection[connRef].name.in ()));
               }
             catch (CORBA::Exception &ex)
               {
                 CIAO_ERROR (1, (LM_ERROR, CLINFO
-                                ACE_TEXT("CIAO_ReferenceLookup_i::pre_connect - ")
-                                ACE_TEXT("Caught CORBA Exception while resolving external")
-                                ACE_TEXT ("reference for connection %C: %C\n"),
+                                "CIAO_ReferenceLookup_i::pre_connect - "
+                                "Caught CORBA Exception while resolving external"
+                                "reference for connection %C: %C\n",
                                 plan.connection[connRef].name.in (),
                                 ex._info ().c_str ()));
                 throw;
@@ -188,9 +188,9 @@ namespace CIAO
             catch (...)
               {
                 CIAO_ERROR (1, (LM_ERROR, CLINFO
-                                ACE_TEXT("CIAO_ReferenceLookup_i::pre_connect - ")
-                                ACE_TEXT("Caught C Exception while resolving external reference")
-                                ACE_TEXT("for connection %C\n"),
+                                "CIAO_ReferenceLookup_i::pre_connect - "
+                                "Caught C Exception while resolving external reference"
+                                "for connection %C\n",
                                 plan.connection[connRef].name.in ()));
                 throw;
               }
diff --git a/CIAO/ciao/Servants/Facet_Servant_Base_T.cpp b/CIAO/ciao/Servants/Facet_Servant_Base_T.cpp
new file mode 100644
index 00000000000..54b82708d4e
--- /dev/null
+++ b/CIAO/ciao/Servants/Facet_Servant_Base_T.cpp
@@ -0,0 +1,42 @@
+// $Id$
+
+#ifndef CIAO_FACET_INTERFACE_BASE_T_C
+#define CIAO_FACET_INTERFACE_BASE_T_C
+
+#include "Facet_Servant_Base_T.h"
+#include "ccm/CCM_ObjectC.h"
+#include "ciao/Logger/Log_Macros.h"
+
+namespace CIAO
+{
+  template <typename BASE, typename EXEC, typename CONTEXT>
+  Facet_Servant_Base_T<BASE, EXEC, CONTEXT>::Facet_Servant_Base_T (
+      typename EXEC::_ptr_type exec,
+      ::Components::CCMContext_ptr ctx)
+    : executor_ (EXEC::_duplicate (exec)),
+      ctx_ (::Components::CCMContext::_duplicate (ctx))
+  {
+    CIAO_TRACE ("Facet_Servant_Base_T<BASE, EXEC, CONTEXT>::Facet_Servant_Base_T");
+  }
+
+  template <typename BASE, typename EXEC, typename CONTEXT>
+  Facet_Servant_Base_T<BASE, EXEC, CONTEXT>::~Facet_Servant_Base_T (void)
+  {
+  }
+
+  template <typename BASE, typename EXEC, typename CONTEXT>
+  ::CORBA::Object_ptr
+  Facet_Servant_Base_T<BASE, EXEC, CONTEXT>::_get_component (void)
+  {
+    typename CONTEXT::_var_type sc = CONTEXT::_narrow (this->ctx_.in ());
+
+    if (::CORBA::is_nil (sc.in ()))
+      {
+        throw ::CORBA::INTERNAL ();
+      }
+
+    return sc->get_CCM_object ();
+  }
+};
+
+#endif /* CIAO_FACET_INTERFACE_BASE_T_C */
diff --git a/CIAO/ciao/Servants/Facet_Servant_Base_T.h b/CIAO/ciao/Servants/Facet_Servant_Base_T.h
new file mode 100644
index 00000000000..32b23fea76b
--- /dev/null
+++ b/CIAO/ciao/Servants/Facet_Servant_Base_T.h
@@ -0,0 +1,59 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Facet_Servant_Base_T.h
+ *
+ *  $Id$
+ *
+ *  This file contains the declaration of a mixin base class for
+ *  the generated interface servant class.
+ *
+ *  @authors Marcel Smit <msmit@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef CIAO_FACET_INTERFACE_BASE_T_H
+#define CIAO_FACET_INTERFACE_BASE_T_H
+
+#include /**/ "ace/pre.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace CIAO
+{
+  template <typename BASE, typename EXEC, typename CONTEXT>
+  class Facet_Servant_Base_T
+    : public virtual BASE
+  {
+  public:
+    Facet_Servant_Base_T (typename EXEC::_ptr_type exec,
+                          ::Components::CCMContext_ptr ctx);
+
+    virtual ~Facet_Servant_Base_T (void);
+
+    /// Get component implementation.
+    virtual CORBA::Object_ptr _get_component (void);
+
+  protected:
+    typename EXEC::_var_type executor_;
+
+    /// Context object.
+    ::Components::CCMContext_var ctx_;
+  };
+};
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "Facet_Servant_Base_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+#pragma implementation ("Facet_Servant_Base_T.cpp")
+#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+#include /**/ "ace/post.h"
+
+
+#endif /* CIAO_FACET_INTERFACE_BASE_T_H */
diff --git a/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp b/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp
index cc334924559..f691e45fb23 100644
--- a/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp
+++ b/CIAO/ciao/Servants/Home_Servant_Impl_T.cpp
@@ -44,13 +44,30 @@ namespace CIAO
   {
     CIAO_TRACE ("Home_Servant_Impl<>::destructor");
 
-    OBJ_ITERATOR const end = this->objref_map_.end ();
+    this->remove_components ();
+  }
 
-    for (OBJ_ITERATOR iter = this->objref_map_.begin ();
-         iter != end;
-         ++iter)
+  template <typename BASE_SKEL,
+            typename EXEC,
+            typename COMP_SVNT,
+            typename CONTAINER>
+  void
+  Home_Servant_Impl<BASE_SKEL,
+                    EXEC,
+                    COMP_SVNT,
+                    CONTAINER>::remove_components (void)
+  {
+    while (this->objref_map_.current_size () > 0)
       {
-        this->remove_component (((*iter).int_id_).in ());
+        OBJ_ITERATOR const first = this->objref_map_.begin ();
+        this->remove_component (((*first).int_id_).in ());
+        if (this->objref_map_.unbind (first) != 0)
+          {
+            CIAO_ERROR (1, (LM_WARNING, CLINFO
+                        "Home_Servant_Impl<>::remove_components - "
+                        "Failed to unbind component\n"));
+            throw Components::RemoveFailure ();
+          }
       }
   }
 
diff --git a/CIAO/ciao/Servants/Home_Servant_Impl_T.h b/CIAO/ciao/Servants/Home_Servant_Impl_T.h
index d70d2775666..c6228b97c65 100644
--- a/CIAO/ciao/Servants/Home_Servant_Impl_T.h
+++ b/CIAO/ciao/Servants/Home_Servant_Impl_T.h
@@ -64,6 +64,8 @@ namespace CIAO
 
     virtual void update_component_map (PortableServer::ObjectId &oid);
 
+    void remove_components (void);
+
   protected:
     /// CIAO-specific operations.
     typename COMP_SVNT::_stub_ptr_type
diff --git a/CIAO/ciao/Servants/Servants.mpc b/CIAO/ciao/Servants/Servants.mpc
index 886ba5da90b..eb3f7b93f64 100644
--- a/CIAO/ciao/Servants/Servants.mpc
+++ b/CIAO/ciao/Servants/Servants.mpc
@@ -16,6 +16,7 @@ project(CIAO_Servant_Impl) : install, ciao_container_base_stub, ccm_svnt, ccm_se
      Home_Servant_Impl_T.cpp
      Connector_Servant_Impl_Utils_T.cpp
      Servant_Impl_Utils_T.cpp
+     Facet_Servant_Base_T.cpp
    }
 
    Header_Files {
@@ -25,10 +26,10 @@ project(CIAO_Servant_Impl) : install, ciao_container_base_stub, ccm_svnt, ccm_se
      Home_Servant_Impl_T.h
      Servant_Impl_Base.h
      StandardConfigurator_Impl.h
+     Facet_Servant_Base_T.h
    }
 
   specific {
     install_dir = ciao/Servants
   }
-
 }
diff --git a/CIAO/ciao/Servants/Session/Servant_Impl_T.cpp b/CIAO/ciao/Servants/Session/Servant_Impl_T.cpp
index 32066508613..0c86feeb24b 100644
--- a/CIAO/ciao/Servants/Session/Servant_Impl_T.cpp
+++ b/CIAO/ciao/Servants/Session/Servant_Impl_T.cpp
@@ -46,7 +46,6 @@ namespace CIAO
             typename CONTEXT>
   Session_Servant_Impl<BASE_SKEL, EXEC, CONTEXT>::~Session_Servant_Impl (void)
   {
-    //TODO: thread safe? How?
     if (this->executor_->_refcount_value () > 1)
       {
         CIAO_ERROR (1,
@@ -112,12 +111,12 @@ namespace CIAO
     ::Components::SessionContext_var sc =
       ::Components::SessionContext::_narrow (this->context_);
 
-    if (! ::CORBA::is_nil (sc.in ()))
+    if (::CORBA::is_nil (sc.in ()))
       {
-        return sc->get_CCM_object ();
+        throw ::CORBA::INTERNAL ();
       }
 
-    throw ::CORBA::INTERNAL ();
+    return sc->get_CCM_object ();
   }
 
   // CIAO-specific operations.
@@ -188,14 +187,12 @@ namespace CIAO
     ::Components::SessionComponent_var temp =
       ::Components::SessionComponent::_narrow (this->executor_.in ());
 
-    if (! ::CORBA::is_nil (temp.in ()))
-      {
-        temp->ccm_remove ();
-      }
-    else
+    if (::CORBA::is_nil (temp.in ()))
       {
         throw ::CORBA::INTERNAL ();
       }
+
+    temp->ccm_remove ();
   }
 }
 
diff --git a/CIAO/ciao/Valuetype_Factories/ConfigValue.cpp b/CIAO/ciao/Valuetype_Factories/ConfigValue.cpp
index 3e5c02f15d9..17eaa33db93 100644
--- a/CIAO/ciao/Valuetype_Factories/ConfigValue.cpp
+++ b/CIAO/ciao/Valuetype_Factories/ConfigValue.cpp
@@ -15,11 +15,8 @@ namespace CIAO
 
    ConfigValue_impl::ConfigValue_impl(const char*       the_name,
                                       const CORBA::Any& the_value)
-      : OBV_Components::ConfigValue()
+      : OBV_Components::ConfigValue(the_name, the_value)
    {
-      CORBA::Any any = the_value;
-      name (the_name);
-      value (any);
    }
 
    CORBA::ValueBase* ConfigValue_impl::_copy_value()
diff --git a/CIAO/ciao/Version.h b/CIAO/ciao/Version.h
index cab14dfcc8a..e4992f75be8 100644
--- a/CIAO/ciao/Version.h
+++ b/CIAO/ciao/Version.h
@@ -5,5 +5,5 @@
 
 #define CIAO_MAJOR_VERSION 1
 #define CIAO_MINOR_VERSION 0
-#define CIAO_BETA_VERSION 5
-#define CIAO_VERSION "1.0.5"
+#define CIAO_BETA_VERSION 6
+#define CIAO_VERSION "1.0.6"
diff --git a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc
index 92d18d16af4..874a7693319 100644
--- a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc
+++ b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc
@@ -115,7 +115,6 @@ project (AMI4CCM_svnt) : install, ciao_servant, ciao_lib {
   }
 
   Inline_Files {
-    ami4ccmS.inl
   }
 
   specific {
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.mpc b/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.mpc
index fc6b717a9dc..e6e41e8c1b8 100644
--- a/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.mpc
+++ b/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.mpc
@@ -140,7 +140,6 @@ project(AMI_Hello_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    HelloS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc b/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc
index 01ba696e68e..f7d776a93a7 100644
--- a/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_Hello_Base_Hello_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    Hello_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc
index 72a33b2536c..0d6b9397524 100644
--- a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_Hello_Base_Hello_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    Hello_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp
index 9a98237ba5e..b17cb8a8d99 100644
--- a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp
+++ b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp
@@ -247,7 +247,7 @@
       <instance xmi:idref="Hello.ComponentImplementations.HelloImplementation.Hello.AMI" />
     </internalEndpoint>
   </connection>
- 
+
   <!-- this plan is made for using the synchronous connection between Sender and Receiver>
   <instead of using the synchronous port on the AMI connector-->
 
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/PlanFullBlock.cdp b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/PlanFullBlock.cdp
new file mode 100644
index 00000000000..36c1fe288d1
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/PlanFullBlock.cdp
@@ -0,0 +1,447 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<!-- $Id$ -->
+<Deployment:DeploymentPlan xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
+
+  <UUID>6D382DAE-9024-4C4D-B91B-A0F9176AFACF</UUID>
+
+  <implementation xmi:id="CompSvrImpl">
+    <name>CompSvr</name>
+    <source />
+    <artifact xmi:idref="CompSvrArt" />
+    <execParameter>
+      <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>edu.vanderbilt.dre.DAnCE.LocalityManager</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+  <implementation xmi:id="Hello_ReceiverHomeImplementation">
+    <name>Hello_ReceiverHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="Hello_Receiver_ExecArtifact"/>
+    <artifact xmi:idref="Hello_Receiver_SvntArtifact"/>
+    <execParameter>
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Hello_AMI_Receiver_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Hello_Receiver_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+  <implementation xmi:id="Hello_SenderHomeImplementation">
+    <name>Hello_SenderHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="Hello_Sender_ExecArtifact"/>
+    <artifact xmi:idref="Hello_Sender_SvntArtifact"/>
+    <execParameter>
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Hello_Sender_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Hello.ImplementationArtifacts.SenderArtifacts.Sender_exec</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Hello_Sender_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Hello.ImplementationArtifacts.SenderArtifacts.Sender_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+  <implementation xmi:id="Hello_AMIHomeImplementation">
+    <name>Hello_AMIHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="Hello_AMI_ExecArtifact"/>
+    <artifact xmi:idref="Hello_AMI_SvntArtifact"/>
+    <execParameter>
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Hello_AMI4CCM_MyFoo_Connector_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Hello.ImplementationArtifacts.AMIArtifacts.AMI_exec</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Hello_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Hello.ImplementationArtifacts.AMIArtifacts.AMI_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+  <instance xmi:id="CompSvr1Inst">
+    <name>ComponentServer1Instance</name>
+    <node>Receiver</node>
+    <source />
+    <implementation xmi:idref="CompSvrImpl" />
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.LocalityArguments</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>-ORBSvcConfDirective "static Client_Strategy_Factory '-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW -ORBConnectStrategy blocked'" -ORBSvcConfDirective "static Resource_Factory '-ORBFlushingStrategy blocking'"</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <instance xmi:id="Hello.ComponentImplementations.HelloImplementation.Hello.Receiver">
+    <name>Hello.ComponentImplementations.HelloImplementation.Hello.Receiver</name>
+    <node>Receiver</node>
+    <source/>
+    <implementation xmi:idref="Hello_ReceiverHomeImplementation"/>
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Receiver.ior</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <instance xmi:id="CompSvr2Inst">
+    <name>ComponentServer2Instance</name>
+    <node>Sender</node>
+    <source />
+    <implementation xmi:idref="CompSvrImpl" />
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.LocalityArguments</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>-ORBSvcConfDirective "static Client_Strategy_Factory '-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW -ORBConnectStrategy blocked'" -ORBSvcConfDirective "static Resource_Factory '-ORBFlushingStrategy blocking'"</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <instance xmi:id="Hello.ComponentImplementations.HelloImplementation.Hello.Sender">
+    <name>Hello.ComponentImplementations.HelloImplementation.Hello.Sender</name>
+    <node>Sender</node>
+    <source/>
+    <implementation xmi:idref="Hello_SenderHomeImplementation"/>
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Sender.ior</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <instance xmi:id="Hello.ComponentImplementations.HelloImplementation.Hello.AMI">
+    <name>Hello.ComponentImplementations.HelloImplementation.Hello.AMI</name>
+    <node>Sender</node>
+    <source/>
+    <implementation xmi:idref="Hello_AMIHomeImplementation"/>
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>AMI.ior</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <connection>
+    <name>run_asynch_foo_connection</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>sendc_run_my_foo</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="Hello.ComponentImplementations.HelloImplementation.Hello.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="Hello.ComponentImplementations.HelloImplementation.Hello.AMI" />
+    </internalEndpoint>
+  </connection>
+
+  <connection>
+    <name>do_foo_connection</name>
+    <internalEndpoint>
+      <portName>do_my_foo</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="Hello.ComponentImplementations.HelloImplementation.Hello.Receiver" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_uses</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="Hello.ComponentImplementations.HelloImplementation.Hello.AMI" />
+    </internalEndpoint>
+  </connection>
+
+  <connection>
+    <name>synch_foo_connection</name>
+    <internalEndpoint>
+      <portName>do_my_foo</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="Hello.ComponentImplementations.HelloImplementation.Hello.Receiver" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>run_my_foo</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="Hello.ComponentImplementations.HelloImplementation.Hello.Sender" />
+    </internalEndpoint>
+  </connection>
+
+  <artifact xmi:id="CompSvrArt">
+    <name>CompoSvrArtifactName</name>
+    <source />
+    <node />
+    <location>dance_locality_manager</location>
+  </artifact>
+
+  <artifact xmi:id="Hello_AMI_SvntArtifact">
+    <name>Hello.ImplementationArtifacts.AMIArtifacts.AMI_svnt</name>
+    <source/>
+    <node/>
+    <location>Hello_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Hello_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="Hello_AMI_ExecArtifact">
+    <name>Hello.ImplementationArtifacts.AMIArtifacts.AMI_exec</name>
+    <source/>
+    <node/>
+    <location>Hello_conn</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Hello_AMI4CCM_MyFoo_Connector_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="Hello_Receiver_SvntArtifact">
+    <name>Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt</name>
+    <source/>
+    <node/>
+    <location>Hello_Receiver_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Hello_AMI_ReceiverHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="Hello_Receiver_ExecArtifact">
+    <name>Hello.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec</name>
+    <source/>
+    <node/>
+    <location>Hello_Receiver_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Hello_AMI_ReceiverHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="Hello_Sender_SvntArtifact">
+    <name>Hello.ImplementationArtifacts.SenderArtifacts.Sender_svnt</name>
+    <source/>
+    <node/>
+    <location>Hello_Sender_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Hello_AMI_SenderHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="Hello_Sender_ExecArtifact">
+    <name>Hello.ImplementationArtifacts.SenderArtifacts.Sender_exec</name>
+    <source/>
+    <node/>
+    <location>Hello_Sender_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Hello_AMI_SenderHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <localityConstraint>
+    <constraint>SameProcess</constraint>
+    <constrainedInstance xmi:idref="CompSvr1Inst" />
+    <constrainedInstance xmi:idref="Hello.ComponentImplementations.HelloImplementation.Hello.Receiver" />
+  </localityConstraint>
+
+  <localityConstraint>
+    <constraint>SameProcess</constraint>
+    <constrainedInstance xmi:idref="CompSvr2Inst" />
+    <constrainedInstance xmi:idref="Hello.ComponentImplementations.HelloImplementation.Hello.Sender" />
+    <constrainedInstance xmi:idref="Hello.ComponentImplementations.HelloImplementation.Hello.AMI" />
+  </localityConstraint>
+
+</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_fullblock_test.pl b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_fullblock_test.pl
new file mode 100755
index 00000000000..21dd65aca2d
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_fullblock_test.pl
@@ -0,0 +1,244 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "$ENV{'ACE_ROOT'}/bin";
+use PerlACE::TestTarget;
+
+$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
+$TAO_ROOT = "$ENV{'TAO_ROOT'}";
+$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
+
+$daemons_running = 0;
+$em_running = 0;
+$ns_running = 0;
+
+$nr_daemon = 2;
+@ports = ( 60000, 60001 );
+@iorbases = ( "Sender.ior", "Receiver.ior");
+@iorfiles = 0;
+@nodenames = ( "Sender", "Receiver" );
+
+# ior files other than daemon
+$ior_nsbase = "ns.ior";
+$ior_nsfile = 0;
+$ior_embase = "EM.ior";
+$ior_emfile = 0;
+
+#  Processes
+$E = 0;
+$EM = 0;
+$NS = 0;
+@DEAMONS = 0;
+
+# targets
+@tg_daemons = 0;
+$tg_naming = 0;
+$tg_exe_man = 0;
+$tg_executor = 0;
+
+$status = 0;
+$cdp_file = "PlanFullBlock.cdp";
+
+sub create_targets {
+    #   naming service
+    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
+    $tg_naming->AddLibPath ('../lib');
+    #   daemon
+    for ($i = 0; $i < $nr_daemon; ++$i) {
+        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
+        $tg_daemons[$i]->AddLibPath ('../lib');
+    }
+    #   execution manager
+    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
+    $tg_exe_man->AddLibPath ('../lib');
+    #   executor (plan_launcher)
+    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
+    $tg_executor->AddLibPath ('../lib');
+}
+
+sub init_ior_files {
+    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
+    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
+    for ($i = 0; $i < $nr_daemon; ++$i) {
+        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
+    }
+    delete_ior_files ();
+}
+
+# Delete if there are any .ior files.
+sub delete_ior_files {
+    for ($i = 0; $i < $nr_daemon; ++$i) {
+        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
+    }
+    $tg_naming->DeleteFile ($ior_nsbase);
+    $tg_exe_man->DeleteFile ($ior_embase);
+    for ($i = 0; $i < $nr_daemon; ++$i) {
+        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
+    }
+}
+
+sub kill_node_daemon {
+    for ($i = 0; $i < $nr_daemon; ++$i) {
+        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
+    }
+}
+
+sub kill_open_processes {
+    if ($daemons_running == 1) {
+        kill_node_daemon ();
+    }
+
+    if ($em_running == 1) {
+        $EM->Kill (); $EM->TimedWait (1);
+    }
+
+    if ($ns_running == 1) {
+        $NS->Kill (); $NS->TimedWait (1);
+    }
+    # in case shutdown did not perform as expected
+    $tg_executor->KillAll ('dance_locality_manager');
+}
+
+sub run_node_daemons {
+    for ($i = 0; $i < $nr_daemon; ++$i) {
+        $iorbase = $iorbases[$i];
+        $iorfile = $iorfiles[$i];
+        $port = $ports[$i];
+        $nodename = $nodenames[$i];
+        $iiop = "iiop://localhost:$port";
+        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
+
+        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
+        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService";
+
+        print "Run dance_node_manager with $d_param\n";
+
+        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
+        $DEAMONS[$i]->Spawn ();
+
+        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
+                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
+            print STDERR
+              "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
+            for (; $i >= 0; --$i) {
+                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
+            }
+            return -1;
+        }
+    }
+    return 0;
+}
+
+create_targets ();
+init_ior_files ();
+
+# Invoke naming service
+
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+
+print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
+
+$ns_status = $NS->Spawn ();
+
+if ($ns_status != 0) {
+    print STDERR "ERROR: Unable to execute the naming service\n";
+    kill_open_processes ();
+    exit 1;
+}
+
+if ($tg_naming->WaitForFileTimed ($ior_nsbase,
+                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
+    print STDERR "ERROR: cannot find naming service IOR file\n";
+    $NS->Kill (); $NS->TimedWait (1);
+    exit 1;
+}
+
+$ns_running = 1;
+# Set up NamingService environment
+$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
+
+# Invoke node daemon.
+print "Invoking node daemon\n";
+$status = run_node_daemons ();
+
+if ($status != 0) {
+    print STDERR "ERROR: Unable to execute the node daemon\n";
+    kill_open_processes ();
+    exit 1;
+}
+
+$daemons_running = 1;
+
+# Invoke execution manager.
+print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
+$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
+                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
+$em_status = $EM->Spawn ();
+
+if ($em_status != 0) {
+    print STDERR "ERROR: dance_execution_manager returned $em_status";
+    exit 1;
+}
+
+if ($tg_exe_man->WaitForFileTimed ($ior_embase,
+                                $tg_exe_man->ProcessStartWaitInterval ()) == -1) {
+    print STDERR
+      "ERROR: The ior file of execution manager could not be found\n";
+    kill_open_processes ();
+    exit 1;
+}
+
+$em_running = 1;
+
+# Invoke executor - start the application -.
+print "Invoking executor - launch the application -\n";
+
+print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n";
+$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
+                                  "-x $cdp_file -k file://$ior_emfile");
+
+$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
+
+if ($pl_status != 0) {
+    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
+    kill_open_processes ();
+    exit 1;
+}
+
+for ($i = 0; $i < $nr_daemon; ++$i) {
+    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
+                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
+        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
+        kill_open_processes ();
+        exit 1;
+    }
+}
+
+print "Sleeping 90 seconds to allow task to complete\n";
+sleep (90);
+
+# Invoke executor - stop the application -.
+print "Invoking executor - stop the application -\n";
+print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n";
+
+$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
+                                  "-k file://$ior_emfile -x $cdp_file -s");
+$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
+
+if ($pl_status != 0) {
+    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
+    kill_open_processes ();
+    exit 1;
+}
+
+print "Executor returned.\n";
+print "Shutting down rest of the processes.\n";
+
+delete_ior_files ();
+kill_open_processes ();
+
+exit $status;
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl
index f50a6c5ddcb..e1ac985ad30 100755
--- a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl
+++ b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl
@@ -149,53 +149,53 @@ foreach $file (@files) {
     print "=============================\nStarting test for deployment $file\n================================\n";
 
 	# Invoke naming service
-	
+
 	$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-	
+
 	print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-	
+
 	$ns_status = $NS->Spawn ();
-	
+
 	if ($ns_status != 0) {
 	    print STDERR "ERROR: Unable to execute the naming service\n";
 	    kill_open_processes ();
 	    exit 1;
 	}
-	
+
 	if ($tg_naming->WaitForFileTimed ($ior_nsbase,
 	                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
 	    print STDERR "ERROR: cannot find naming service IOR file\n";
 	    $NS->Kill (); $NS->TimedWait (1);
 	    exit 1;
 	}
-	
+
 	$ns_running = 1;
 	# Set up NamingService environment
 	$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-	
+
 	# Invoke node daemon.
 	print "Invoking node daemon\n";
 	$status = run_node_daemons ();
-	
+
 	if ($status != 0) {
 	    print STDERR "ERROR: Unable to execute the node daemon\n";
 	    kill_open_processes ();
 	    exit 1;
 	}
-	
+
 	$daemons_running = 1;
-	
+
 	# Invoke execution manager.
 	print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
 	$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
 	                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
 	$em_status = $EM->Spawn ();
-	
+
 	if ($em_status != 0) {
 	    print STDERR "ERROR: dance_execution_manager returned $em_status";
 	    exit 1;
 	}
-	
+
 	if ($tg_exe_man->WaitForFileTimed ($ior_embase,
 	                                $tg_exe_man->ProcessStartWaitInterval ()) == -1) {
 	    print STDERR
@@ -203,24 +203,24 @@ foreach $file (@files) {
 	    kill_open_processes ();
 	    exit 1;
 	}
-	
+
 	$em_running = 1;
-	
+
 	# Invoke executor - start the application -.
 	print "Invoking executor - launch the application -\n";
-	
+
 	print "Start dance_plan_launcher.exe with -x $file -k file://$ior_emfile\n";
 	$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
 	                                  "-x $file -k file://$ior_emfile");
-	
+
 	$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
-	
+
 	if ($pl_status != 0) {
 	    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
 	    kill_open_processes ();
 	    exit 1;
 	}
-	
+
 	for ($i = 0; $i < $nr_daemon; ++$i) {
 	    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
 	                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
@@ -229,18 +229,18 @@ foreach $file (@files) {
 	        exit 1;
 	    }
 	}
-	
+
 	print "Sleeping 90 seconds to allow task to complete\n";
 	sleep (90);
-	
+
 	# Invoke executor - stop the application -.
 	print "Invoking executor - stop the application -\n";
 	print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $file\n";
-	
+
 	$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
 	                                  "-k file://$ior_emfile -x $file -s");
 	$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-	
+
 	if ($pl_status != 0) {
 	    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
 	    kill_open_processes ();
diff --git a/CIAO/connectors/ami4ccm/examples/Quoter/Base/Quoter.mpc b/CIAO/connectors/ami4ccm/examples/Quoter/Base/Quoter.mpc
index 0d3bd227aed..5ac46916b9e 100644
--- a/CIAO/connectors/ami4ccm/examples/Quoter/Base/Quoter.mpc
+++ b/CIAO/connectors/ami4ccm/examples/Quoter/Base/Quoter.mpc
@@ -140,7 +140,6 @@ project(AMI_Quoter_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    QuoterS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client.mpc b/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client.mpc
index f3dd3c341dc..6a5e121f03e 100644
--- a/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client.mpc
+++ b/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client.mpc
@@ -128,7 +128,6 @@ project(AMI_Quoter_Client_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    Quoter_ClientS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer.mpc b/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer.mpc
index 4787ee59949..caf00e31b7b 100644
--- a/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer.mpc
+++ b/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer.mpc
@@ -128,7 +128,6 @@ project(AMI_Quoter_Producer_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    Quoter_ProducerS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.mpc b/CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.mpc
index 7e07fe12876..c1a1b0e8f86 100644
--- a/CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.mpc
+++ b/CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.mpc
@@ -141,7 +141,6 @@ project(AMI_AsynchT_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    AsynchTS.inl
    
   }
 }
diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.mpc
index 9006c758f77..b1dddc918d2 100644
--- a/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_AsynchT_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    AsynchT_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.mpc
index b6ec6289a9b..c9f26a083a4 100644
--- a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_AsynchT_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    AsynchT_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc b/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc
index b92e5ab119b..7764e9f8c69 100644
--- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc
+++ b/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc
@@ -136,13 +136,11 @@ project(AMI_DelReplyH_skel) : ciao_executor, ami, ami4ccm_servant {
 
   Header_Files {
     DelReplyHS.h
-   
+
     DelReplyH_skel_export.h
   }
 
   Inline_Files {
-    DelReplyHS.inl
-   
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.mpc
index 46dfc87f5d5..0c636a532b6 100644
--- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_DelReplyH_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    DelReplyH_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.mpc b/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.mpc
index aa96f223f45..45d851c4442 100644
--- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_DelReplyH_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    DelReplyH_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc b/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc
index 57178e7d01a..9f2c62e4193 100644
--- a/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc
+++ b/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc
@@ -141,7 +141,6 @@ project(AMI_ExceptionT_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    ExceptionTS.inl
    
   }
 }
diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.mpc
index 174796e8a25..6fdfea1de13 100644
--- a/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_ExceptionT_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    ExceptionT_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.mpc
index d251c688aef..6a4ada1853a 100644
--- a/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_ExceptionT_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    ExceptionT_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.mpc b/CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.mpc
index 49bd8885e5d..7975bc23aae 100644
--- a/CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.mpc
+++ b/CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.mpc
@@ -141,8 +141,6 @@ project(AMI_GetComp_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    GetCompS.inl
-   
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.mpc
index 5c84461084c..3b8c656eafa 100644
--- a/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_GetComp_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    GetComp_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.mpc b/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.mpc
index 61d8643baad..4f51e3e5bba 100644
--- a/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_GetComp_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    GetComp_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc b/CIAO/connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc
index 9e4bf15aa83..8b0b57d9933 100644
--- a/CIAO/connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc
+++ b/CIAO/connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc
@@ -113,8 +113,6 @@ project(AMI4CCM_IDL_Test_skel) : ciao_executor, ami, ami4ccm_servant   {
   }
 
   Inline_Files {
-    HelloS.inl
-    HelloAS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc b/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc
index b0da2a3e0c3..32bfe262ccd 100644
--- a/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc
+++ b/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc
@@ -132,7 +132,6 @@ project(AMI4CCM_ITB_Hello_Comp_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    Hello_ComponentS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc b/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc
index 102ff194be6..329ebf879af 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc
@@ -141,8 +141,6 @@ project(AMI_InterInArgsT_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    InterInArgsTS.inl
-   
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.mpc
index 378f834457f..d117c93e2de 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_InterInArgsT_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    InterInArgsT_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.mpc
index 098b4318ac6..45aaf485bf6 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_InterInArgsT_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    InterInArgsT_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.mpc b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.mpc
index 3213bd0e819..97ed2e32475 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.mpc
@@ -141,8 +141,6 @@ project(AMI_InterInOutT_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    InterInOutTS.inl
-   
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.mpc
index 21aa8c64ece..171b4758762 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_InterInOutT_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    InterInOutT_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.mpc
index ad6ca66be06..f74b8d3d27e 100644
--- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_InterInOutT_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    InterInOutT_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.mpc b/CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.mpc
index 4ab203034e9..cb4307a562e 100644
--- a/CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.mpc
@@ -141,8 +141,6 @@ project(AMI_InterMulti_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    InterMultiS.inl
-   
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.mpc
index 50534fda54f..7d28075ee97 100644
--- a/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_InterMulti_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    InterMulti_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.mpc b/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.mpc
index 93a6a9a3923..736fd1fdc88 100644
--- a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_InterMulti_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    InterMulti_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl
index e066f1ba945..4708970fa5a 100755
--- a/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl
+++ b/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl
@@ -148,53 +148,53 @@ foreach $file (@files) {
     print "=============================\nStarting test for deployment $file\n================================\n";
 
 	# Invoke naming service
-	
+
 	$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-	
+
 	print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-	
+
 	$ns_status = $NS->Spawn ();
-	
+
 	if ($ns_status != 0) {
 	    print STDERR "ERROR: Unable to execute the naming service\n";
 	    kill_open_processes ();
 	    exit 1;
 	}
-	
+
 	if ($tg_naming->WaitForFileTimed ($ior_nsbase,
 	                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
 	    print STDERR "ERROR: cannot find naming service IOR file\n";
 	    $NS->Kill (); $NS->TimedWait (1);
 	    exit 1;
 	}
-	
+
 	$ns_running = 1;
 	# Set up NamingService environment
 	$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-	
+
 	# Invoke node daemon.
 	print "Invoking node daemon\n";
 	$status = run_node_daemons ();
-	
+
 	if ($status != 0) {
 	    print STDERR "ERROR: Unable to execute the node daemon\n";
 	    kill_open_processes ();
 	    exit 1;
 	}
-	
+
 	$daemons_running = 1;
-	
+
 	# Invoke execution manager.
 	print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
 	$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
 	                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
 	$em_status = $EM->Spawn ();
-	
+
 	if ($em_status != 0) {
 	    print STDERR "ERROR: dance_execution_manager returned $em_status";
 	    exit 1;
 	}
-	
+
 	if ($tg_exe_man->WaitForFileTimed ($ior_embase,
 	                                $tg_exe_man->ProcessStartWaitInterval ()) == -1) {
 	    print STDERR
@@ -202,24 +202,24 @@ foreach $file (@files) {
 	    kill_open_processes ();
 	    exit 1;
 	}
-	
+
 	$em_running = 1;
-	
+
 	# Invoke executor - start the application -.
 	print "Invoking executor - launch the application -\n";
-	
+
 	print "Start dance_plan_launcher.exe with -x $file -k file://$ior_emfile\n";
 	$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
 	                                  "-x $file -k file://$ior_emfile");
-	
+
 	$pl_status = $E->SpawnWaitKill (3 * $tg_executor->ProcessStartWaitInterval ());
-	
+
 	if ($pl_status != 0) {
 	    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
 	    kill_open_processes ();
 	    exit 1;
 	}
-	
+
 	for ($i = 0; $i < $nr_daemon; ++$i) {
 	    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
 	                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
@@ -228,18 +228,18 @@ foreach $file (@files) {
 	        exit 1;
 	    }
 	}
-	
+
 	print "Sleeping 30 seconds to allow task to complete\n";
 	sleep (30);
-	
+
 	# Invoke executor - stop the application -.
 	print "Invoking executor - stop the application -\n";
 	print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $file\n";
-	
+
 	$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
 	                                  "-k file://$ior_emfile -x $file -s");
 	$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-	
+
 	if ($pl_status != 0) {
 	    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
 	    kill_open_processes ();
diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc
index e10d4008190..1a66943435c 100644
--- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc
@@ -141,8 +141,6 @@ project(AMI_InterOutArgsT_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    InterOutArgsTS.inl
-   
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.mpc
index 97360d4d252..638b223132e 100644
--- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_InterOutArgsT_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    InterOutArgsT_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.mpc
index d68ebe45df4..f7b4be3bec2 100644
--- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_InterOutArgsT_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    InterOutArgsT_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc b/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc
index 85c7e37393f..79a276079f6 100644
--- a/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc
@@ -141,8 +141,6 @@ project(AMI_InterReturnT_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    InterReturnTS.inl
-   
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.mpc
index 810c41eb310..dcb934556f1 100644
--- a/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_InterReturnT_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    InterReturnT_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.mpc
index 0b443de6fbc..c30da578161 100644
--- a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_InterReturnT_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    InterReturnT_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.mpc b/CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.mpc
index 5decdb9facd..51f9a435a3c 100644
--- a/CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.mpc
+++ b/CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.mpc
@@ -141,8 +141,6 @@ project(AMI_HelloT_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    HelloTS.inl
-
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.mpc
index ee3155b11ad..d146c23f2d4 100644
--- a/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_HelloT_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    HelloT_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.mpc
index 052a7eb741b..fff938bde86 100644
--- a/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_HelloT_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    HelloT_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc b/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc
index 11ada51a987..e9702add771 100644
--- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc
+++ b/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc
@@ -141,8 +141,6 @@ project(AMI_NoReplyH_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    NoReplyHS.inl
-   
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.mpc
index ce200f3326e..3c62cf93713 100644
--- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_NoReplyH_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    NoReplyH_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.mpc b/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.mpc
index 0c9bf268274..f2decc6fb0c 100644
--- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_NoReplyH_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    NoReplyH_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc b/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc
index 25d2dd74a7a..7876403aa36 100644
--- a/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc
+++ b/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc
@@ -141,8 +141,6 @@ project(AMI_OneProcess_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    OneProcessS.inl
-   
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.mpc
index 10768dd5db0..e818a82b143 100644
--- a/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.mpc
@@ -127,7 +127,6 @@ project(AMI_OneProcess_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    OneProcess_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.mpc b/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.mpc
index 0b11cbf053d..ccf61f94ed7 100644
--- a/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_OneProcess_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    OneProcess_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.mpc b/CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.mpc
index 5ce19bdd2db..e6a9ae889f0 100644
--- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.mpc
+++ b/CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.mpc
@@ -141,8 +141,6 @@ project(AMI_OneReplyH_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    OneReplyHS.inl
-   
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.mpc
index c6aa5f39e87..ac52652ba3e 100644
--- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_OneReplyH_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    OneReplyH_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.mpc b/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.mpc
index ca3196cabc3..7afdccd8acc 100644
--- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_OneReplyH_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    OneReplyH_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.mpc
index 5b3714e0295..66504085342 100644
--- a/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p PragmaT_Base PragmaT_Receiver"
 
-project(AMI_PragmaT_Base_PragmaT_Receiver_idl_gen) : componentidldefaults {
+project(AMI_PTB_PragmaT_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
   after += AMI_PragmaT_idl_gen
   idlflags += -Wb,stub_export_macro=PRAGMAT_RECEIVER_STUB_Export \
@@ -17,8 +17,8 @@ project(AMI_PragmaT_Base_PragmaT_Receiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(AMI_PragmaT_Base_PragmaT_Receiver_lem_gen) : ciaoidldefaults {
-  after += AMI_PragmaT_Base_PragmaT_Receiver_idl_gen
+project(AMI_PTB_PragmaT_Receiver_lem_gen) : ciaoidldefaults {
+  after += AMI_PTB_PragmaT_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=PRAGMAT_RECEIVER_LEM_STUB_Export \
               -Wb,stub_export_include=PragmaT_Receiver_lem_stub_export.h \
@@ -29,8 +29,8 @@ project(AMI_PragmaT_Base_PragmaT_Receiver_lem_gen) : ciaoidldefaults {
   }
 }
 
-project(AMI_PragmaT_Base_PragmaT_Receiver_l_stub) : ccm_svnt, messaging {
-  after += AMI_PragmaT_Base_PragmaT_Receiver_lem_gen AMI_PragmaT_Base_PragmaT_Receiver_stub AMI_PragmaT_stub
+project(AMI_PTB_PragmaT_Receiver_l_stub) : ccm_svnt, messaging {
+  after += AMI_PTB_PragmaT_Receiver_lem_gen AMI_PTB_PragmaT_Receiver_stub AMI_PragmaT_stub
   libs  += PragmaT_stub PragmaT_Receiver_stub
   libpaths += ../lib
   libout = ../lib
@@ -54,8 +54,8 @@ project(AMI_PragmaT_Base_PragmaT_Receiver_l_stub) : ccm_svnt, messaging {
   }
 }
 
-project(AMI_PragmaT_Base_PragmaT_Receiver_stub) : ccm_stub, messaging {
-  after += AMI_PragmaT_Base_PragmaT_Receiver_idl_gen AMI_PragmaT_stub
+project(AMI_PTB_PragmaT_Receiver_stub) : ccm_stub, messaging {
+  after += AMI_PTB_PragmaT_Receiver_idl_gen AMI_PragmaT_stub
   libs  += PragmaT_stub
   libpaths += ../lib
   libout = ../lib
@@ -79,8 +79,8 @@ project(AMI_PragmaT_Base_PragmaT_Receiver_stub) : ccm_stub, messaging {
   }
 }
 
-project(AMI_PragmaT_Base_PragmaT_Receiver_exec) : ciao_executor, messaging {
-  after   += AMI_PragmaT_Base_PragmaT_Receiver_l_stub AMI_PragmaT_Base_PragmaT_Receiver_stub AMI_PragmaT_stub AMI_PragmaT_lem_stub
+project(AMI_PTB_PragmaT_Receiver_exec) : ciao_executor, messaging {
+  after   += AMI_PTB_PragmaT_Receiver_l_stub AMI_PTB_PragmaT_Receiver_stub AMI_PragmaT_stub AMI_PragmaT_lem_stub
   sharedname = PragmaT_Receiver_exec
   libs += PragmaT_Receiver_stub PragmaT_Receiver_lem_stub PragmaT_stub PragmaT_lem_stub
   libpaths += ../lib
@@ -103,8 +103,8 @@ project(AMI_PragmaT_Base_PragmaT_Receiver_exec) : ciao_executor, messaging {
   }
 }
 
-project(AMI_PragmaT_Base_PragmaT_Receiver_svnt) : ciao_servant, messaging {
-  after      += AMI_PragmaT_Base_skel AMI_PragmaT_Base_PragmaT_Receiver_l_stub AMI_PragmaT_stub AMI_PragmaT_skel AMI_PragmaT_lem_stub
+project(AMI_PTB_PragmaT_Receiver_svnt) : ciao_servant, messaging {
+  after      += AMI_PragmaT_Base_skel AMI_PTB_PragmaT_Receiver_l_stub AMI_PragmaT_stub AMI_PragmaT_skel AMI_PragmaT_lem_stub
   sharedname  = PragmaT_Receiver_svnt
   libs       += PragmaT_Receiver_stub PragmaT_Receiver_lem_stub  \
                 PragmaT_skel \
diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.mpc
index e36424442e3..049130ed6aa 100644
--- a/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p PragmaT_Base PragmaT_Sender"
 
-project(AMI_PragmaT_Base_PragmaT_Sender_idl_gen) : componentidldefaults {
+project(AMI_PTB_PragmaT_Sender_idl_gen) : componentidldefaults {
   after += AMI_PragmaT_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=PRAGMAT_SENDER_STUB_Export \
@@ -17,8 +17,8 @@ project(AMI_PragmaT_Base_PragmaT_Sender_idl_gen) : componentidldefaults {
   }
 }
 
-project(AMI_PragmaT_Base_PragmaT_Sender_lem_gen) : ciaoidldefaults {
-  after += AMI_PragmaT_Base_PragmaT_Sender_idl_gen
+project(AMI_PTB_PragmaT_Sender_lem_gen) : ciaoidldefaults {
+  after += AMI_PTB_PragmaT_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=PRAGMAT_SENDER_LEM_STUB_Export \
               -Wb,stub_export_include=PragmaT_Sender_lem_stub_export.h \
@@ -29,8 +29,8 @@ project(AMI_PragmaT_Base_PragmaT_Sender_lem_gen) : ciaoidldefaults {
   }
 }
 
-project(AMI_PragmaT_Base_PragmaT_Sender_lem_stub) : ccm_svnt, ami   {
-  after += AMI_PragmaT_Base_PragmaT_Sender_lem_gen AMI_PragmaT_stub Conn_PragmaT_Base_stub
+project(AMI_PTB_PragmaT_Sender_lem_stub) : ccm_svnt, ami   {
+  after += AMI_PTB_PragmaT_Sender_lem_gen AMI_PragmaT_stub Conn_PragmaT_Base_stub
   libs  += PragmaT_stub
   libpaths += ../lib
   libout = ../lib
@@ -54,8 +54,8 @@ project(AMI_PragmaT_Base_PragmaT_Sender_lem_stub) : ccm_svnt, ami   {
   }
 }
 
-project(AMI_PragmaT_Base_PragmaT_Sender_stub) : ccm_stub, ami   {
-  after += AMI_PragmaT_Base_PragmaT_Sender_idl_gen AMI_PragmaT_Base_stub AMI_PragmaT_stub Conn_PragmaT_Base_stub
+project(AMI_PTB_PragmaT_Sender_stub) : ccm_stub, ami   {
+  after += AMI_PTB_PragmaT_Sender_idl_gen AMI_PragmaT_Base_stub AMI_PragmaT_stub Conn_PragmaT_Base_stub
   libs  += PragmaT_stub
   libpaths += ../lib
   libout = ../lib
@@ -79,8 +79,8 @@ project(AMI_PragmaT_Base_PragmaT_Sender_stub) : ccm_stub, ami   {
   }
 }
 
-project(AMI_PragmaT_Base_PragmaT_Sender_exec) : ciao_executor, ami, ami4ccm_stub {
-  after   += AMI_PragmaT_Base_PragmaT_Sender_lem_stub AMI_PragmaT_Base_PragmaT_Sender_stub AMI_PragmaT_Base_exec Conn_PragmaT_Base_stub AMI_PragmaT_lem_stub
+project(AMI_PTB_PragmaT_Sender_exec) : ciao_executor, ami, ami4ccm_stub {
+  after   += AMI_PTB_PragmaT_Sender_lem_stub AMI_PTB_PragmaT_Sender_stub AMI_PragmaT_Base_exec Conn_PragmaT_Base_stub AMI_PragmaT_lem_stub
   sharedname = PragmaT_Sender_exec
   libs += PragmaT_Sender_stub PragmaT_Sender_lem_stub PragmaT_stub PragmaT_stub PragmaT_lem_stub
   libpaths += ../lib
@@ -103,8 +103,8 @@ project(AMI_PragmaT_Base_PragmaT_Sender_exec) : ciao_executor, ami, ami4ccm_stub
   }
 }
 
-project(AMI_PragmaT_Base_PragmaT_Sender_svnt) : ciao_servant, ami {
-  after      += AMI_PragmaT_Base_skel AMI_PragmaT_Base_PragmaT_Sender_lem_stub AMI_PragmaT_Base_PragmaT_Sender_stub AMI_PragmaT_Base_exec AMI_PragmaT_skel
+project(AMI_PTB_PragmaT_Sender_svnt) : ciao_servant, ami {
+  after      += AMI_PragmaT_Base_skel AMI_PTB_PragmaT_Sender_lem_stub AMI_PTB_PragmaT_Sender_stub AMI_PragmaT_Base_exec AMI_PragmaT_skel
   sharedname  = PragmaT_Sender_svnt
   libs       += PragmaT_Sender_stub PragmaT_Sender_lem_stub  \
                 PragmaT_skel \
diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.mpc b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.mpc
index 728acf9edde..a9499955ee8 100644
--- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.mpc
+++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.mpc
@@ -142,8 +142,6 @@ project(AMI_UsesSM_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    UsesSMS.inl
-   
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.mpc
index d2ce5467c35..e98ec843155 100644
--- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_UsesSM_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    UsesSM_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc
index f7bf8c2e456..5f102d474a3 100644
--- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_UsesSM_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    UsesSM_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.mpc
index df8f50c7b91..e15e1463658 100644
--- a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p Hello_Base Hello_Receiver"
 
-project(SyncPortCon_Base_Hello_Receiver_idl_gen) : componentidldefaults {
+project(SPC_Base_Hello_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
   after += SyncPortCon_idl_gen
   idlflags += -Wb,stub_export_macro=HELLO_RECEIVER_STUB_Export \
@@ -17,8 +17,8 @@ project(SyncPortCon_Base_Hello_Receiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(SyncPortCon_Base_Hello_Receiver_lem_gen) : ciaoidldefaults {
-  after += SyncPortCon_Base_Hello_Receiver_idl_gen
+project(SPC_Base_Hello_Receiver_lem_gen) : ciaoidldefaults {
+  after += SPC_Base_Hello_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=HELLO_RECEIVER_LEM_STUB_Export \
               -Wb,stub_export_include=Hello_Receiver_lem_stub_export.h \
@@ -29,8 +29,8 @@ project(SyncPortCon_Base_Hello_Receiver_lem_gen) : ciaoidldefaults {
   }
 }
 
-project(SyncPortCon_Base_Hello_Receiver_l_stub) : ccm_svnt, messaging {
-  after += SyncPortCon_Base_Hello_Receiver_lem_gen SyncPortCon_Base_Hello_Receiver_stub SyncPortCon_stub
+project(SPC_Base_Hello_Receiver_l_stub) : ccm_svnt, messaging {
+  after += SPC_Base_Hello_Receiver_lem_gen SyncPortCon_Base_Hello_Receiver_stub SyncPortCon_stub
   libs  += Hello_stub Hello_Receiver_stub
   libpaths += ../lib
   libout = ../lib
@@ -55,7 +55,7 @@ project(SyncPortCon_Base_Hello_Receiver_l_stub) : ccm_svnt, messaging {
 }
 
 project(SyncPortCon_Base_Hello_Receiver_stub) : ccm_stub, messaging {
-  after += SyncPortCon_Base_Hello_Receiver_idl_gen SyncPortCon_stub
+  after += SPC_Base_Hello_Receiver_idl_gen SyncPortCon_stub
   libs  += Hello_stub
   libpaths += ../lib
   libout = ../lib
@@ -80,7 +80,7 @@ project(SyncPortCon_Base_Hello_Receiver_stub) : ccm_stub, messaging {
 }
 
 project(SyncPortCon_Base_Hello_Receiver_exec) : ciao_executor, messaging {
-  after   += SyncPortCon_Base_Hello_Receiver_l_stub SyncPortCon_Base_Hello_Receiver_stub SyncPortCon_stub SyncPortCon_lem_stub
+  after   += SPC_Base_Hello_Receiver_l_stub SyncPortCon_Base_Hello_Receiver_stub SyncPortCon_stub SyncPortCon_lem_stub
   sharedname = Hello_Receiver_exec
   libs += Hello_Receiver_stub Hello_Receiver_lem_stub Hello_stub Hello_lem_stub
   libpaths += ../lib
@@ -104,7 +104,7 @@ project(SyncPortCon_Base_Hello_Receiver_exec) : ciao_executor, messaging {
 }
 
 project(SyncPortCon_Base_Hello_Receiver_svnt) : ciao_servant, messaging {
-  after      += SyncPortCon_Base_skel SyncPortCon_Base_Hello_Receiver_l_stub SyncPortCon_stub SyncPortCon_skel SyncPortCon_lem_stub
+  after      += SyncPortCon_Base_skel SPC_Base_Hello_Receiver_l_stub SyncPortCon_stub SyncPortCon_skel SyncPortCon_lem_stub
   sharedname  = Hello_Receiver_svnt
   libs       += Hello_Receiver_stub Hello_Receiver_lem_stub  \
                 Hello_skel \
diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.mpc b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.mpc
index 452b0947e25..46913c132bb 100644
--- a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.mpc
@@ -29,7 +29,7 @@ project(SyncPortCon_Base_Hello_Sender_lem_gen) : ciaoidldefaults {
   }
 }
 
-project(SyncPortCon_Base_Hello_Sender_lem_stub) : ccm_svnt, ami   {
+project(SPC_Base_Hello_Sender_lem_stub) : ccm_svnt, ami   {
   after += SyncPortCon_Base_Hello_Sender_lem_gen SyncPortCon_stub Conn_Hello_Base_stub
   libs  += Hello_stub
   libpaths += ../lib
@@ -80,7 +80,7 @@ project(SyncPortCon_Base_Hello_Sender_stub) : ccm_stub, ami   {
 }
 
 project(SyncPortCon_Base_Hello_Sender_exec) : ciao_executor, ami, ami4ccm_stub {
-  after   += SyncPortCon_Base_Hello_Sender_lem_stub SyncPortCon_Base_Hello_Sender_stub SyncPortCon_Base_exec Conn_Hello_Base_stub SyncPortCon_lem_stub
+  after   += SPC_Base_Hello_Sender_lem_stub SyncPortCon_Base_Hello_Sender_stub SyncPortCon_Base_exec Conn_Hello_Base_stub SyncPortCon_lem_stub
   sharedname = Hello_Sender_exec
   libs += Hello_Sender_stub Hello_Sender_lem_stub Hello_stub Hello_stub Hello_lem_stub
   libpaths += ../lib
@@ -104,7 +104,7 @@ project(SyncPortCon_Base_Hello_Sender_exec) : ciao_executor, ami, ami4ccm_stub {
 }
 
 project(SyncPortCon_Base_Hello_Sender_svnt) : ciao_servant, ami {
-  after      += SyncPortCon_Base_skel SyncPortCon_Base_Hello_Sender_lem_stub SyncPortCon_Base_Hello_Sender_stub SyncPortCon_Base_exec SyncPortCon_skel
+  after      += SyncPortCon_Base_skel SPC_Base_Hello_Sender_lem_stub SyncPortCon_Base_Hello_Sender_stub SyncPortCon_Base_exec SyncPortCon_skel
   sharedname  = Hello_Sender_svnt
   libs       += Hello_Sender_stub Hello_Sender_lem_stub  \
                 Hello_skel \
diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/Plan.cdp
index 2eb75a7e3fc..2bfc735c7b2 100644
--- a/CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/Plan.cdp
+++ b/CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/Plan.cdp
@@ -262,7 +262,7 @@
       <instance xmi:idref="Hello.ComponentImplementations.HelloImplementation.Hello.Sender" />
     </internalEndpoint>
   </connection-->
-  
+
  <connection>
     <name>run_synch_foo_connection</name>
     <deployRequirement>
diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/run_test.pl
index 5a088c780f7..4033fac9d86 100755
--- a/CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/run_test.pl
+++ b/CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/run_test.pl
@@ -14,8 +14,8 @@ $DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
 
 #$ENV{'DANCE_LOG_LEVEL'}=9;
 #$ENV{'CIAO_LOG_LEVEL'}=10;
-$ENV{'DANCE_TRACE_ENABLE'}=1;
-$ENV{'CIAO_TRACE_ENABLE'}=1;
+#$ENV{'DANCE_TRACE_ENABLE'}=1;
+#$ENV{'CIAO_TRACE_ENABLE'}=1;
 
 $daemons_running = 0;
 $em_running = 0;
diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc b/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc
index fb3045878ba..a6d39cd9b18 100644
--- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc
+++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc
@@ -166,8 +166,6 @@ project(AMI_ThreeComp_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    ThreeCompS.inl
-    ThreeComp_no_amiS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.mpc b/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.mpc
index 3162d83792e..6b293e4ac14 100644
--- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.mpc
+++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.mpc
@@ -127,7 +127,6 @@ project(AMI_ThreeComp_Base_Master_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    ThreeComp_MasterS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.mpc
index 62f6dd0804d..26fd307b0fd 100644
--- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_ThreeComp_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    ThreeComp_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.mpc b/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.mpc
index 6323dbd93b2..98b5ce181fd 100644
--- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_ThreeComp_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    ThreeComp_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.mpc b/CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.mpc
index ecabfedc7bc..9355dd8d1b8 100644
--- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.mpc
+++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.mpc
@@ -142,8 +142,6 @@ project(AMI_UsesMulti_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    UsesMultiS.inl
-   
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.mpc
index 3b53f58a3e2..ffaad2e534c 100644
--- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.mpc
+++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.mpc
@@ -128,7 +128,6 @@ project(AMI_UsesMulti_Base_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-    UsesMulti_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc
index 3ea71a81db8..1c24b38c1ea 100644
--- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc
@@ -128,7 +128,6 @@ project(AMI_UsesMulti_Base_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    UsesMulti_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl
index 9c8cbe02a48..30ea89f152e 100755
--- a/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl
+++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl
@@ -147,53 +147,53 @@ foreach $file (@files) {
     print "=============================\nStarting test for deployment $file\n================================\n";
 
 	# Invoke naming service
-	
+
 	$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-	
+
 	print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-	
+
 	$ns_status = $NS->Spawn ();
-	
+
 	if ($ns_status != 0) {
 	    print STDERR "ERROR: Unable to execute the naming service\n";
 	    kill_open_processes ();
 	    exit 1;
 	}
-	
+
 	if ($tg_naming->WaitForFileTimed ($ior_nsbase,
 	                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
 	    print STDERR "ERROR: cannot find naming service IOR file\n";
 	    $NS->Kill (); $NS->TimedWait (1);
 	    exit 1;
 	}
-	
+
 	$ns_running = 1;
 	# Set up NamingService environment
 	$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
-	
+
 	# Invoke node daemon.
 	print "Invoking node daemon\n";
 	$status = run_node_daemons ();
-	
+
 	if ($status != 0) {
 	    print STDERR "ERROR: Unable to execute the node daemon\n";
 	    kill_open_processes ();
 	    exit 1;
 	}
-	
+
 	$daemons_running = 1;
-	
+
 	# Invoke execution manager.
 	print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
 	$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
 	                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
 	$em_status = $EM->Spawn ();
-	
+
 	if ($em_status != 0) {
 	    print STDERR "ERROR: dance_execution_manager returned $em_status";
 	    exit 1;
 	}
-	
+
 	if ($tg_exe_man->WaitForFileTimed ($ior_embase,
 	                                $tg_exe_man->ProcessStartWaitInterval ()) == -1) {
 	    print STDERR
@@ -201,24 +201,24 @@ foreach $file (@files) {
 	    kill_open_processes ();
 	    exit 1;
 	}
-	
+
 	$em_running = 1;
-	
+
 	# Invoke executor - start the application -.
 	print "Invoking executor - launch the application -\n";
-	
+
 	print "Start dance_plan_launcher.exe with -x $file -k file://$ior_emfile\n";
 	$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
 	                                  "-x $file -k file://$ior_emfile");
-	
+
 	$pl_status = $E->SpawnWaitKill (3 * $tg_executor->ProcessStartWaitInterval ());
-	
+
 	if ($pl_status != 0) {
 	    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
 	    kill_open_processes ();
 	    exit 1;
 	}
-	
+
 	for ($i = 0; $i < $nr_daemon; ++$i) {
 	    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
 	                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
@@ -227,18 +227,18 @@ foreach $file (@files) {
 	        exit 1;
 	    }
 	}
-	
+
 	print "Sleeping 30 seconds to allow task to complete\n";
 	sleep (30);
-	
+
 	# Invoke executor - stop the application -.
 	print "Invoking executor - stop the application -\n";
 	print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $file\n";
-	
+
 	$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
 	                                  "-k file://$ior_emfile -x $file -s");
 	$pl_status = $E->SpawnWaitKill (3 * $tg_executor->ProcessStartWaitInterval ());
-	
+
 	if ($pl_status != 0) {
 	    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
 	    kill_open_processes ();
diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.mpc b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.mpc
index e436362e44e..521ca628af1 100644
--- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.mpc
+++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.mpc
@@ -24,7 +24,7 @@ project(AMI_Hello_Tuto_Hello_Receiver_idl_gen) : componentidldefaults {
 project(AMI_Hello_Hello_Receiver_exec_idl_gen) : componentidldefaults {
   requires += dummy_label
   custom_only = 1
-  idlflags += -Gex -SS -Sci -Ssi \
+  idlflags += -Gex -SS -Sci \
               -I../ports \
               -I../../ports \
               -o ../../../Tutorial/Code/GeneratedExec
@@ -114,7 +114,7 @@ project(AMI_Hello_Tuto_Hello_Receiver_exec) : ciao_executor, messaging {
   libpaths += ../../lib
   libout = ../../lib
   dynamicflags += HELLO_RECEIVER_COMP_EXEC_BUILD_DLL
-  includes += ../../GeneratedCode 
+  includes += ../../GeneratedCode
 
   IDL_Files {
   }
@@ -160,6 +160,5 @@ project(AMI_Hello_Tuto_Hello_Receiver_svnt) : ciao_servant, messaging {
   }
 
   Inline_Files {
-     ../../GeneratedCode/Hello_Receiver_compS.inl
   }
 }
diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.mpc b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.mpc
index 13daf6c5943..048d214c30e 100644
--- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.mpc
+++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.mpc
@@ -23,7 +23,7 @@ project(AMI_Hello_Tuto_Hello_Sender_idl_gen) : componentidldefaults {
 project(AMI_Hello_Hello_Sender_exec_idl_gen) : componentidldefaults {
   requires += dummy_label
   custom_only = 1
-  idlflags += -Gex -SS -Sci -Ssi \
+  idlflags += -Gex -SS -Sci \
               -I../ports \
               -I../../ports \
               -o ../../../Tutorial/Code/GeneratedExec
@@ -38,7 +38,7 @@ project(AMI_Hello_Tuto_Hello_Sender_lem_gen) : ciaoidldefaults {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=HELLO_SENDER_COMP_LEM_STUB_Export \
               -Wb,stub_export_include=Hello_Sender_comp_lem_stub_export.h \
-              -SS -Gxhst\ 
+              -SS -Gxhst\
               -I../../ports \
               -I../../GeneratedCode\
               -o ../../GeneratedCode
@@ -57,7 +57,7 @@ project(AMI_Hello_Tuto_Hello_Sender_lem_stub) : ccm_svnt, ami   {
   libout = ../../lib
   sharedname = Hello_Sender_comp_lem_stub
   dynamicflags += HELLO_SENDER_COMP_LEM_STUB_BUILD_DLL
-  includes += ../../GeneratedCode ../.. 
+  includes += ../../GeneratedCode ../..
   IDL_Files {
   }
 
@@ -154,6 +154,5 @@ project(AMI_Hello_Tuto_Hello_Sender_svnt) : ciao_servant, ami {
   }
 
   Inline_Files {
-    ../../GeneratedCode/Hello_Sender_compS.inl
   }
 }
diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.mpc b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.mpc
index ae329e5e8c2..427ca625d05 100644
--- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.mpc
+++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.mpc
@@ -152,7 +152,6 @@ project(AMI_Hello_Tuto_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    ../GeneratedCode/Hello_MyFoo_objS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
index ff8767c0197..61e1ed33c06 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
@@ -145,7 +145,6 @@ project(DDS_Hello_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    Hello_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc
index 344faaad8fc..c97a14f7275 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc
@@ -137,7 +137,6 @@ project(DDS_Hello_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel
   }
 
   Inline_Files {
-    Hello_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
index fe3fc1ab5db..9727a093cb3 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
@@ -138,7 +138,6 @@ project(DDS_Hello_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
   }
 
   Inline_Files {
-    Hello_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc
index 068148c5623..3da2e6a035a 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc
@@ -63,6 +63,5 @@ project(Single_Service_Common_skel) : ccm_svnt {
   }
 
   Inline_Files {
-    Single_Service_CommonS.inl
   }
 }
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc
index 5e7c554a3e3..d7f0717f044 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc
@@ -133,7 +133,6 @@ project(Large_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    Large_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc
index e24f975e541..8c6c1ca8d39 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc
@@ -131,7 +131,6 @@ project(Large_DDS_Pub_svnt) : ciao_servant, dds4ccm_base {
   }
 
   Inline_Files {
-    DDS_PubS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc
index c223240f724..9de6f2338ac 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc
@@ -130,7 +130,6 @@ project(Large_DDS_Sub_svnt) : ciao_servant, dds4ccm_base {
   }
 
   Inline_Files {
-    DDS_SubS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc
index ae2e057ab3a..0f22cfd536b 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc
@@ -131,7 +131,6 @@ project(Single_Service_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    Single_ServiceS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc
index e892ccfc76b..872d9481c51 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc
@@ -133,7 +133,6 @@ project(DDS_Broker_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
   }
 
   Inline_Files {
-    BrokerS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
index a4f9b2ae675..a658421a258 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_Quoter_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    Quoter_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc
index b85ce3b99c8..8cbb3d0fb7b 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc
@@ -134,7 +134,6 @@ project(DDS_Distributor_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
   }
 
   Inline_Files {
-    DistributorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
index 4efb3d76089..473a05bfe3e 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_Shapes_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    Shapes_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc
index 4f0560a4fdd..d7b67c71229 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc
@@ -133,7 +133,6 @@ project(DDS_Shapes_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel
   }
 
   Inline_Files {
-    Shapes_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc
index d079f2047d1..acb77b7ed92 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc
@@ -134,7 +134,6 @@ project(DDS_Shapes_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
   }
 
   Inline_Files {
-    Shapes_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc b/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc
index 309ba352d67..36fb5de47f2 100644
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc
+++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc
@@ -32,12 +32,6 @@ project (DDS4CCM_skel) : install, dds4ccm_lem_stub, ciaolib_with_idl, \
   }
 
   Inline_Files {
-    dds_rtf2_dcpsS.inl
-    dds4ccm_PortStatusListenerS.inl
-    dds4ccm_DataListenerControlS.inl
-    dds4ccm_ConnectorStatusListenerS.inl
-    dds4ccm_ConnectorS.inl
-    dds4ccm_StateListenerControlS.inl
   }
 
   specific {
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc
index 8a3c01e4d7f..b353927b2f9 100644
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc
+++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc
@@ -20,8 +20,6 @@ project (CIAO_NDDS_skel) : install, ndds_idltocpp_stub, ciaolib_with_idl, ciao_o
   }
 
   Inline_Files {
-    ndds_dcpsS.inl
-    ndds_dcps_i_handleS.inl
   }
 
   specific {
diff --git a/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp b/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp
index 2bdd6e9bbd7..ac668fbdc69 100644
--- a/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp
@@ -440,7 +440,7 @@ namespace CIAO
                 }
             }
         }
-      // Now we can savely remove the read condition (in a thread safe manner)
+      // Now we can safely remove the read condition (in a thread safe manner)
       if (! ::CORBA::is_nil (this->rd_condition_.in ()))
         {
           retcode = ::DDS::RETCODE_OK;
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc
index 4face6ad097..e4131be2dfd 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_Perf_Keyed_Test_Connector_svnt) : ciao_servant, dds4ccm_skel, dds4cc
   }
 
   Inline_Files {
-    Perf_Keyed_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc
index 147098f2393..c11a25fbbee 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc
@@ -142,7 +142,6 @@ project(DDS_Perf_Keyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_skel, dds4ccm
   }
 
   Inline_Files {
-    Perf_Keyed_Test_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc
index cc02cb4a07f..4f9483ecd52 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc
@@ -141,7 +141,6 @@ project(DDS_Perf_Keyed_Test_Sender_svnt) : ciao_servant, dds4ccm_skel {
   }
 
   Inline_Files {
-    Perf_Keyed_Test_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc
index 78470024921..ea89e031a47 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_LatencyTT_Test_Connector_svnt) : ciao_servant, dds4ccm_skel, dds4ccm
   }
 
   Inline_Files {
-    LatencyTT_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.mpc
index 932d9b9313f..c997b41ea15 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.mpc
@@ -144,7 +144,6 @@ project(DDS_LatencyTT_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4
   }
 
   Inline_Files {
-    LatencyTT_Test_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.mpc
index 70988c02360..275f0bae134 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.mpc
@@ -140,7 +140,6 @@ project(DDS_LatencyTT_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4cc
   }
 
   Inline_Files {
-    LatencyTT_Test_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc
index 017f5989f20..b178877facf 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_Throughput_Connector_svnt) : ciao_servant, dds4ccm_skel, dds4ccm_lem
   }
 
   Inline_Files {
-    Throughput_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.mpc
index 3a26e557ead..32dac39366c 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.mpc
@@ -146,7 +146,6 @@ project(DDS_Throughput_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_
   }
 
   Inline_Files {
-    Throughput_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc
index 833b3de83c9..e7935f78d38 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc
@@ -136,7 +136,6 @@ project(DDS_Throughput_Sec_Connector_svnt) : ciao_servant, dds4ccm_skel, dds4ccm
   }
 
   Inline_Files {
-    Throughput_Sec_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.mpc
index fadafc3f4bc..50d1d49a58b 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.mpc
@@ -144,7 +144,6 @@ project(DDS_Throughput_Sender_svnt) : ciao_servant, dds4ccm_skel {
   }
 
   Inline_Files {
-    Throughput_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
index 13a1c2e7b29..50ee0b44588 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_CSL_DeadlineTest_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    CSL_DeadlineTest_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc
index 43e0bd1b29a..fcf33fc9a09 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc
@@ -131,7 +131,6 @@ project(DDS_CSL_DeadlineTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dd
   }
 
   Inline_Files {
-    CSL_DeadlineTest_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc
index b363171a1b4..c1a1e87e9c8 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc
@@ -134,7 +134,6 @@ project(DDS_CSL_DeadlineTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4
   }
 
   Inline_Files {
-    CSL_DeadlineTest_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc
index 52d15882ec0..79dcb9cc5d8 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_CSL_QoSTest_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    CSL_QoSTest_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc
index 521151482df..ad025772732 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc
@@ -131,7 +131,6 @@ project(DDS_CSL_QoSTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm
   }
 
   Inline_Files {
-    CSL_QoSTest_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc
index 8ac06eb8ae8..7a9efb17709 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc
@@ -134,7 +134,6 @@ project(DDS_CSL_QoSTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s
   }
 
   Inline_Files {
-    CSL_QoSTest_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc
index 413abfab643..ace737213f7 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_CSL_SRTest_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    CSL_SRTest_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc
index 762e09fcdfa..832bd209c80 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc
@@ -132,7 +132,6 @@ project(DDS_CSL_SRTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_
   }
 
   Inline_Files {
-    CSL_SRTest_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc
index 54cbec4e435..72aefc6ed35 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc
@@ -134,7 +134,6 @@ project(DDS_CSL_SRTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_sk
   }
 
   Inline_Files {
-    CSL_SRTest_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc
index 00a27ecb267..0681b875095 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_CSL_USTest_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    CSL_USTest_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc
index de7bcaa4aaa..f0a8733b7ed 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc
@@ -132,7 +132,6 @@ project(DDS_CSL_USTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_
   }
 
   Inline_Files {
-    CSL_USTest_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc
index ecc1f8f3b52..e623769dc89 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc
@@ -134,7 +134,6 @@ project(DDS_CSL_USTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_sk
   }
 
   Inline_Files {
-    CSL_USTest_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc
index 44a4935d9d4..5a00581be0b 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc
@@ -105,7 +105,6 @@ project(DDS_Coh_Update_ReaderStarter_svnt) : ciao_servant, dds4ccm_lem_stub, dds
   }
 
   Inline_Files {
-    Reader_StarterS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc
index a515fab99a8..11417e91eea 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc
@@ -141,7 +141,6 @@ project(CoherentUpdate_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    CoherentUpdate_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc
index d8da91edaa4..073d5b1bc0d 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc
@@ -150,7 +150,6 @@ project(CoherentUpdate_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds
   }
 
   Inline_Files {
-    CoherentUpdate_Test_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc
index 9f7ed0fc325..b22c09b72e1 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc
@@ -149,7 +149,6 @@ project(CoherentUpdate_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4c
   }
 
   Inline_Files {
-    CoherentUpdate_Test_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc
index 04bb3398d3f..af5597803a3 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc
@@ -105,7 +105,6 @@ project(DDS_Coherent_Reader_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4
   }
 
   Inline_Files {
-    Reader_StarterS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc
index 6b1ca64bc64..e9be14db0bd 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc
@@ -137,7 +137,6 @@ project(CoherentWrite_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    CoherentWrite_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc
index 4d67b4f6bcf..9f008a9ac71 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc
@@ -151,7 +151,6 @@ project(CoherentWrite_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4
   }
 
   Inline_Files {
-    CoherentWrite_Test_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc
index 1c22d1faad8..7975fc52e38 100755
--- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc
@@ -149,7 +149,6 @@ project(CoherentWrite_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4cc
   }
 
   Inline_Files {
-    CoherentWrite_Test_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc
index a75a0b6274a..9b5aecce470 100644
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc
@@ -140,7 +140,6 @@ project(Collocated_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    Collocated_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc
index 502644612a9..487483045c8 100644
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc
@@ -140,7 +140,6 @@ project(PubSubComponent_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
   }
 
   Inline_Files {
-    PubSub_ComponentS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.cpp
index 3fdc5b19acc..9fa7bf2cc8d 100644
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component_exec.cpp
@@ -153,7 +153,7 @@ namespace CIAO_CoPubSub_PubSub_comp_Impl
                     "Sample has been written: <%C> - <%d>\n",
                     sample.hello.in (), sample.msgId));
       }
-    catch (CCM_DDS::InternalError & ex) // catch "normal" exception
+    catch (const CCM_DDS::InternalError &) // catch "normal" exception
       {
         ACE_ERROR ((LM_ERROR, "PubSub_comp_exec_i::tick - "
                   "ERROR: caught InternalError.\n"));
diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc
index 86ed3573eb7..a436c5f3836 100644
--- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc
@@ -140,7 +140,6 @@ project(SubComponent_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
   }
 
   Inline_Files {
-    Sub_ComponentS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc
index b195acc1f56..03bb352085d 100644
--- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc
@@ -129,7 +129,6 @@ project(DiffDir_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    Connector/DiffDir_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc
index b4236daf4af..5c951663474 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc
@@ -141,7 +141,6 @@ project(CFT_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel
   }
 
   Inline_Files {
-    CFT_Test_ComponentS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc
index 1c6dbe79aea..aafeaef696a 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc
@@ -137,7 +137,6 @@ project(CFT_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    CFT_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc
index c4e73705d86..d47af56e58f 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_CFTLE_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    CFTLE_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc
index 6e48a1a1507..4a608ac1783 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc
@@ -142,7 +142,6 @@ project(DDS_CFTLE_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_
   }
 
   Inline_Files {
-    CFTLE_Test_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc
index 67c9b77540e..e742d9e7656 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc
@@ -141,7 +141,6 @@ project(DDS_CFTLE_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_sk
   }
 
   Inline_Files {
-    CFTLE_Test_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.mpc
index 97169ed1f7c..22a8369448d 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.mpc
@@ -141,7 +141,6 @@ project(CFT_Exception_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds
   }
 
   Inline_Files {
-    Exception_Test_ComponentS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc
index 8771d404def..c5354d85dc3 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc
@@ -137,7 +137,6 @@ project(CFT_Exception_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    Exception_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc
index ec68400148a..51cd2cd48e3 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc
@@ -105,7 +105,6 @@ project(CFT_ReadGet_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel
   }
 
   Inline_Files {
-    ReadGet_StarterS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc
index b687f4110f6..34923267436 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc
@@ -141,7 +141,6 @@ project(CFT_ReadGet_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    ReadGet_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc
index 16d7855838f..bd70d89bc33 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc
@@ -151,7 +151,6 @@ project(CFT_ReadGet_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4cc
   }
 
   Inline_Files {
-    ReadGet_Test_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.mpc
index bc1f872af4d..4c167e1993c 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.mpc
@@ -149,7 +149,6 @@ project(CFT_ReadGet_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_
   }
 
   Inline_Files {
-    ReadGet_Test_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc
index 59f6ef9c4c5..793ee81f5de 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_CFTLS_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    CFTLS_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.mpc
index a546809f0ee..a39bedc2403 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.mpc
@@ -141,7 +141,6 @@ project(DDS_CFTLS_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_
   }
 
   Inline_Files {
-    CFTLS_Test_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.mpc
index e462682551b..2832f458839 100755
--- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.mpc
@@ -141,7 +141,6 @@ project(DDS_CFTLS_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_sk
   }
 
   Inline_Files {
-    CFTLS_Test_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc
index 28699ac1db8..bdb237f55b1 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_DDSWriterEntityConnector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    Writer_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc
index 7462d1531f6..02fb99b96de 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc
@@ -134,7 +134,6 @@ project(DDS_DDSWriterEntityReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4
   }
 
   Inline_Files {
-    Writer_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc
index e9620a83cd9..3adfbc254fb 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc
@@ -145,7 +145,6 @@ project(DDS_DDSWriterEntitySender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4cc
   }
 
   Inline_Files {
-    Writer_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.mpc
index 838d4675b38..d6713045e5c 100644
--- a/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.mpc
@@ -124,7 +124,6 @@ project(Derived_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    Derived_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc
index fd83b76e6f3..2a6f741adbb 100755
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc
@@ -136,7 +136,6 @@ project(DDS_DNM_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    DNM_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc
index dc7fb3175c7..045577065f4 100755
--- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc
@@ -139,7 +139,6 @@ project(DNM_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
   }
 
   Inline_Files {
-    DNM_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc
index 2619e45f013..81c2f135049 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_ECT_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    Event_Connection_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc
index e605f6517ba..41f883a9c4d 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc
@@ -131,7 +131,6 @@ project(DDS_ECT_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
   }
 
   Inline_Files {
-    Event_Connection_Test_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc
index c6dad6940b4..ea27d85d363 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc
@@ -134,7 +134,6 @@ project(DDS_ECT_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
   }
 
   Inline_Files {
-    Event_Connection_Test_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc
index bb65328b879..889c96c4b52 100755
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc
@@ -136,7 +136,6 @@ project(DDS_FSS_Event_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    FSS_Event_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc
index f06e2fc14b8..bb7759517b9 100755
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_FSS_State_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    FSS_State_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.mpc
index 41c7ed9ebf1..193d728f28f 100755
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.mpc
@@ -141,7 +141,6 @@ project(GCE_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel
   }
 
   Inline_Files {
-    GCE_Test_ComponentS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc
index bf0eef5ce18..a898244a545 100755
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc
@@ -137,7 +137,6 @@ project(GCE_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    GCE_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.mpc
index e8e9c957fd5..475efbc2ba2 100755
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.mpc
@@ -141,7 +141,6 @@ project(GCS_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel
   }
 
   Inline_Files {
-    GCS_Test_ComponentS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc
index 8fccb838986..eb2b649ab81 100755
--- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc
@@ -137,7 +137,6 @@ project(GCS_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    GCS_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc
index 0bd28cbdc34..f9857608592 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc
@@ -107,7 +107,6 @@ project(DDS_Get_Invoker_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
   }
 
   Inline_Files {
-    Get_InvokerS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc
index a010574641a..01d5f9e3a4b 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_Getter_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    Getter_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc
index 474d94de77a..cb5f5400cca 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc
@@ -150,7 +150,6 @@ project(DDS_Getter_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm
   }
 
   Inline_Files {
-    Getter_Test_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc
index b13a29f80c1..03e2204374b 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc
@@ -145,7 +145,6 @@ project(DDS_Getter_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s
   }
 
   Inline_Files {
-    Getter_Test_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc
index d25d6d97ef2..84ac47b781c 100644
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc
+++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc
@@ -102,6 +102,5 @@ project(IDL_Test_Interfaces_svnt) : ccm_svnt {
   }
 
   Inline_Files {
-    IDL_Test_InterfacesS.inl
   }
 }
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc
index 02225917db1..41b9aaa692a 100644
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc
@@ -171,7 +171,6 @@ project(IDL_Test_Base_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_
   }
 
   Inline_Files {
-    IDL_Test_Base_ComponentS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc
index c3ee2ecfce0..7e9a389342c 100644
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc
@@ -190,7 +190,6 @@ project(IDL_Test_Derived_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4c
   }
 
   Inline_Files {
-    IDL_Test_Derived_ComponentS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc
index 7d8aa1f4fb1..c8e9ebc9706 100644
--- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc
@@ -137,7 +137,6 @@ project(IDL_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    IDL_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc
index 0126446a5b7..a032e7e739b 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_InstanceHandleConnector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    Writer_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc
index d583ae5ea8f..b9d68e2e51a 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc
@@ -143,7 +143,6 @@ project(DDS_DDSInstanceHandleSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4
   }
 
   Inline_Files {
-    Writer_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
index 6b615a7c192..3731dcdd994 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_Keyed_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    Keyed_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc
index 50ac8578461..aeca5a7a824 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc
@@ -132,7 +132,6 @@ project(DDS_Keyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_
   }
 
   Inline_Files {
-    Keyed_Test_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc
index 6b56166a729..ca0b902f28f 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc
@@ -134,7 +134,6 @@ project(DDS_Keyed_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_sk
   }
 
   Inline_Files {
-    Keyed_Test_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
index c4ba37345ef..b5314ddd07a 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_KeyedWriterConnector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    Writer_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc
index 48d707cbdd4..abc49c53cee 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc
@@ -132,7 +132,6 @@ project(DDS_KeyedWriterReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_
   }
 
   Inline_Files {
-    Writer_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc
index 2d2c5030b85..11d516cee83 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc
@@ -134,7 +134,6 @@ project(DDS_KeyedWriterSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_sk
   }
 
   Inline_Files {
-    Writer_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.mpc
index c5445d15c50..8465336ee28 100755
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.mpc
@@ -106,7 +106,6 @@ project(Reader_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
   }
 
   Inline_Files {
-    Reader_StarterS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc
index 1e42ce25fbe..03c7ea275fe 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc
@@ -141,7 +141,6 @@ project (RG_LateBindingConnector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    RG_LateBinding_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.mpc
index 0f30d0f6602..5f2a8cd4aaf 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.mpc
@@ -151,7 +151,6 @@ project (RG_LateBindingReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_
   }
 
   Inline_Files {
-    RG_LateBinding_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.mpc
index 18d523e7aa1..3227fac6b9e 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.mpc
@@ -146,7 +146,6 @@ project (RG_LateBindingSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_sk
   }
 
   Inline_Files {
-    RG_LateBinding_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc
index 7ff6c696f9d..26e3fd89b59 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc
@@ -141,7 +141,6 @@ project (WU_LateBindingConnector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    WU_LateBinding_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.mpc
index 328a658c3ec..ba0c8f8f6d7 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.mpc
@@ -136,7 +136,6 @@ project (WU_LateBindingReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_
   }
 
   Inline_Files {
-    WU_LateBinding_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.mpc
index 36a18a9b438..6f4c85ae025 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.mpc
@@ -137,7 +137,6 @@ project (WU_LateBindingSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_sk
   }
 
   Inline_Files {
-    WU_LateBinding_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc
index 1cc4d1c2d6d..d03528e7b78 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_LMBM_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    LMBM_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc
index 16eab169dc1..932cc6719a6 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc
@@ -141,7 +141,6 @@ project(DDS_LMBM_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s
   }
 
   Inline_Files {
-    LMBM_Test_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc
index 6aebd902bd3..82c6b98f12c 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc
@@ -141,7 +141,6 @@ project(DDS_LMBM_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske
   }
 
   Inline_Files {
-    LMBM_Test_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
index 41d97dd70e8..bda90db2aa8 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_LNE_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    LNE_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc
index d2547a7033d..8bc43683040 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc
@@ -142,7 +142,6 @@ project(DDS_LNE_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_sk
   }
 
   Inline_Files {
-    LNE_Test_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc
index 039ab94a2e3..433a6daec80 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc
@@ -141,7 +141,6 @@ project(DDS_LNE_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel
   }
 
   Inline_Files {
-    LNE_Test_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc
index e8c4c878fdb..bc582a1e439 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_LOBO_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    LOBO_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc
index 41c64cc20a0..8ecaeb1dddb 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc
@@ -141,7 +141,6 @@ project(DDS_LOBO_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s
   }
 
   Inline_Files {
-    LOBO_Test_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc
index e321b6908d7..ac414e6f05f 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc
@@ -141,7 +141,6 @@ project(DDS_LOBO_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske
   }
 
   Inline_Files {
-    LOBO_Test_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc
index d2bd2ffc114..63489f0af2d 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_EMLDT_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    Event_MemLeakDetection_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.mpc
index 008010b555d..4f1354d6e01 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.mpc
@@ -132,7 +132,6 @@ project(DDS_EMLDT_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel
   }
 
   Inline_Files {
-    Event_MemLeakDetection_Test_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.mpc
index 84aa30d7b4d..a03e6f68d52 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.mpc
@@ -134,7 +134,6 @@ project(DDS_EMLDT_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
   }
 
   Inline_Files {
-    Event_MemLeakDetection_Test_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc
index 3e4eaedc370..936aaa02532 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_SMLDT_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    State_MemLeakDetection_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.mpc
index 67a9f79aa96..970c8f285c0 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.mpc
@@ -132,7 +132,6 @@ project(DDS_SMLDT_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel
   }
 
   Inline_Files {
-    State_MemLeakDetection_Test_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.mpc
index b4a7fc534c7..5cdbd2f4956 100644
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.mpc
@@ -134,7 +134,6 @@ project(DDS_SMLDT_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
   }
 
   Inline_Files {
-    State_MemLeakDetection_Test_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc
index cfabd9b087d..37d7775497b 100755
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc
@@ -141,7 +141,6 @@ project(TypeRegistration_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4c
   }
 
   Inline_Files {
-    TypeRegistration_Test_ComponentS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc
index 8f17524e0b1..224a9a31a43 100755
--- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc
@@ -137,7 +137,6 @@ project(TypeRegistration_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    TypeRegistration_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc
index 149c177b3b8..d84372bc7a3 100644
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc
@@ -151,7 +151,6 @@ project(DDS_MultiTopic_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    MultiTopic_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.mpc
index 56f8709451a..d157d94ae08 100644
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.mpc
@@ -132,7 +132,6 @@ project(DDS_MultiTopic_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_
   }
 
   Inline_Files {
-    MultiTopic_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc
index b53c899b32a..c04b71cf90d 100644
--- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc
@@ -134,7 +134,6 @@ project(DDS_MultiTopic_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_sk
   }
 
   Inline_Files {
-    MultiTopic_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc
index 7d2706d392f..02fbf15553c 100644
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc
@@ -161,7 +161,6 @@ project(DDS_MT_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    MultipleTemp_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc
index 275a5eb0afd..5a45580c18e 100644
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc
@@ -137,7 +137,6 @@ project(DDS_MultipleTemp_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4cc
   }
 
   Inline_Files {
-    MultipleTemp_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc
index afdacec4228..c76042fb341 100644
--- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc
@@ -139,7 +139,6 @@ project(DDS_MultipleTemp_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_
   }
 
   Inline_Files {
-    MultipleTemp_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc
index 2f098575832..7d75e5a3452 100644
--- a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc
@@ -124,7 +124,6 @@ project(NoModule_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    NoModule_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc
index 161413f0daa..7be1fdfbe55 100755
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc
@@ -141,7 +141,6 @@ project(NonChangeable_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_
   }
 
   Inline_Files {
-    NonChangeable_ComponentS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
index d36f94a1d3c..5c58a00cc29 100644
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_NonChangeableConnector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    NonChangeable_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.mpc
index 7c301fe99a7..6602de3110f 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.mpc
@@ -141,7 +141,6 @@ project(OIT_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
   }
 
   Inline_Files {
-    OIT_Test_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc
index da0aa40499c..1300bee26e9 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc
@@ -137,7 +137,6 @@ project(OIT_Receiver_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    OIT_Receiver_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.mpc
index a7b3c35c9f2..794c75596d0 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.mpc
@@ -141,7 +141,6 @@ project(OIT_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
   }
 
   Inline_Files {
-    OIT_Test_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc
index 3c9dc6f812d..f651b020293 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc
@@ -137,7 +137,6 @@ project(OIT_Sender_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    OIT_Sender_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc
index b1b0fa35ae2..b437583be1d 100644
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc
@@ -144,6 +144,5 @@ project(OFM_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    OFM_ConnectorS.inl
   }
 }
diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc
index 28423532c92..305c7292428 100755
--- a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc
@@ -143,7 +143,6 @@ project(OneFile_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    OneFile_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc
index a2ffdc0ddb3..5a9e9955e65 100644
--- a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc
@@ -200,7 +200,6 @@ project(DDS_PSAT_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    PSAT_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc
index 2c57768808b..79dac5a4ea5 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_PSL_DeadlineTest_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    PSL_DeadlineTest_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc
index f1490dcbec2..b3f8ef1ec1d 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc
@@ -132,7 +132,6 @@ project(DDS_PSL_DeadlineTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dd
   }
 
   Inline_Files {
-    PSL_DeadlineTest_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc
index d7ec5be8c2d..db32060a04c 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc
@@ -134,7 +134,6 @@ project(DDS_PSL_DeadlineTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4
   }
 
   Inline_Files {
-    PSL_DeadlineTest_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc
index 1983963e70b..690445c10c3 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_PSL_SampleLost_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    PSL_SampleLost_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc
index 3248846b4be..1df673b57ec 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc
@@ -132,7 +132,6 @@ project(DDS_PSL_SampleLost_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4
   }
 
   Inline_Files {
-    PSL_SampleLost_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc
index 62dc888f3f3..8ab5bc0b401 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc
@@ -134,7 +134,6 @@ project(DDS_PSL_SampleLost_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4cc
   }
 
   Inline_Files {
-    PSL_SampleLost_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.mpc
index f8755973434..f7258c06228 100755
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.mpc
@@ -141,7 +141,6 @@ project(PortUsageEvent_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm
   }
 
   Inline_Files {
-    PortUsageEvent_ComponentS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc
index 7ea5de29d75..72a1976e10f 100755
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc
@@ -137,7 +137,6 @@ project(PortUsageEvent_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    PortUsageEvent_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.mpc
index a5ab91efbae..1e5295d6dd7 100755
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.mpc
@@ -141,7 +141,6 @@ project(PortUsageState_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm
   }
 
   Inline_Files {
-    PortUsageState_ComponentS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc
index cab9c0ca48a..161b1485f4e 100755
--- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc
@@ -137,7 +137,6 @@ project(PortUsageState_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    PortUsageState_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.mpc
index afd80353d21..d975b977499 100755
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.mpc
@@ -106,7 +106,6 @@ project(RW_Reader_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
   }
 
   Inline_Files {
-    Reader_StarterS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc
index 85ccc3191af..eaee93bae4c 100755
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc
@@ -137,7 +137,6 @@ project(Proxy_RW_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    Proxy_RW_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.mpc
index 7cb3b426d8c..b785b288715 100755
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.mpc
@@ -151,7 +151,6 @@ project(Proxy_RW_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s
   }
 
   Inline_Files {
-    Proxy_RW_Test_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.mpc
index a3403ffe70b..636dfebff19 100755
--- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.mpc
@@ -147,7 +147,6 @@ project(Proxy_RW_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske
   }
 
   Inline_Files {
-    Proxy_RW_Test_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc
index 14e3468a0ba..6af2a1229a1 100755
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc
@@ -141,7 +141,6 @@ project(QosProfile_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4cc
   }
 
   Inline_Files {
-    QosProfile_Test_ComponentS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc
index d72b9cbc98d..a4b41c1e134 100755
--- a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc
@@ -137,7 +137,6 @@ project(QosProfile_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    QosProfile_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc
index 53e453e7139..941c743621a 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc
@@ -141,7 +141,6 @@ project(QC_Different_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    Different_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc
index 3f7b9aa30d8..85dd243f6e1 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc
@@ -142,7 +142,6 @@ project(QC_Different_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4c
   }
 
   Inline_Files {
-    Different_Test_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc
index 3492597f7b7..3e74d8a83c8 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc
@@ -141,7 +141,6 @@ project(QC_Different_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm
   }
 
   Inline_Files {
-    Different_Test_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc
index 9bb5e407515..8b932282b08 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_QCLE_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    QCLE_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc
index 86e474393bc..d92762f9355 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc
@@ -142,7 +142,6 @@ project(DDS_QCLE_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s
   }
 
   Inline_Files {
-    QCLE_Test_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc
index 2f7235a6adf..7f18230f3b7 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc
@@ -141,7 +141,6 @@ project(DDS_QCLE_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske
   }
 
   Inline_Files {
-    QCLE_Test_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc
index 94d1d42f37a..45aed08f861 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc
@@ -105,7 +105,6 @@ project(QC_ReadGet_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel
   }
 
   Inline_Files {
-    ReadGet_StarterS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc
index 12f3cc89114..72d2bf53811 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc
@@ -141,7 +141,6 @@ project(QC_ReadGet_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    ReadGet_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc
index d23c076ce5c..7921cbe4a6b 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc
@@ -151,7 +151,6 @@ project(QC_ReadGet_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm
   }
 
   Inline_Files {
-    ReadGet_Test_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc
index 5a6fbcd89ea..646e41736db 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc
@@ -149,7 +149,6 @@ project(QC_ReadGet_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s
   }
 
   Inline_Files {
-    ReadGet_Test_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc
index 280a7b459b5..fec70bf2120 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_QCLS_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    QCLS_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc
index 0ae5f09bbd9..2065079617c 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc
@@ -142,7 +142,6 @@ project(DDS_QCLS_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s
   }
 
   Inline_Files {
-    QCLS_Test_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc
index e26f147f9c9..24faaafecbc 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc
@@ -141,7 +141,6 @@ project(DDS_QCLS_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske
   }
 
   Inline_Files {
-    QCLS_Test_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc
index b8c87f6b474..97d4bbb5aa9 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_QCTL_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    QCTL_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc
index 31db6189f26..cd83936e9ad 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc
@@ -142,7 +142,6 @@ project(DDS_QCTL_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s
   }
 
   Inline_Files {
-    QCTL_Test_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc
index 579307a21d0..b7ebbab66fb 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc
@@ -141,7 +141,6 @@ project(DDS_QCTL_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske
   }
 
   Inline_Files {
-    QCTL_Test_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.mpc
index 3c76cb764f3..2d00901a16b 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.mpc
@@ -105,7 +105,6 @@ project(QC_QCTQ_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
   }
 
   Inline_Files {
-    QCTQ_StarterS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc
index 328ea31df85..2bbf9d1ffeb 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc
@@ -141,7 +141,6 @@ project(QC_QCTQ_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    QCTQ_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc
index 4a6be1d7437..d785375eda8 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc
@@ -151,7 +151,6 @@ project(QC_QCTQ_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_sk
   }
 
   Inline_Files {
-    QCTQ_Test_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc
index 3ec615ddba9..021a1f623b5 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc
@@ -149,7 +149,6 @@ project(QC_QCTQ_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel
   }
 
   Inline_Files {
-    QCTQ_Test_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.mpc
index bfb73fb293c..f18a0f3624b 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.mpc
@@ -105,7 +105,6 @@ project(QC_QCTQM_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
   }
 
   Inline_Files {
-    QCTQM_StarterS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc
index 8aaaabc6469..9a05b0c9b18 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc
@@ -141,7 +141,6 @@ project(QC_QCTQM_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    QCTQM_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.mpc
index 3ae4655b697..165c2188ece 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.mpc
@@ -151,7 +151,6 @@ project(QC_QCTQM_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s
   }
 
   Inline_Files {
-    QCTQM_Test_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.mpc
index 610c2244d45..d100e1c039b 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.mpc
@@ -149,7 +149,6 @@ project(QC_QCTQM_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske
   }
 
   Inline_Files {
-    QCTQM_Test_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc
index ca02024d4da..624b9d48c65 100755
--- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc
@@ -106,7 +106,6 @@ project(DDS_Reader_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel
   }
 
   Inline_Files {
-    Reader_StarterS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc
index c5051492881..7d2b87f936e 100755
--- a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_Reader_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    Reader_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc
index 363cb84e998..e03548b14f3 100755
--- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc
@@ -151,7 +151,6 @@ project(DDS_Reader_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm
   }
 
   Inline_Files {
-    Reader_Test_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc
index 509cd971428..2104f38f015 100755
--- a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc
@@ -145,7 +145,6 @@ project(DDS_Reader_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s
   }
 
   Inline_Files {
-    Reader_Test_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc
index 050904fd873..0138dc69436 100755
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc
@@ -106,7 +106,6 @@ project(reader_starter_rt_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
   }
 
   Inline_Files {
-    Reader_StarterS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc
index f5e8207275a..c37580e6821 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc
@@ -141,7 +141,6 @@ project (RG_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    RG_ResetTopic_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc
index fe2ed2dae50..85e4b58c572 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc
@@ -151,7 +151,6 @@ project (RG_ResetTopicReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s
   }
 
   Inline_Files {
-    RG_ResetTopic_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc
index b2ee15acdb8..44953e66e1d 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc
@@ -146,7 +146,6 @@ project (RG_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske
   }
 
   Inline_Files {
-    RG_ResetTopic_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc
index dd159226915..d7328088ab9 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc
@@ -141,7 +141,6 @@ project (TE_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    TE_ResetTopic_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc
index 396ab0c1405..0a4db8e0b4a 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc
@@ -137,7 +137,6 @@ project (TE_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske
   }
 
   Inline_Files {
-    TE_ResetTopic_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc
index b65dca4b5b5..c9c8e62acac 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc
@@ -141,7 +141,6 @@ project (TL_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    TL_ResetTopic_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc
index 54d6d13d885..ee310a9e2ff 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc
@@ -137,7 +137,6 @@ project (TL_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske
   }
 
   Inline_Files {
-    TL_ResetTopic_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc
index 2c4579b3a4f..c2e3c2a8b20 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc
@@ -141,7 +141,6 @@ project (UL_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    UL_ResetTopic_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc
index 0de0609a041..152b2dd974e 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc
@@ -134,7 +134,6 @@ project (UL_ResetTopicReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s
   }
 
   Inline_Files {
-    UL_ResetTopic_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc
index d8f536e893c..3da79ab75cc 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc
@@ -137,7 +137,6 @@ project (UL_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske
   }
 
   Inline_Files {
-    UL_ResetTopic_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc
index 62db2b36ac7..d69a574e44d 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc
@@ -141,7 +141,6 @@ project (WL_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    WL_ResetTopic_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc
index bd7eb36429a..ce3901b3e9d 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc
@@ -134,7 +134,6 @@ project (WL_ResetTopicReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s
   }
 
   Inline_Files {
-    WL_ResetTopic_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc
index 9bc89b7f5fa..bea65475164 100644
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc
@@ -137,7 +137,6 @@ project (WL_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske
   }
 
   Inline_Files {
-    WL_ResetTopic_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc
index c56b0d5ac3a..1ef29e1e3fc 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_SL_Disabled_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    SL_Disabled_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc
index b83664809b8..bb281ccd853 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc
@@ -132,7 +132,6 @@ project(DDS_SL_Disabled_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm
   }
 
   Inline_Files {
-    SL_Disabled_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc
index 6d66a6972b0..fd163cdca4a 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc
@@ -134,7 +134,6 @@ project(DDS_SL_Disabled_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s
   }
 
   Inline_Files {
-    SL_Disabled_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc
index c2ab7baeb2f..abc9df04a91 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_SL_ManyByMany_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    SL_ManyByMany_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc
index 55ee904c9ff..af66b714a89 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc
@@ -132,7 +132,6 @@ project(DDS_SL_ManyByMany_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4c
   }
 
   Inline_Files {
-    SL_ManyByMany_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc
index 7b50385ccb9..3bf2d77a0de 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc
@@ -134,7 +134,6 @@ project(DDS_SL_ManyByMany_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm
   }
 
   Inline_Files {
-    SL_ManyByMany_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc
index 55ad3afdc19..94af0031a82 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_SL_OneByOne_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    SL_OneByOne_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc
index de5c9ff828e..639fef1cd5c 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc
@@ -132,7 +132,6 @@ project(DDS_SL_OneByOne_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm
   }
 
   Inline_Files {
-    SL_OneByOne_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc
index 5d3a20aa785..252c6ef7681 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc
@@ -134,7 +134,6 @@ project(DDS_SL_OneByOne_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s
   }
 
   Inline_Files {
-    SL_OneByOne_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc
index 1c74f0ab775..9a096cf64fb 100755
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc
@@ -143,7 +143,6 @@ project(SetAttribute_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s
   }
 
   Inline_Files {
-    SetConnectorAttribute_ComponentS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
index b85f34d4e3a..a3a7b059a63 100644
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_SCAConnector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    SetConnectorAttribute_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
index 6aaf141acb8..a1999b81ff5 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
@@ -149,7 +149,6 @@ project(DDS_SharedDP_DDComponent_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm
   }
 
   Inline_Files {
-    ComponentS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
index cbdfc31a238..47577d5f9d0 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
@@ -136,7 +136,6 @@ project(DDS_SharedDP_Connector1_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    Connector1S.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
index 73573bac8ea..25b513ce964 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
@@ -136,7 +136,6 @@ project(DDS_SharedDP_Connector2_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    Connector2S.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
index 3084ea5d5e5..8d687b20c36 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
@@ -136,7 +136,6 @@ project(DDS_SharedDP_Connector3_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    Connector3S.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc
index 12eee1ea5c0..742ee5dcc50 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc
@@ -141,7 +141,6 @@ project(DDS_SharedDPComponent_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_sk
   }
 
   Inline_Files {
-    ComponentS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc
index f2e187fdeba..6bf6327e66e 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc
@@ -136,6 +136,5 @@ project(DDS_SharedDP_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    ConnectorS.inl
   }
 }
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc
index f7d970dcca9..8def4599916 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_SCT_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    State_Connection_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc
index 92866a73ea8..af14efe0d75 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc
@@ -131,7 +131,6 @@ project(DDS_SCT_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
   }
 
   Inline_Files {
-    State_Connection_Test_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc
index c02f131cb1d..45b35c1d1d4 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc
@@ -134,7 +134,6 @@ project(DDS_SCT_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
   }
 
   Inline_Files {
-    State_Connection_Test_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.mpc
index a466944e64d..061a7d9ab8c 100755
--- a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.mpc
@@ -141,7 +141,6 @@ project(TopicName_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm
   }
 
   Inline_Files {
-    TopicName_Test_ComponentS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc
index 09c84a868d9..35f0894f641 100755
--- a/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc
@@ -137,7 +137,6 @@ project(TopicName_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    TopicName_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc
index fd28afa04ff..1b3dd2ad778 100755
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_TwoTopics_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    TwoTopics_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc
index 43ca1a68ba1..088e25cab77 100644
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc
@@ -143,6 +143,5 @@ project(DDS_TTDN_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    ConnectorS.inl
   }
 }
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc
index ee1b077b410..f3d8cdd33a2 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc
@@ -141,7 +141,6 @@ project(DDS_Unkeyed_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    Unkeyed_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc
index 4d13ce564b3..56b0d7f34ed 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc
@@ -132,7 +132,6 @@ project(DDS_Unkeyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4cc
   }
 
   Inline_Files {
-    Unkeyed_Test_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc
index bf77811e084..306a73909c1 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc
@@ -134,7 +134,6 @@ project(DDS_Unkeyed_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_
   }
 
   Inline_Files {
-    Unkeyed_Test_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
index 6e65176c578..3a8e05b1461 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
@@ -141,7 +141,6 @@ project(DDS_UnkeyedWriterConnector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    Writer_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc
index 25888cd8018..2bee13ac808 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc
@@ -132,7 +132,6 @@ project(DDS_UnkeyedWriterReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4cc
   }
 
   Inline_Files {
-    Writer_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc
index d5eb9bfd2de..0e994657330 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc
@@ -134,7 +134,6 @@ project(DDS_UnkeyedWriterSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_
   }
 
   Inline_Files {
-    Writer_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
index 26f83636ed4..f29b01b9ea6 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_Updater_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    Updater_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc
index 511d294319f..70f09d56233 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc
@@ -132,7 +132,6 @@ project(DDS_Updater_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske
   }
 
   Inline_Files {
-    Updater_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc
index 863665f5039..c1760b54668 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc
@@ -134,7 +134,6 @@ project(DDS_Updater_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel
   }
 
   Inline_Files {
-    Updater_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc
index 8e8b60dd5d4..e73fb50f6b5 100755
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc
@@ -142,7 +142,6 @@ project(UCC_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel
   }
 
   Inline_Files {
-    UCC_Test_ComponentS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc
index 7c1f3f74466..094dbad880b 100755
--- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc
@@ -137,7 +137,6 @@ project(UCC_Test_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    UCC_Test_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc
index 761b14515bf..079f66eec7e 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_VT_Array_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    VT_Array_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc
index 843a4fa14c7..7a97e32486b 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_VT_Seq_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    VT_Seq_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc
index 3e65fa33321..308433fc923 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_VT_String_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    VT_String_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc
index c1bb787a5cf..ef3664690da 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_VT_Union_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    VT_Union_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc
index 0e80dda9817..925f9f7cf62 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_VT_Valuetype_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    VT_Valuetype_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc
index fd8b3fae706..bb42936b606 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_VTopic_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    VTopic_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc
index 7ba401de13a..b1185e8a62a 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc
@@ -162,7 +162,6 @@ project(DDS_VTopic_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel
   }
 
   Inline_Files {
-    VTopic_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc
index 87f0a724472..bb1dca76d3c 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc
@@ -165,7 +165,6 @@ project(DDS_VTopic_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
   }
 
   Inline_Files {
-    VTopic_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc
index 336e0b542b1..9d456278398 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_VTS_Array_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    VTS_Array_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc
index 90adfbca433..7fe3ba92bdb 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_VTS_Seq_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    VTS_Seq_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc
index ddf01c3cece..81d69998197 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_VTS_String_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    VTS_String_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc
index b4f50b4ed17..dda7ffbaaea 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_VTS_Union_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    VTS_Union_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc
index 71e0ce97349..aee02aaa288 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc
@@ -140,7 +140,6 @@ project(DDS_VTS_Valuetype_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    VTS_Valuetype_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc
index 6982ab916ad..4006b783de5 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_VTopics_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    VTopics_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
index c7cda9d2681..15919f9a2d8 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
@@ -166,7 +166,6 @@ project(DDS_VTopics_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske
   }
 
   Inline_Files {
-    VTopics_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc
index 836cf7f9951..ae24d2073f3 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc
@@ -162,7 +162,6 @@ project(DDS_VTopics_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel
   }
 
   Inline_Files {
-    VTopics_SenderS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc
index 96ee0aac02a..2eaf7f9a9f4 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc
@@ -22,7 +22,7 @@ project(Shapes_Control_idl_gen) : componentidldefaults {
 project(Shapes_Control_executor_gen) : componentidldefaults {
   requires += dummy_label
   custom_only = 1
-  idlflags += -Gexr -SS -Sci -Ssi \
+  idlflags += -Gexr -SS -Sci \
               -I../ports \
               -I../../ports \
               -o ../../../Tutorial/Code/Shapes_Control_comp
@@ -172,7 +172,6 @@ project(Shapes_Control_comp_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    GeneratedCode/Shapes_Control_compS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc
index 37fdaa19d1c..122ef63ad99 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc
@@ -21,7 +21,7 @@ project(Shapes_Receiver_idl_gen) : componentidldefaults, dds4ccm {
 project(Shapes_Receiver_executor_gen) : componentidldefaults, dds4ccm {
   requires += dummy_label
   custom_only = 1
-  idlflags += -Gex -SS -Sci -Ssi \
+  idlflags += -Gex -SS -Sci \
               -I../../ports \
               -o ../../../Tutorial/Code/Shapes_Receiver_comp
 
@@ -167,7 +167,6 @@ project(Shapes_Receiver_comp_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske
   }
 
   Inline_Files {
-    GeneratedCode/Shapes_Receiver_compS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc
index 7856260550f..86ce4151c7c 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc
@@ -21,7 +21,7 @@ project(Shapes_Sender_idl_gen) : componentidldefaults, dds4ccm {
 project(Shapes_Sender_executor_gen) : componentidldefaults, dds4ccm {
   requires += dummy_label
   custom_only = 1
-  idlflags += -Gex -SS -Sci -Ssi \
+  idlflags += -Gex -SS -Sci \
               -I../ports \
               -I../../ports \
               -o ../../../Tutorial/Code/Shapes_Sender_comp
@@ -176,7 +176,6 @@ project(Shapes_Sender_comp_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel
   }
 
   Inline_Files {
-    GeneratedCode/Shapes_Sender_compS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.mpc
index bd5cd37a3a8..7ee17767ecb 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.mpc
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.mpc
@@ -121,7 +121,6 @@ project(Shapes_Control_obj_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    GeneratedCode/Shapes_Control_objS.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc
index 49348cfc8d9..aabd7b238c6 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc
@@ -148,7 +148,6 @@ project(Shapes_ShapeType_conn_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    GeneratedCode/Shapes_ShapeType_connS.inl
   }
 }
 
diff --git a/CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.mpc b/CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.mpc
index 8b93817e648..ab49f609c0c 100644
--- a/CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.mpc
+++ b/CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.mpc
@@ -140,7 +140,6 @@ project(AMI_AmiDds_Base_skel) : ciao_executor, ami, ami4ccm_servant {
   }
 
   Inline_Files {
-    AmiDds_BaseS.inl
   }
 }
 
diff --git a/CIAO/connectors/tests/AMIDDS/Connector/AmiDds_Connector.mpc b/CIAO/connectors/tests/AMIDDS/Connector/AmiDds_Connector.mpc
index a6a0eef11b7..0e37ed917aa 100755
--- a/CIAO/connectors/tests/AMIDDS/Connector/AmiDds_Connector.mpc
+++ b/CIAO/connectors/tests/AMIDDS/Connector/AmiDds_Connector.mpc
@@ -137,7 +137,6 @@ project(DDS_AmiDds_Connector_svnt) : ciao_servant, dds4ccm_impl {
   }
 
   Inline_Files {
-    AmiDds_ConnectorS.inl
   }
 }
 
diff --git a/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver.mpc b/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver.mpc
index d317fc97391..8f49b09e43c 100644
--- a/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver.mpc
+++ b/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver.mpc
@@ -129,7 +129,6 @@ project(AMI_AmiDds_Base_AmiDds_Receiver_svnt) : ciao_servant, messaging, dds4ccm
   }
 
   Inline_Files {
-    AmiDds_ReceiverS.inl
   }
 }
 
diff --git a/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.mpc b/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.mpc
index 690c19f9559..eab35196775 100644
--- a/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.mpc
+++ b/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.mpc
@@ -127,6 +127,5 @@ project(AMI_AmiDds_Base_AmiDds_Sender_svnt) : ciao_servant, ami, dds4ccm_lem_stu
   }
 
   Inline_Files {
-    AmiDds_SenderS.inl
   }
 }
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Administrator.mpc b/CIAO/examples/DevGuideExamples/Messenger/Administrator.mpc
index 596cf8127d2..06e7212197f 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Administrator.mpc
+++ b/CIAO/examples/DevGuideExamples/Messenger/Administrator.mpc
@@ -103,7 +103,6 @@ project(Messenger_Administrator_svnt) : ciao_servant, avoids_ccm_noevent {
   }
 
   Inline_Files {
-    AdministratorS.inl
   }
 }
 
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Messenger.mpc b/CIAO/examples/DevGuideExamples/Messenger/Messenger.mpc
index fc381000da8..9bacf9f7094 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Messenger.mpc
+++ b/CIAO/examples/DevGuideExamples/Messenger/Messenger.mpc
@@ -165,11 +165,6 @@ project(Messenger_svnt) : ciao_servant, avoids_ccm_noevent {
   }
 
   Inline_Files {
-    RunnableS.inl
-    PublicationS.inl
-    MessageS.inl
-    HistoryS.inl
-    MessengerS.inl
   }
 }
 
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp b/CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp
index eef2a8b6a61..2c4c3bbfb38 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp
+++ b/CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp
@@ -100,9 +100,9 @@ namespace CIAO_Messenger_Impl
   }
 
   void
-  Messenger_exec_i::subject ( const char* subject)
+  Messenger_exec_i::subject (const char* subject)
   {
-    this->subject_ = CORBA::string_dup( subject );
+    this->subject_ = subject;
   }
 
   // Port operations.
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Receiver.mpc b/CIAO/examples/DevGuideExamples/Messenger/Receiver.mpc
index 15624707766..e14e26cd97d 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Receiver.mpc
+++ b/CIAO/examples/DevGuideExamples/Messenger/Receiver.mpc
@@ -103,7 +103,6 @@ project(Messenger_Receiver_svnt) : ciao_servant, avoids_ccm_noevent {
   }
 
   Inline_Files {
-    ReceiverS.inl
   }
 }
 
diff --git a/CIAO/examples/Display/Display_Base/Display_Base.mpc b/CIAO/examples/Display/Display_Base/Display_Base.mpc
index b832d592e8e..c85e89028ce 100644
--- a/CIAO/examples/Display/Display_Base/Display_Base.mpc
+++ b/CIAO/examples/Display/Display_Base/Display_Base.mpc
@@ -72,7 +72,6 @@ project(Display_Base_skel) : ciao_executor, avoids_ccm_noevent {
   }
 
   Inline_Files {
-    Display_BaseS.inl
   }
 }
 
diff --git a/CIAO/examples/Display/GPS/GPS.mpc b/CIAO/examples/Display/GPS/GPS.mpc
index de68aa559cb..cd38a306f54 100644
--- a/CIAO/examples/Display/GPS/GPS.mpc
+++ b/CIAO/examples/Display/GPS/GPS.mpc
@@ -110,7 +110,6 @@ project(Display_GPS_svnt) : ciao_servant, avoids_ccm_noevent {
   }
 
   Inline_Files {
-    GPSS.inl
   }
 }
 
diff --git a/CIAO/examples/Display/NavDisplay/NavDisplay.mpc b/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
index ad5f48de356..db572d57581 100644
--- a/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
+++ b/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
@@ -108,7 +108,6 @@ project(Display_NavDisplay_svnt) : ciao_servant, avoids_ccm_noevent {
   }
 
   Inline_Files {
-    NavDisplayS.inl
   }
 }
 
diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
index bf4d7a4d9b2..2ba05c17ccb 100644
--- a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
+++ b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
@@ -84,6 +84,5 @@ project(Display_NavDisplayGUI_svnt) : ciao_servant, ace_qt4, avoids_ccm_noevent
   }
 
   Inline_Files {
-    ../NavDisplay/NavDisplayS.inl
   }
 }
diff --git a/CIAO/examples/Display/RateGen/RateGen.mpc b/CIAO/examples/Display/RateGen/RateGen.mpc
index 15aac53177a..3baaa5653ce 100644
--- a/CIAO/examples/Display/RateGen/RateGen.mpc
+++ b/CIAO/examples/Display/RateGen/RateGen.mpc
@@ -108,7 +108,6 @@ project(Display_RateGen_svnt) : ciao_servant, avoids_ccm_noevent {
   }
 
   Inline_Files {
-    RateGenS.inl
   }
 }
 
diff --git a/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc b/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc
index 4f6a3bdfdf6..b8f35ae53cc 100644
--- a/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc
+++ b/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc
@@ -103,7 +103,6 @@ project(Hello_Base_skel) : ciao_executor, avoids_ccm_noevent  {
   }
 
   Inline_Files {
-    Hello_BaseS.inl
   }
 }
 
diff --git a/CIAO/examples/Hello/Receiver/Receiver.mpc b/CIAO/examples/Hello/Receiver/Receiver.mpc
index 277f55bc9c1..c1d6b30836d 100644
--- a/CIAO/examples/Hello/Receiver/Receiver.mpc
+++ b/CIAO/examples/Hello/Receiver/Receiver.mpc
@@ -134,7 +134,6 @@ project(Hello_Base_Receiver_svnt) : ciao_servant, avoids_ccm_noevent  {
   }
 
   Inline_Files {
-    ReceiverS.inl
   }
 }
 
diff --git a/CIAO/examples/Hello/Sender/Sender.mpc b/CIAO/examples/Hello/Sender/Sender.mpc
index e1997492231..739ab7594f6 100644
--- a/CIAO/examples/Hello/Sender/Sender.mpc
+++ b/CIAO/examples/Hello/Sender/Sender.mpc
@@ -134,7 +134,6 @@ project(Hello_Base_Sender_svnt) : ciao_servant, avoids_ccm_noevent  {
   }
 
   Inline_Files {
-    SenderS.inl
   }
 }
 
diff --git a/CIAO/examples/Null_Component/Null_Component.mpc b/CIAO/examples/Null_Component/Null_Component.mpc
index c30a953737c..8cb15530500 100644
--- a/CIAO/examples/Null_Component/Null_Component.mpc
+++ b/CIAO/examples/Null_Component/Null_Component.mpc
@@ -108,7 +108,6 @@ project(Null_Component_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    Null_ComponentS.inl
   }
 }
 
diff --git a/CIAO/examples/Null_Component/Null_Interface.mpc b/CIAO/examples/Null_Component/Null_Interface.mpc
index 576b107bf12..f4c0f67de3b 100644
--- a/CIAO/examples/Null_Component/Null_Interface.mpc
+++ b/CIAO/examples/Null_Component/Null_Interface.mpc
@@ -71,7 +71,6 @@ project(Null_Interface_skel) : ciao_executor {
   }
 
   Inline_Files {
-    Null_InterfaceS.inl
   }
 }
 
diff --git a/CIAO/examples/Null_Component_Glfa/Null_Component.mpc b/CIAO/examples/Null_Component_Glfa/Null_Component.mpc
index 6ac1fa4cd13..fea7a7dab9c 100644
--- a/CIAO/examples/Null_Component_Glfa/Null_Component.mpc
+++ b/CIAO/examples/Null_Component_Glfa/Null_Component.mpc
@@ -106,7 +106,6 @@ project(Null_Component_Glfa_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    Null_ComponentS.inl
   }
 }
 
diff --git a/CIAO/examples/Null_Component_Glfa/Null_Interface.mpc b/CIAO/examples/Null_Component_Glfa/Null_Interface.mpc
index d0db26f94d6..62e02a70b65 100644
--- a/CIAO/examples/Null_Component_Glfa/Null_Interface.mpc
+++ b/CIAO/examples/Null_Component_Glfa/Null_Interface.mpc
@@ -61,7 +61,6 @@ project(Null_Interface_Glfa_skel) : ciao_executor {
   }
 
   Inline_Files {
-    Null_InterfaceS.inl
   }
 }
 
diff --git a/CIAO/performance-tests/Benchmark/Benchmark.mpc b/CIAO/performance-tests/Benchmark/Benchmark.mpc
index 5f0bc92b12c..bf9dc6c55f3 100644
--- a/CIAO/performance-tests/Benchmark/Benchmark.mpc
+++ b/CIAO/performance-tests/Benchmark/Benchmark.mpc
@@ -71,7 +71,6 @@ project(Benchmark_skel) : ciao_executor {
   }
 
   Inline_Files {
-    BenchmarkS.inl
   }
 }
 
diff --git a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
index c9ead9ff038..921d1e4c085 100644
--- a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
+++ b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
@@ -111,7 +111,6 @@ project(Benchmark_RoundTrip_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    RoundTripS.inl
   }
 }
 
diff --git a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
index c2120afb8ca..567fbcfce13 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
+++ b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
@@ -111,7 +111,6 @@ project(Benchmark_RoundTripClient_svnt) : ciao_servant, avoids_ace_for_tao {
   }
 
   Inline_Files {
-    RoundTripClientS.inl
   }
 }
 
diff --git a/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc b/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
index e6cdc6ca320..c831cc1be5f 100644
--- a/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
+++ b/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
@@ -109,7 +109,6 @@ project(Protocols_Receiver_svnt) : ciao_servant, avoids_ace_for_tao {
   }
 
   Inline_Files {
-    ReceiverS.inl
   }
 }
 
diff --git a/CIAO/performance-tests/Protocols/Sender/Sender.mpc b/CIAO/performance-tests/Protocols/Sender/Sender.mpc
index 017ca0a3d7e..775ce63d5d9 100644
--- a/CIAO/performance-tests/Protocols/Sender/Sender.mpc
+++ b/CIAO/performance-tests/Protocols/Sender/Sender.mpc
@@ -109,7 +109,6 @@ project(Protocols_Sender_svnt) : ciao_servant, avoids_ace_for_tao {
   }
 
   Inline_Files {
-    SenderS.inl
   }
 }
 
diff --git a/CIAO/performance-tests/Protocols/common/Protocols.mpc b/CIAO/performance-tests/Protocols/common/Protocols.mpc
index 59f0d8dc3ad..210df2ec9a2 100644
--- a/CIAO/performance-tests/Protocols/common/Protocols.mpc
+++ b/CIAO/performance-tests/Protocols/common/Protocols.mpc
@@ -71,7 +71,6 @@ project(Protocols_skel) : ciao_executor {
   }
 
   Inline_Files {
-    ProtocolsS.inl
   }
 }
 
diff --git a/CIAO/tests/Bug_3769_Regression/Bug_3769_Regression.mpc b/CIAO/tests/Bug_3769_Regression/Bug_3769_Regression.mpc
index 910cc83694c..f0d959c90ec 100644
--- a/CIAO/tests/Bug_3769_Regression/Bug_3769_Regression.mpc
+++ b/CIAO/tests/Bug_3769_Regression/Bug_3769_Regression.mpc
@@ -116,7 +116,6 @@ project(Foo_svnt) : ciao_servant   {
   }
 
   Inline_Files {
-    FooS.inl
   }
 }
 
diff --git a/CIAO/tests/Bug_3817_Regression/Bar.mpc b/CIAO/tests/Bug_3817_Regression/Bar.mpc
index 825b0d2ce41..841dfb1528e 100644
--- a/CIAO/tests/Bug_3817_Regression/Bar.mpc
+++ b/CIAO/tests/Bug_3817_Regression/Bar.mpc
@@ -126,7 +126,6 @@ project(Bar_svnt) : ciao_servant   {
   }
 
   Inline_Files {
-    BarS.inl
   }
 }
 
diff --git a/CIAO/tests/Bug_3834_Regression/CompA.mpc b/CIAO/tests/Bug_3834_Regression/CompA.mpc
index 64dc55dca0b..206c9232a9d 100644
--- a/CIAO/tests/Bug_3834_Regression/CompA.mpc
+++ b/CIAO/tests/Bug_3834_Regression/CompA.mpc
@@ -110,7 +110,6 @@ project(Moo_CompA_svnt) : ciao_servant   {
   }
 
   Inline_Files {
-    CompAS.inl
   }
 }
 
diff --git a/CIAO/tests/Bug_3834_Regression/CompB.mpc b/CIAO/tests/Bug_3834_Regression/CompB.mpc
index c771b140908..ac8cf43f85e 100644
--- a/CIAO/tests/Bug_3834_Regression/CompB.mpc
+++ b/CIAO/tests/Bug_3834_Regression/CompB.mpc
@@ -110,7 +110,6 @@ project(Moo_CompB_svnt) : ciao_servant   {
   }
 
   Inline_Files {
-    CompBS.inl
   }
 }
 
diff --git a/CIAO/tests/Bug_3834_Regression/Moo.mpc b/CIAO/tests/Bug_3834_Regression/Moo.mpc
index a2912d1fa55..dd0d5335bca 100644
--- a/CIAO/tests/Bug_3834_Regression/Moo.mpc
+++ b/CIAO/tests/Bug_3834_Regression/Moo.mpc
@@ -62,7 +62,6 @@ project(Moo_skel) : ciao_executor   {
   }
 
   Inline_Files {
-    MooS.inl
   }
 }
 
diff --git a/CIAO/tests/Bug_3890_Regression/Bug_3890_Regression.mpc b/CIAO/tests/Bug_3890_Regression/Bug_3890_Regression.mpc
index a83620556ca..763f526c233 100644
--- a/CIAO/tests/Bug_3890_Regression/Bug_3890_Regression.mpc
+++ b/CIAO/tests/Bug_3890_Regression/Bug_3890_Regression.mpc
@@ -117,7 +117,6 @@ project(Bug_3890_svnt) : ciao_servant   {
   }
 
   Inline_Files {
-    FooS.inl
   }
 }
 
diff --git a/CIAO/tests/CIDL/CodeGen/Basic.mpc b/CIAO/tests/CIDL/CodeGen/Basic.mpc
index 97cdef6fede..9bc565d5b66 100644
--- a/CIAO/tests/CIDL/CodeGen/Basic.mpc
+++ b/CIAO/tests/CIDL/CodeGen/Basic.mpc
@@ -73,7 +73,6 @@ project(Basic_skel) : ciao_executor {
   }
 
   Inline_Files {
-    BasicS.inl
   }
 }
 
diff --git a/CIAO/tests/CIDL/CodeGen/CodeGen.mpc b/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
index 3dc67ecb63e..6a9320a9d28 100644
--- a/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
+++ b/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
@@ -109,7 +109,6 @@ project(Basic_CodeGen_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    CodeGenS.inl
   }
 }
 
diff --git a/CIAO/tests/CIF/Component/CIF_Component.mpc b/CIAO/tests/CIF/Component/CIF_Component.mpc
index b0f43ca39b7..6ad684379b6 100644
--- a/CIAO/tests/CIF/Component/CIF_Component.mpc
+++ b/CIAO/tests/CIF/Component/CIF_Component.mpc
@@ -134,7 +134,6 @@ project(CIF_Component_svnt) : ciao_servant   {
   }
 
   Inline_Files {
-    CIF_ComponentS.inl
   }
 }
 
diff --git a/CIAO/tests/COPI/Registration/Client/Component/Component.mpc b/CIAO/tests/COPI/Registration/Client/Component/Component.mpc
index 1034d8c48ad..83aa34160ef 100644
--- a/CIAO/tests/COPI/Registration/Client/Component/Component.mpc
+++ b/CIAO/tests/COPI/Registration/Client/Component/Component.mpc
@@ -135,6 +135,5 @@ project(Client_Component_svnt) : ciao_servant, ccm_extension_stub, ciao_extensio
   }
 
   Inline_Files {
-    ComponentS.inl
   }
 }
diff --git a/CIAO/tests/COPI/Registration/Servant/Component/Component.mpc b/CIAO/tests/COPI/Registration/Servant/Component/Component.mpc
index 78fe74c57fe..3043db21a54 100644
--- a/CIAO/tests/COPI/Registration/Servant/Component/Component.mpc
+++ b/CIAO/tests/COPI/Registration/Servant/Component/Component.mpc
@@ -135,6 +135,5 @@ project(Servant_Component_svnt) : ciao_servant, ccm_extension_stub, ciao_extensi
   }
 
   Inline_Files {
-    ComponentS.inl
   }
 }
diff --git a/CIAO/tests/COPI/Registration/Server/Component/Component.mpc b/CIAO/tests/COPI/Registration/Server/Component/Component.mpc
index 4f06d262fb2..151c24a5221 100644
--- a/CIAO/tests/COPI/Registration/Server/Component/Component.mpc
+++ b/CIAO/tests/COPI/Registration/Server/Component/Component.mpc
@@ -135,6 +135,5 @@ project(Server_Component_svnt) : ciao_servant, ccm_extension_stub, ciao_extensio
   }
 
   Inline_Files {
-    ComponentS.inl
   }
 }
diff --git a/CIAO/tests/COPI/Registration/Stub/Component/Component.mpc b/CIAO/tests/COPI/Registration/Stub/Component/Component.mpc
index bede26b0445..ceb87cc7c2e 100644
--- a/CIAO/tests/COPI/Registration/Stub/Component/Component.mpc
+++ b/CIAO/tests/COPI/Registration/Stub/Component/Component.mpc
@@ -135,6 +135,5 @@ project(Stub_Component_svnt) : ciao_servant, ccm_extension_stub, ciao_extension_
   }
 
   Inline_Files {
-    ComponentS.inl
   }
 }
diff --git a/CIAO/tests/Collocation/Coll_Base/Base.mpc b/CIAO/tests/Collocation/Coll_Base/Base.mpc
index 71e624a9d43..a61ef47507e 100644
--- a/CIAO/tests/Collocation/Coll_Base/Base.mpc
+++ b/CIAO/tests/Collocation/Coll_Base/Base.mpc
@@ -103,7 +103,6 @@ project(CollBase_skel) : ciao_executor {
   }
 
   Inline_Files {
-    BaseS.inl
   }
 }
 
diff --git a/CIAO/tests/Collocation/Receiver/Receiver.mpc b/CIAO/tests/Collocation/Receiver/Receiver.mpc
index eeb86e2c23a..4702aa7b7c6 100644
--- a/CIAO/tests/Collocation/Receiver/Receiver.mpc
+++ b/CIAO/tests/Collocation/Receiver/Receiver.mpc
@@ -134,6 +134,5 @@ project(CollBase_Receiver_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    ReceiverS.inl
   }
 }
diff --git a/CIAO/tests/Collocation/Receiver/Receiver_exec.cpp b/CIAO/tests/Collocation/Receiver/Receiver_exec.cpp
index 4f67f5e937c..271e921535b 100644
--- a/CIAO/tests/Collocation/Receiver/Receiver_exec.cpp
+++ b/CIAO/tests/Collocation/Receiver/Receiver_exec.cpp
@@ -59,8 +59,9 @@ namespace CIAO_Receiver_Impl
   {
     ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::Receiver_exec_i \n "));
     ACE_NEW_THROW_EX (this->hello_generator_,
-                       HelloGenerator (*this),
-                       ::CORBA::NO_MEMORY ());
+                      HelloGenerator (*this),
+                      ::CORBA::NO_MEMORY ());
+
   }
 
   Receiver_exec_i::~Receiver_exec_i (void)
@@ -114,9 +115,9 @@ namespace CIAO_Receiver_Impl
                                             "no connection hello_to_rec with sender.\n"));
            }
         }
-     catch (const CORBA::INTERNAL& ex)
+     catch (const CORBA::INTERNAL& /*ex*/)
        {
-         if (ACE_OS::strcmp ("no_thru_poa", this->strategy_.in())== 0)
+         if (ACE_OS::strcmp ("no_thru_poa", this->strategy_)== 0)
            {
              ACE_DEBUG ((LM_DEBUG, "OK: Receiver received expected exception\n"));
            }
@@ -203,6 +204,7 @@ namespace CIAO_Receiver_Impl
   {
     /// No need to implement anything
     ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_passivate \n "));
+    this->reactor ()->cancel_timer (this->hello_generator_);
   }
 
   void
@@ -210,6 +212,7 @@ namespace CIAO_Receiver_Impl
   {
     /// No need to implement anything
     ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_remove \n "));
+    delete this->hello_generator_;
   }
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/tests/Collocation/Sender/Sender.mpc b/CIAO/tests/Collocation/Sender/Sender.mpc
index efc59e6dcc9..57e574d0aa9 100644
--- a/CIAO/tests/Collocation/Sender/Sender.mpc
+++ b/CIAO/tests/Collocation/Sender/Sender.mpc
@@ -134,7 +134,6 @@ project(CollBase_Sender_svnt) : ciao_servant  {
   }
 
   Inline_Files {
-    SenderS.inl
   }
 }
 
diff --git a/CIAO/tests/Collocation/Sender/Sender_exec.cpp b/CIAO/tests/Collocation/Sender/Sender_exec.cpp
index c5bb949dc81..95310c3b1d8 100644
--- a/CIAO/tests/Collocation/Sender/Sender_exec.cpp
+++ b/CIAO/tests/Collocation/Sender/Sender_exec.cpp
@@ -26,9 +26,10 @@ namespace CIAO_Sender_Impl
 #if !defined (CCM_DIRECTCOLL)
      ACE_DEBUG ((LM_DEBUG,
                   "SENDER: hello_exec_i::set_point pointer"
-                  "No collocation because CIAO not build with  "
-                  "ccm_diect_collocation = 1.\n",
-                  (void *)&p));
+                  "Strategy desired <%C>, but no collocation "
+                  "because CIAO not build with  "
+                  "ccm_direct_collocation = 1.\n",
+                  strat));
 #else
      if ((ACE_OS::strcmp("direct", strat) == 0) ||
          (ACE_OS::strcmp("best", strat) == 0))
diff --git a/CIAO/tests/DAnCE/Components/ProcessColocation.mpc b/CIAO/tests/DAnCE/Components/ProcessColocation.mpc
index 935e34e9072..2d8930bb5f1 100644
--- a/CIAO/tests/DAnCE/Components/ProcessColocation.mpc
+++ b/CIAO/tests/DAnCE/Components/ProcessColocation.mpc
@@ -101,7 +101,6 @@ project(ProcessColocation_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    ProcessColocationS.inl
   }
 }
 
diff --git a/CIAO/tests/DAnCE/Components/Progressive.mpc b/CIAO/tests/DAnCE/Components/Progressive.mpc
index 867849678d1..83e1b59627a 100644
--- a/CIAO/tests/DAnCE/Components/Progressive.mpc
+++ b/CIAO/tests/DAnCE/Components/Progressive.mpc
@@ -104,7 +104,6 @@ project(SimpleCommon_Progressive_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    ProgressiveS.inl
   }
 }
 
diff --git a/CIAO/tests/DAnCE/Components/SimpleAttribute.mpc b/CIAO/tests/DAnCE/Components/SimpleAttribute.mpc
index 398c5046641..e11c70278f0 100644
--- a/CIAO/tests/DAnCE/Components/SimpleAttribute.mpc
+++ b/CIAO/tests/DAnCE/Components/SimpleAttribute.mpc
@@ -101,7 +101,6 @@ project(SimpleAttribute_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    SimpleAttributeS.inl
   }
 }
 
diff --git a/CIAO/tests/DAnCE/Components/SimpleCommon.mpc b/CIAO/tests/DAnCE/Components/SimpleCommon.mpc
index f959f6d3647..089ce7133c0 100644
--- a/CIAO/tests/DAnCE/Components/SimpleCommon.mpc
+++ b/CIAO/tests/DAnCE/Components/SimpleCommon.mpc
@@ -72,7 +72,6 @@ project(SimpleCommon_skel) : ccm_svnt {
   }
 
   Inline_Files {
-    SimpleCommonS.inl
   }
 }
 
diff --git a/CIAO/tests/DAnCE/Components/SimpleConsumer.mpc b/CIAO/tests/DAnCE/Components/SimpleConsumer.mpc
index a194a7b326e..e7b2c041de2 100644
--- a/CIAO/tests/DAnCE/Components/SimpleConsumer.mpc
+++ b/CIAO/tests/DAnCE/Components/SimpleConsumer.mpc
@@ -103,7 +103,6 @@ project(SimpleCommon_SimpleConsumer_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    SimpleConsumerS.inl
   }
 }
 
diff --git a/CIAO/tests/DAnCE/Components/SimpleEmitter.mpc b/CIAO/tests/DAnCE/Components/SimpleEmitter.mpc
index 406d74a2cea..954d4a7792f 100644
--- a/CIAO/tests/DAnCE/Components/SimpleEmitter.mpc
+++ b/CIAO/tests/DAnCE/Components/SimpleEmitter.mpc
@@ -103,7 +103,6 @@ project(SimpleCommon_SimpleEmitter_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    SimpleEmitterS.inl
   }
 }
 
diff --git a/CIAO/tests/DAnCE/Components/SimpleFailure.mpc b/CIAO/tests/DAnCE/Components/SimpleFailure.mpc
index 74414e91beb..3edf3b96a75 100644
--- a/CIAO/tests/DAnCE/Components/SimpleFailure.mpc
+++ b/CIAO/tests/DAnCE/Components/SimpleFailure.mpc
@@ -101,7 +101,6 @@ project(SimpleFailure_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    SimpleFailureS.inl
   }
 }
 
diff --git a/CIAO/tests/DAnCE/Components/SimpleLocalProvider.mpc b/CIAO/tests/DAnCE/Components/SimpleLocalProvider.mpc
index cf34a87f1cf..cac2ef1fa87 100644
--- a/CIAO/tests/DAnCE/Components/SimpleLocalProvider.mpc
+++ b/CIAO/tests/DAnCE/Components/SimpleLocalProvider.mpc
@@ -104,7 +104,6 @@ project(SimpleLocalProvider_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    SimpleLocalProviderS.inl
   }
 }
 
diff --git a/CIAO/tests/DAnCE/Components/SimpleLocalUser.mpc b/CIAO/tests/DAnCE/Components/SimpleLocalUser.mpc
index 12eea2aa2d9..601df62a436 100644
--- a/CIAO/tests/DAnCE/Components/SimpleLocalUser.mpc
+++ b/CIAO/tests/DAnCE/Components/SimpleLocalUser.mpc
@@ -104,7 +104,6 @@ project(SimpleCommon_SimpleLocalUser_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    SimpleLocalUserS.inl
   }
 }
 
diff --git a/CIAO/tests/DAnCE/Components/SimpleMultipleUser.mpc b/CIAO/tests/DAnCE/Components/SimpleMultipleUser.mpc
index 7b112a2527a..b534158c547 100644
--- a/CIAO/tests/DAnCE/Components/SimpleMultipleUser.mpc
+++ b/CIAO/tests/DAnCE/Components/SimpleMultipleUser.mpc
@@ -103,7 +103,6 @@ project(SimpleCommon_SimpleMultipleUser_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    SimpleMultipleUserS.inl
   }
 }
 
diff --git a/CIAO/tests/DAnCE/Components/SimpleNilFacetProvider.mpc b/CIAO/tests/DAnCE/Components/SimpleNilFacetProvider.mpc
index a2005b51ec2..965eb2650ec 100644
--- a/CIAO/tests/DAnCE/Components/SimpleNilFacetProvider.mpc
+++ b/CIAO/tests/DAnCE/Components/SimpleNilFacetProvider.mpc
@@ -105,7 +105,6 @@ project(SimpleCommon_SNFP_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    SimpleNilFacetProviderS.inl
   }
 }
 
diff --git a/CIAO/tests/DAnCE/Components/SimpleNilFacetUser.mpc b/CIAO/tests/DAnCE/Components/SimpleNilFacetUser.mpc
index ae50276f3e7..78805726832 100644
--- a/CIAO/tests/DAnCE/Components/SimpleNilFacetUser.mpc
+++ b/CIAO/tests/DAnCE/Components/SimpleNilFacetUser.mpc
@@ -104,7 +104,6 @@ project(SimpleCommon_SNFU_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    SimpleNilFacetUserS.inl
   }
 }
 
diff --git a/CIAO/tests/DAnCE/Components/SimpleNull.mpc b/CIAO/tests/DAnCE/Components/SimpleNull.mpc
index 9ec397addf0..01c1cba289f 100644
--- a/CIAO/tests/DAnCE/Components/SimpleNull.mpc
+++ b/CIAO/tests/DAnCE/Components/SimpleNull.mpc
@@ -100,7 +100,6 @@ project(SimpleNull_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    SimpleNullS.inl
   }
 }
 
diff --git a/CIAO/tests/DAnCE/Components/SimpleProvider.mpc b/CIAO/tests/DAnCE/Components/SimpleProvider.mpc
index 6e3d8269ee2..eb743ecc70c 100644
--- a/CIAO/tests/DAnCE/Components/SimpleProvider.mpc
+++ b/CIAO/tests/DAnCE/Components/SimpleProvider.mpc
@@ -104,7 +104,6 @@ project(SimpleCommon_SimpleProvider_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    SimpleProviderS.inl
   }
 }
 
diff --git a/CIAO/tests/DAnCE/Components/SimplePublisher.mpc b/CIAO/tests/DAnCE/Components/SimplePublisher.mpc
index d9ce1cb7416..3091fc8aca1 100644
--- a/CIAO/tests/DAnCE/Components/SimplePublisher.mpc
+++ b/CIAO/tests/DAnCE/Components/SimplePublisher.mpc
@@ -103,7 +103,6 @@ project(SimpleCommon_SimplePublisher_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    SimplePublisherS.inl
   }
 }
 
diff --git a/CIAO/tests/DAnCE/Components/SimpleUser.mpc b/CIAO/tests/DAnCE/Components/SimpleUser.mpc
index d02e0fa4d28..e892e1f5399 100644
--- a/CIAO/tests/DAnCE/Components/SimpleUser.mpc
+++ b/CIAO/tests/DAnCE/Components/SimpleUser.mpc
@@ -104,7 +104,6 @@ project(SimpleCommon_SimpleUser_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    SimpleUserS.inl
   }
 }
 
diff --git a/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor.mpc b/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor.mpc
index 756d9524ddc..78e9d7bfae9 100644
--- a/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor.mpc
+++ b/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor.mpc
@@ -128,7 +128,6 @@ project(Executor_Destructor_svnt) : ciao_servant   {
   }
 
   Inline_Files {
-    Executor_DestructorS.inl
   }
 }
 
diff --git a/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure.mpc b/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure.mpc
index 09a47961fd4..de946e27569 100644
--- a/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure.mpc
+++ b/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure.mpc
@@ -135,7 +135,6 @@ project(Launch_Failure_svnt) : ciao_servant  {
   }
 
   Inline_Files {
-    Launch_FailureS.inl
   }
 }
 
diff --git a/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity.mpc b/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity.mpc
index af9a8de9035..1ee324339c8 100644
--- a/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity.mpc
+++ b/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity.mpc
@@ -118,7 +118,6 @@ project(CPUAffinity_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    CPUAffinityS.inl
   }
 }
 
diff --git a/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage.mpc b/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage.mpc
index 5840be245b0..3e308ac4543 100644
--- a/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage.mpc
+++ b/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage.mpc
@@ -118,7 +118,6 @@ project(CommandlinePassage_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    CommandlinePassageS.inl
   }
 }
 
diff --git a/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown.mpc b/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown.mpc
index 8af8f64ceac..8dec8229046 100644
--- a/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown.mpc
+++ b/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown.mpc
@@ -119,7 +119,6 @@ project(UnexpectedShutdown_svnt) : ciao_servant, dance_stub {
   }
 
   Inline_Files {
-    UnexpectedShutdownS.inl
   }
 }
 
diff --git a/CIAO/tests/DAnCE/PartialShutdown/Base/PartialShutdown.mpc b/CIAO/tests/DAnCE/PartialShutdown/Base/PartialShutdown.mpc
index 35209725957..0ee47989de2 100644
--- a/CIAO/tests/DAnCE/PartialShutdown/Base/PartialShutdown.mpc
+++ b/CIAO/tests/DAnCE/PartialShutdown/Base/PartialShutdown.mpc
@@ -82,7 +82,6 @@ project(PartialShutdown_skel) : ciao_executor   {
   }
 
   Inline_Files {
-    PartialShutdownS.inl
   }
 }
 
diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1.mpc b/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1.mpc
index bc4fd0d067a..36e1d9eaa4d 100755
--- a/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1.mpc
+++ b/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1.mpc
@@ -144,7 +144,6 @@ project(PartialShutdown_Component1_svnt) : ciao_servant   {
   }
 
   Inline_Files {
-    Component1S.inl
   }
 }
 
diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2.mpc b/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2.mpc
index 393d13e9121..eca2a9e0ea5 100755
--- a/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2.mpc
+++ b/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2.mpc
@@ -142,7 +142,6 @@ project(PartialShutdown_Component2_svnt) : ciao_servant   {
   }
 
   Inline_Files {
-    Component2S.inl
   }
 }
 
diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3.mpc b/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3.mpc
index 4d765df747f..a7b39c70250 100755
--- a/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3.mpc
+++ b/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3.mpc
@@ -142,7 +142,6 @@ project(PartialShutdown_Component3_svnt) : ciao_servant   {
   }
 
   Inline_Files {
-    Component3S.inl
   }
 }
 
diff --git a/CIAO/tests/DAnCE/Threading/Base/Threading.mpc b/CIAO/tests/DAnCE/Threading/Base/Threading.mpc
index 5220ee660b1..43ac64b328c 100644
--- a/CIAO/tests/DAnCE/Threading/Base/Threading.mpc
+++ b/CIAO/tests/DAnCE/Threading/Base/Threading.mpc
@@ -82,7 +82,6 @@ project(Threading_skel) : ciao_executor   {
   }
 
   Inline_Files {
-    ThreadingS.inl
   }
 }
 
diff --git a/CIAO/tests/DAnCE/Threading/Component1/Component1.mpc b/CIAO/tests/DAnCE/Threading/Component1/Component1.mpc
index 8a5dbef8b5e..42b32014eb0 100755
--- a/CIAO/tests/DAnCE/Threading/Component1/Component1.mpc
+++ b/CIAO/tests/DAnCE/Threading/Component1/Component1.mpc
@@ -146,7 +146,6 @@ project(Threading_Component1_svnt) : ciao_servant   {
   }
 
   Inline_Files {
-    Component1S.inl
   }
 }
 
diff --git a/CIAO/tests/DAnCE/Threading/Component2/Component2.mpc b/CIAO/tests/DAnCE/Threading/Component2/Component2.mpc
index 2b00e1fea12..6e5cbe9f92a 100755
--- a/CIAO/tests/DAnCE/Threading/Component2/Component2.mpc
+++ b/CIAO/tests/DAnCE/Threading/Component2/Component2.mpc
@@ -143,7 +143,6 @@ project(Threading_Component2_svnt) : ciao_servant   {
   }
 
   Inline_Files {
-    Component2S.inl
   }
 }
 
diff --git a/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.idl b/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.idl
index 215102417e6..b3fd614e74d 100644
--- a/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.idl
+++ b/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.idl
@@ -44,11 +44,13 @@ interface umface {};
 abstract interface IfAb
 {
   long op (out long value);
+  attribute long attr;
 };
 
 interface IfConcr : IfAb
 {
   long concr_op (out long value);
+  attribute long concr_attr;
 };
 
 #if !defined (CCM_LW)
diff --git a/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.mpc b/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.mpc
index d304ea6c99d..03068d46826 100644
--- a/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.mpc
+++ b/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.mpc
@@ -98,7 +98,6 @@ project(Cornucopia_skel) : ccm_svnt {
   }
 
   Inline_Files {
-    CornucopiaS.inl
   }
 }
 
diff --git a/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc b/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc
index ce745f5e1c2..5aeb294873b 100644
--- a/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc
+++ b/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc
@@ -118,7 +118,6 @@ project(Inherited_Components_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    Inherited_componentsS.inl
   }
 }
 
diff --git a/CIAO/tests/IDL_Test/Extension/Cornucopia.mpc b/CIAO/tests/IDL_Test/Extension/Cornucopia.mpc
index 88ea286251b..d90968870dc 100644
--- a/CIAO/tests/IDL_Test/Extension/Cornucopia.mpc
+++ b/CIAO/tests/IDL_Test/Extension/Cornucopia.mpc
@@ -1,6 +1,7 @@
 // $Id$
 
 project(Cornucopia_Ext_idl_gen) : componentidldefaults {
+  requires += dummy_label
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CORNUCOPIA_STUB_Export \
               -Wb,stub_export_include=Cornucopia_stub_export.h \
@@ -19,6 +20,7 @@ project(Cornucopia_Ext_idl_gen) : componentidldefaults {
 }
 
 project(Cornucopia_Ext_lem_gen) : ciaoidldefaults {
+  requires += dummy_label
   custom_only = 1
   after += Cornucopia_Ext_idl_gen
   idlflags += -Wb,export_macro=CORNUCOPIA_EXEC_Export \
@@ -32,6 +34,7 @@ project(Cornucopia_Ext_lem_gen) : ciaoidldefaults {
 }
 
 project(Cornucopia_Ext_stub) : ccm_stub {
+  requires += dummy_label
   after += Cornucopia_Ext_idl_gen
 
   sharedname = Cornucopia_stub
@@ -55,6 +58,7 @@ project(Cornucopia_Ext_stub) : ccm_stub {
 }
 
 project(Cornucopia_Ext_exec) : ciao_executor, ccm_extension_stub {
+  requires += dummy_label
   after   += Cornucopia_Ext_lem_gen Cornucopia_Ext_stub
   sharedname = Cornucopia_exec
   libs += Cornucopia_stub
@@ -81,6 +85,7 @@ project(Cornucopia_Ext_exec) : ciao_executor, ccm_extension_stub {
 }
 
 project(Cornucopia_Ext_skel) : ccm_svnt, ccm_extension_stub {
+  requires += dummy_label
   after += Cornucopia_Ext_stub
   sharedname = Cornucopia_skel
   libs += Cornucopia_stub
@@ -100,11 +105,11 @@ project(Cornucopia_Ext_skel) : ccm_svnt, ccm_extension_stub {
   }
 
   Inline_Files {
-    CornucopiaS.inl
   }
 }
 
 project(Cornucopia_Ext_svnt) : ciao_servant, ccm_extension_stub, ciao_extension_container_stub {
+  requires += dummy_label
   after      += Cornucopia_Ext_exec Cornucopia_Ext_skel Cornucopia_Ext_stub
   sharedname  = Cornucopia_svnt
   libs       += Cornucopia_exec \
diff --git a/CIAO/tests/IDL_Test/Glfa/A.mpc b/CIAO/tests/IDL_Test/Glfa/A.mpc
index 227a2fe401b..187148ddcd1 100644
--- a/CIAO/tests/IDL_Test/Glfa/A.mpc
+++ b/CIAO/tests/IDL_Test/Glfa/A.mpc
@@ -61,7 +61,6 @@ project(Glfa_A_skel) : ciao_executor   {
   }
 
   Inline_Files {
-    AS.inl
   }
 }
 
diff --git a/CIAO/tests/IDL_Test/Glfa/B.mpc b/CIAO/tests/IDL_Test/Glfa/B.mpc
index b8ce9440f68..6e65a5ea3de 100644
--- a/CIAO/tests/IDL_Test/Glfa/B.mpc
+++ b/CIAO/tests/IDL_Test/Glfa/B.mpc
@@ -126,7 +126,6 @@ project(Glfa_B_svnt) : ciao_servant   {
   }
 
   Inline_Files {
-    BS.inl
   }
 }
 
diff --git a/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl b/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl
index 6ad2f2c52d0..48821950eb1 100644
--- a/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl
+++ b/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl
@@ -256,7 +256,7 @@ module Ast<typename T,
       raises (S);
   };
 
-  alias second<T, S> second_ref;
+  alias second<S, T> second_ref;
 
   valuetype VT_T : V supports T
   {
diff --git a/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.mpc b/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.mpc
index 25eea2842f9..d9a3f079839 100644
--- a/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.mpc
+++ b/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.mpc
@@ -101,7 +101,6 @@ project(KitchenSink_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    KitchenSinkS.inl
   }
 }
 
@@ -141,7 +140,6 @@ project(KitchenSink_IDL2_skel) : ciao_executor, avoids_ccm_noevent{
 
   Inline_Files {
     KitchenSink_IDL2C.inl
-    KitchenSink_IDL2S.inl
   }
 }
 
diff --git a/CIAO/tests/IDL_Test/Included_Component/IC_Bar.mpc b/CIAO/tests/IDL_Test/Included_Component/IC_Bar.mpc
index 29da29c8549..0a0838b0b15 100644
--- a/CIAO/tests/IDL_Test/Included_Component/IC_Bar.mpc
+++ b/CIAO/tests/IDL_Test/Included_Component/IC_Bar.mpc
@@ -98,7 +98,6 @@ project(IC_Bar_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    IC_BarS.inl
   }
 }
 
diff --git a/CIAO/tests/IDL_Test/Included_Component/IC_Foo.mpc b/CIAO/tests/IDL_Test/Included_Component/IC_Foo.mpc
index a67cdacab12..1d158ef9d8e 100644
--- a/CIAO/tests/IDL_Test/Included_Component/IC_Foo.mpc
+++ b/CIAO/tests/IDL_Test/Included_Component/IC_Foo.mpc
@@ -97,7 +97,6 @@ project(IC_Foo_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    IC_FooS.inl
   }
 }
 
diff --git a/CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.mpc b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.mpc
index f61c1cff337..4ba77224976 100644
--- a/CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.mpc
+++ b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.mpc
@@ -122,6 +122,5 @@ project(Base_svnt) : ciao_servant   {
   }
 
   Inline_Files {
-    BaseS.inl
   }
 }
diff --git a/CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.mpc b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.mpc
index 6d4d8337d77..c291f0dbd9c 100644
--- a/CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.mpc
+++ b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.mpc
@@ -138,7 +138,6 @@ project(Base_Derived_svnt) : ciao_servant   {
   }
 
   Inline_Files {
-    DerivedS.inl
   }
 }
 
diff --git a/CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.mpc b/CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.mpc
index e6223176d1b..a47f9b75728 100644
--- a/CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.mpc
+++ b/CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.mpc
@@ -138,7 +138,6 @@ project(IhC_Foo_IhC_Bar_svnt) : ciao_servant   {
   }
 
   Inline_Files {
-    IhC_BarS.inl
   }
 }
 
diff --git a/CIAO/tests/IDL_Test/Inherited_Component/IhC_Foo.mpc b/CIAO/tests/IDL_Test/Inherited_Component/IhC_Foo.mpc
index 0f223c00acb..c4ee937fc5a 100644
--- a/CIAO/tests/IDL_Test/Inherited_Component/IhC_Foo.mpc
+++ b/CIAO/tests/IDL_Test/Inherited_Component/IhC_Foo.mpc
@@ -126,7 +126,6 @@ project(IhC_Foo_svnt) : ciao_servant   {
   }
 
   Inline_Files {
-    IhC_FooS.inl
   }
 }
 
diff --git a/CIAO/tests/IDL_Test/Inherited_Servants/Base.idl b/CIAO/tests/IDL_Test/Inherited_Servants/Base.idl
new file mode 100644
index 00000000000..6e570086ee9
--- /dev/null
+++ b/CIAO/tests/IDL_Test/Inherited_Servants/Base.idl
@@ -0,0 +1,28 @@
+// $Id$
+
+#ifndef BASE_IDL
+#define BASE_IDL
+
+#include <Components.idl>
+
+#pragma ciao lem "BaseE.idl"
+
+module Inherited
+{
+  interface base_interface {
+//     void do_base ();
+//     attribute string str_base_interface;
+  };
+};
+
+module Inherited
+{
+   component Base_comp
+   {
+      provides Inherited::base_interface prov_base;
+      uses     Inherited::base_interface uses_base;
+      attribute long base;
+   };
+};
+
+#endif
diff --git a/CIAO/tests/IDL_Test/Inherited_Servants/Base.mpc b/CIAO/tests/IDL_Test/Inherited_Servants/Base.mpc
new file mode 100644
index 00000000000..c67cafa359b
--- /dev/null
+++ b/CIAO/tests/IDL_Test/Inherited_Servants/Base.mpc
@@ -0,0 +1,127 @@
+// $Id$
+// This file is generated with "generate_component_mpc.pl Base"
+
+project(IS_Base_idl_gen) : componentidldefaults {
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=IS_BASE_STUB_Export \
+              -Wb,stub_export_include=Base_stub_export.h \
+              -Wb,skel_export_macro=IS_BASE_SVNT_Export \
+              -Wb,skel_export_include=Base_svnt_export.h \
+              -Wb,exec_export_macro=IS_BASE_EXEC_Export \
+              -Wb,exec_export_include=Base_exec_export.h \
+              -Gex
+
+  IDL_Files {
+    Base.idl
+  }
+}
+
+project(IS_Base_lem_gen) : ciaoidldefaults {
+  after += IS_Base_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=IS_BASE_LEM_STUB_Export \
+              -Wb,stub_export_include=Base_lem_stub_export.h \
+              -SS -Gxhst
+
+  IDL_Files {
+    BaseE.idl
+  }
+}
+
+project(IS_Base_lem_stub) : ccm_svnt   {
+  after += IS_Base_lem_gen IS_Base_stub
+  libs  += IS_Base_stub
+
+  sharedname = IS_Base_lem_stub
+  dynamicflags += IS_BASE_LEM_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    BaseEC.cpp
+  }
+
+  Header_Files {
+    BaseEC.h
+    Base_lem_stub_export.h
+  }
+
+  Inline_Files {
+    BaseEC.inl
+  }
+}
+
+project(IS_Base_stub) : ccm_stub   {
+  after += IS_Base_idl_gen
+  libs  +=
+
+  sharedname = IS_Base_stub
+  dynamicflags += IS_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    BaseC.cpp
+  }
+
+  Header_Files {
+    BaseC.h
+    Base_stub_export.h
+  }
+
+  Inline_Files {
+    BaseC.inl
+  }
+}
+
+project(IS_Base_exec) : ciao_executor   {
+  after   += IS_Base_lem_stub IS_Base_stub
+  sharedname = IS_Base_exec
+  libs += IS_Base_stub IS_Base_lem_stub
+
+  dynamicflags += IS_BASE_EXEC_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    Base_exec.cpp
+  }
+
+  Header_Files {
+    Base_exec.h
+    Base_exec_export.h
+  }
+
+  Inline_Files {
+  }
+}
+
+
+project(IS_Base_svnt) : ciao_servant   {
+  after      += IS_Base_lem_stub
+  sharedname  = IS_Base_svnt
+  libs       += IS_Base_stub IS_Base_lem_stub
+
+  dynamicflags += IS_BASE_SVNT_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    BaseS.cpp
+    Base_svnt.cpp
+  }
+
+  Header_Files {
+    BaseS.h
+    Base_svnt.h
+    Base_svnt_export.h
+  }
+
+  Inline_Files {
+    BaseS.inl
+  }
+}
diff --git a/CIAO/tests/IDL_Test/Inherited_Servants/Derived.idl b/CIAO/tests/IDL_Test/Inherited_Servants/Derived.idl
new file mode 100644
index 00000000000..831af3282ff
--- /dev/null
+++ b/CIAO/tests/IDL_Test/Inherited_Servants/Derived.idl
@@ -0,0 +1,65 @@
+// $Id$
+
+#ifndef DERIVED_IDL
+#define DERIVED_IDL
+
+#include <Components.idl>
+
+#include "Base.idl"
+
+#pragma ciao lem "DerivedE.idl"
+
+module Inherited
+{
+  interface derived_interface {
+    void do_derived ();
+    readonly attribute string str_derived_interface;
+  };
+
+  interface derived_2_interface : derived_interface {
+    void do_derived_2 ();
+    readonly attribute string str_derived_interface_2;
+  };
+
+  interface Tester
+  {
+    void set_long_base (in long base);
+    long get_long_base ();
+
+    void set_long_derived (in long derived);
+    long get_long_derived ();
+  };
+
+  component Derived_comp : Inherited::Base_comp
+    supports Inherited::Tester
+  {
+    provides Inherited::derived_interface prov_derived;
+    uses     Inherited::derived_interface uses_derived;
+
+    attribute long derived;
+  };
+
+  component Derived_2_comp : Inherited::Derived_comp
+  {
+    provides Inherited::derived_2_interface prov_derived_2;
+    uses     Inherited::derived_2_interface uses_derived_2;
+
+    attribute long derived_2;
+  };
+};
+
+// Without a module
+interface derived_3_interface : Inherited::derived_interface {
+  void do_derived_3 ();
+  readonly attribute string str_derived_interface_3;
+};
+
+component Derived_3_comp : Inherited::Derived_comp
+{
+  provides derived_3_interface prov_derived_3;
+  uses     derived_3_interface uses_derived_3;
+
+  attribute long derived_3;
+};
+
+#endif /* DERIVED_IDL */
diff --git a/CIAO/tests/IDL_Test/Inherited_Servants/Derived.mpc b/CIAO/tests/IDL_Test/Inherited_Servants/Derived.mpc
new file mode 100644
index 00000000000..dc83639de9d
--- /dev/null
+++ b/CIAO/tests/IDL_Test/Inherited_Servants/Derived.mpc
@@ -0,0 +1,163 @@
+// $Id$
+// This file is generated with "generate_component_mpc.pl -p IhC_Foo Derived"
+
+project(IS_Base_Derived_idl_gen) : componentidldefaults {
+  custom_only = 1
+  after += IS_Base_idl_gen
+  idlflags += -Wb,stub_export_macro=IS_DERIVED_STUB_Export \
+              -Wb,stub_export_include=Derived_stub_export.h \
+              -Wb,skel_export_macro=IS_DERIVED_SVNT_Export \
+              -Wb,skel_export_include=Derived_svnt_export.h \
+              -Wb,exec_export_macro=IS_DERIVED_EXEC_Export \
+              -Wb,exec_export_include=Derived_exec_export.h \
+              -Gex
+
+  IDL_Files {
+    Derived.idl
+  }
+}
+
+project(IS_Base_Derived_lem_gen) : ciaoidldefaults {
+  after += IS_Base_Derived_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=IS_DERIVED_LEM_STUB_Export \
+              -Wb,stub_export_include=Derived_lem_stub_export.h \
+              -SS -Gxhst
+
+  IDL_Files {
+    DerivedE.idl
+  }
+}
+
+project(IS_Base_Derived_lem_stub) : ccm_svnt   {
+  after += IS_Base_Derived_lem_gen \
+           IS_Base_Derived_stub \
+           IS_Base_stub \
+           IS_Base_lem_stub
+  libs  += IS_Base_stub \
+           IS_Base_lem_stub \
+           IS_Derived_stub
+
+  sharedname = IS_Derived_lem_stub
+  dynamicflags += IS_DERIVED_LEM_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    DerivedEC.cpp
+  }
+
+  Header_Files {
+    DerivedEC.h
+    Derived_lem_stub_export.h
+  }
+
+  Inline_Files {
+    DerivedEC.inl
+  }
+}
+
+project(IS_Base_Derived_stub) : ccm_stub   {
+  after += IS_Base_Derived_idl_gen IS_Base_stub
+  libs  += IS_Base_stub
+
+  sharedname = IS_Derived_stub
+  dynamicflags += IS_DERIVED_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    DerivedC.cpp
+  }
+
+  Header_Files {
+    DerivedC.h
+    Derived_stub_export.h
+  }
+
+  Inline_Files {
+    DerivedC.inl
+  }
+}
+
+project(IS_Base_Derived_exec) : ciao_executor   {
+  after   += IS_Base_Derived_lem_gen \
+             IS_Base_Derived_lem_stub \
+             IS_Base_Derived_stub \
+             IS_Base_exec
+  sharedname = IS_Derived_exec
+  libs += IS_Derived_stub \
+          IS_Derived_lem_stub \
+          IS_Base_stub \
+          IS_Base_lem_stub \
+          IS_Base_exec
+
+  dynamicflags += IS_DERIVED_EXEC_BUILD_DLL IS_BASE_EXEC_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    Derived_exec.cpp
+  }
+
+  Header_Files {
+    Derived_exec.h
+    Derived_exec_export.h
+  }
+
+  Inline_Files {
+  }
+}
+
+
+project(IS_Base_Derived_svnt) : ciao_servant   {
+  after      += IS_Base_svnt IS_Base_Derived_lem_stub
+  sharedname  = IS_Derived_svnt
+  libs       += IS_Derived_stub \
+                IS_Derived_lem_stub  \
+                IS_Base_stub \
+                IS_Base_lem_stub \
+                IS_Base_svnt
+
+  dynamicflags += IS_DERIVED_SVNT_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    DerivedS.cpp
+    Derived_svnt.cpp
+  }
+
+  Header_Files {
+    DerivedS.h
+    Derived_svnt.h
+    Derived_svnt_export.h
+  }
+
+  Inline_Files {
+    DerivedS.inl
+  }
+}
+
+
+project (IS_Derived_Tester) : ccm_stub, valuetype {
+  exename = Tester
+  after += IS_Base_Derived_stub
+  libs  += IS_Derived_stub IS_Base_stub
+  IDL_Files {
+  }
+
+  Source_Files {
+    Tester.cpp
+  }
+
+  Header_Files {
+  }
+
+  Inline_Files {
+  }
+}
diff --git a/CIAO/tests/IDL_Test/Inherited_Servants/Tester.cpp b/CIAO/tests/IDL_Test/Inherited_Servants/Tester.cpp
new file mode 100644
index 00000000000..71a1bc8cd45
--- /dev/null
+++ b/CIAO/tests/IDL_Test/Inherited_Servants/Tester.cpp
@@ -0,0 +1,81 @@
+//$Id$
+/*
+ * @file Tester.cpp
+ *
+ * @author Marcel Smit
+ */
+
+
+#include "DerivedC.h"
+#include "ace/streams.h"
+#include "ace/Get_Opt.h"
+
+const ACE_TCHAR *tester_ior = ACE_TEXT ("file://Derived.ior");
+
+int
+parse_args (int argc, ACE_TCHAR *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("ek:n:"));
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    {
+      switch (c)
+        {
+          case 'k':
+            tester_ior = get_opts.opt_arg ();
+            break;
+
+          case '?':
+          default:
+            ACE_ERROR_RETURN ((LM_ERROR,
+                              "usage:  %s\n"
+                              "-k <Derived IOR> (default is file://Derived.ior)\n"
+                              "\n",
+                              argv [0]),
+                              -1);
+        }
+    }
+
+  return 0;
+}
+
+
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
+{
+  try
+    {
+      // initialize the ORB
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv);
+      if (parse_args (argc, argv) != 0)
+        {
+          return -1;
+        }
+
+      // create the factory object reference,
+      CORBA::Object_var tester_obj =
+        orb->string_to_object (tester_ior);
+
+      // downcast the object reference to the appropriate type
+//       ::Inherited::Tester_var tester =
+//         ::Inherited::Tester::_narrow (tester_obj.in ());
+
+//       if (CORBA::is_nil (tester.in ()))
+//         {
+//           ACE_ERROR_RETURN ((LM_ERROR,
+//                             "Unable to acquire 'Tester' objref\n"),
+//                             -1);
+//         }
+
+      orb->destroy ();
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Who is the culprit in the Tester?\n");
+      ACE_ERROR_RETURN ((LM_ERROR,
+                          "Uncaught CORBA exception\n"),
+                        1);
+    }
+  return 0;
+}
diff --git a/CIAO/tests/IDL_Test/Keywords/Keywords.mpc b/CIAO/tests/IDL_Test/Keywords/Keywords.mpc
index 82afaf5b642..1bb1e90bbfa 100644
--- a/CIAO/tests/IDL_Test/Keywords/Keywords.mpc
+++ b/CIAO/tests/IDL_Test/Keywords/Keywords.mpc
@@ -102,7 +102,6 @@ project(Keyword_Clash_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    Keyword_ClashS.inl
   }
 }
 
diff --git a/CIAO/tests/IDL_Test/Lem_Pragma/Lem_Pragma.mpc b/CIAO/tests/IDL_Test/Lem_Pragma/Lem_Pragma.mpc
index e8c76560010..d184065407d 100644
--- a/CIAO/tests/IDL_Test/Lem_Pragma/Lem_Pragma.mpc
+++ b/CIAO/tests/IDL_Test/Lem_Pragma/Lem_Pragma.mpc
@@ -127,9 +127,6 @@ project(Lem_Pragma_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    AS.inl
-    BS.inl
-    CS.inl
   }
 }
 
diff --git a/CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export.mpc b/CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export.mpc
index 84b6fbd3f02..e25fb3e31a3 100644
--- a/CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export.mpc
+++ b/CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export.mpc
@@ -121,7 +121,6 @@ project(Lem_Export_svnt) : ciao_servant   {
   }
 
   Inline_Files {
-    Lem_ExportS.inl
   }
 }
 
diff --git a/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.mpc b/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.mpc
index cd0dd2c06e4..bc129212402 100644
--- a/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.mpc
+++ b/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.mpc
@@ -171,6 +171,5 @@ project(NT_Connector_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    NonTopic_ConnectorS.inl
   }
 }
diff --git a/CIAO/tests/IDL_Test/PIDL_Include/PIDLInclude.mpc b/CIAO/tests/IDL_Test/PIDL_Include/PIDLInclude.mpc
index 700204eeea9..6e2189c4215 100644
--- a/CIAO/tests/IDL_Test/PIDL_Include/PIDLInclude.mpc
+++ b/CIAO/tests/IDL_Test/PIDL_Include/PIDLInclude.mpc
@@ -124,7 +124,6 @@ project(PIDLInclude_svnt) : ciao_servant   {
   }
 
   Inline_Files {
-    PIDLIncludeS.inl
   }
 }
 
diff --git a/CIAO/tests/IDL_Test/Reused_Facet_Interface/Basic.mpc b/CIAO/tests/IDL_Test/Reused_Facet_Interface/Basic.mpc
index b91fdc8e08b..854e8da7918 100644
--- a/CIAO/tests/IDL_Test/Reused_Facet_Interface/Basic.mpc
+++ b/CIAO/tests/IDL_Test/Reused_Facet_Interface/Basic.mpc
@@ -75,7 +75,6 @@ project(Reused_Facet_Interface_Basic_skel) : ciao_executor {
   }
 
   Inline_Files {
-    BasicS.inl
   }
 }
 
diff --git a/CIAO/tests/IDL_Test/Reused_Facet_Interface/Reused_Facet_Interface.mpc b/CIAO/tests/IDL_Test/Reused_Facet_Interface/Reused_Facet_Interface.mpc
index b57d6b75eae..c985a972f7b 100644
--- a/CIAO/tests/IDL_Test/Reused_Facet_Interface/Reused_Facet_Interface.mpc
+++ b/CIAO/tests/IDL_Test/Reused_Facet_Interface/Reused_Facet_Interface.mpc
@@ -105,7 +105,6 @@ project(Reused_Facet_Interface_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    CodeGenS.inl
   }
 }
 
diff --git a/CIAO/tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.mpc b/CIAO/tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.mpc
index 5c25f2de231..c36a8ae51c0 100644
--- a/CIAO/tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.mpc
+++ b/CIAO/tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.mpc
@@ -101,6 +101,5 @@ project(TwoTemplArgs_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    TwoTemplArgsS.inl
   }
 }
diff --git a/CIAO/tests/Minimum/Minimum_Base/Minimum_Base.mpc b/CIAO/tests/Minimum/Minimum_Base/Minimum_Base.mpc
index 83639691569..06331d9c2ea 100644
--- a/CIAO/tests/Minimum/Minimum_Base/Minimum_Base.mpc
+++ b/CIAO/tests/Minimum/Minimum_Base/Minimum_Base.mpc
@@ -58,7 +58,6 @@ project(Minimum_Base_skel) : ccm_stub, portableserver {
   }
 
   Inline_Files {
-    Minimum_BaseS.inl
   }
 }
 
diff --git a/CIAO/tests/Minimum/Receiver/Receiver.mpc b/CIAO/tests/Minimum/Receiver/Receiver.mpc
index 69d6b20874c..e79e6619e8e 100644
--- a/CIAO/tests/Minimum/Receiver/Receiver.mpc
+++ b/CIAO/tests/Minimum/Receiver/Receiver.mpc
@@ -127,7 +127,6 @@ project(Minimum_Base_Receiver_svnt) : ciao_servant   {
   }
 
   Inline_Files {
-    ReceiverS.inl
   }
 }
 
diff --git a/CIAO/tests/Minimum/Sender/Sender.mpc b/CIAO/tests/Minimum/Sender/Sender.mpc
index c2bf6997a28..302695e6e4a 100644
--- a/CIAO/tests/Minimum/Sender/Sender.mpc
+++ b/CIAO/tests/Minimum/Sender/Sender.mpc
@@ -106,7 +106,6 @@ project(Minimum_Base_Sender_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    SenderS.inl
   }
 }
 
diff --git a/CIAO/tests/Thread/Receiver/Receiver.mpc b/CIAO/tests/Thread/Receiver/Receiver.mpc
index 6a200153a2a..41537017b9c 100644
--- a/CIAO/tests/Thread/Receiver/Receiver.mpc
+++ b/CIAO/tests/Thread/Receiver/Receiver.mpc
@@ -107,7 +107,6 @@ project(Thread_Receiver_skel) : ccm_svnt {
   }
 
   Inline_Files {
-    ReceiverS.inl
   }
 }
 
diff --git a/CIAO/tests/Thread/Sender/Sender.mpc b/CIAO/tests/Thread/Sender/Sender.mpc
index fe60b393f19..95b07882af4 100644
--- a/CIAO/tests/Thread/Sender/Sender.mpc
+++ b/CIAO/tests/Thread/Sender/Sender.mpc
@@ -113,7 +113,6 @@ project(Thread_Sender_svnt) : ciao_servant {
   }
 
   Inline_Files {
-    SenderS.inl
   }
 }
 
diff --git a/CIAO/tests/Thread/Thread_Base/Thread_Base.mpc b/CIAO/tests/Thread/Thread_Base/Thread_Base.mpc
index f92a98d874f..506204f343e 100644
--- a/CIAO/tests/Thread/Thread_Base/Thread_Base.mpc
+++ b/CIAO/tests/Thread/Thread_Base/Thread_Base.mpc
@@ -71,7 +71,6 @@ project(Thread_Base_skel) : ccm_svnt {
   }
 
   Inline_Files {
-    Thread_BaseS.inl
   }
 }
 
diff --git a/CIAO/tutorials/Quoter/Simple/Broker/StockBroker.mpc b/CIAO/tutorials/Quoter/Simple/Broker/StockBroker.mpc
index 1fa92c57c16..9ca5e3babea 100644
--- a/CIAO/tutorials/Quoter/Simple/Broker/StockBroker.mpc
+++ b/CIAO/tutorials/Quoter/Simple/Broker/StockBroker.mpc
@@ -10,7 +10,7 @@ project(Stock_Base_StockBroker_idl_gen) : componentidldefaults, avoids_ccm_noeve
               -Wb,skel_export_include=StockBroker_svnt_export.h \
               -Wb,exec_export_macro=STOCKBROKER_EXEC_Export \
               -Wb,exec_export_include=StockBroker_exec_export.h \
-              -Gxhex -Gxhsk -Gxhst
+              -Gxhex -Gxhsk -Gxhst 
 
   IDL_Files {
     StockBroker.idl
@@ -22,7 +22,7 @@ project(Stock_Base_StockBroker_lem_gen) : ciaoidldefaults, avoids_ccm_noevent {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=STOCKBROKER_LEM_STUB_Export \
               -Wb,stub_export_include=StockBroker_lem_stub_export.h \
-              -SS -Gxhst
+              -SS -Gxhst 
 
   IDL_Files {
     StockBrokerE.idl
@@ -32,6 +32,7 @@ project(Stock_Base_StockBroker_lem_gen) : ciaoidldefaults, avoids_ccm_noevent {
 project(Stock_Base_StockBroker_lem_stub) : ccm_svnt, avoids_ccm_noevent {
   after += Stock_Base_StockBroker_lem_gen Stock_Base_StockBroker_stub Stock_Base_stub Stock_Base_lem_stub
   libs  += Stock_Base_stub Stock_Base_lem_stub StockBroker_stub
+  
   libpaths += ../lib
   libout = ../lib
   sharedname = StockBroker_lem_stub
@@ -57,6 +58,7 @@ project(Stock_Base_StockBroker_lem_stub) : ccm_svnt, avoids_ccm_noevent {
 project(Stock_Base_StockBroker_stub) : ccm_stub, avoids_ccm_noevent {
   after += Stock_Base_StockBroker_idl_gen Stock_Base_stub Stock_Base_lem_stub
   libs  += Stock_Base_stub Stock_Base_lem_stub
+  
   libpaths += ../lib
   libout = ../lib
   sharedname = StockBroker_stub
@@ -83,6 +85,7 @@ project(Stock_Base_StockBroker_exec) : ciao_executor, avoids_ccm_noevent {
   after   += Stock_Base_lem_stub Stock_Base_StockBroker_lem_stub Stock_Base_StockBroker_stub
   sharedname = StockBroker_exec
   libs += Stock_Base_lem_stub StockBroker_stub StockBroker_lem_stub Stock_Base_stub Stock_Base_lem_stub
+  
   libpaths += ../lib
   libout = ../lib
   dynamicflags += STOCKBROKER_EXEC_BUILD_DLL
@@ -111,6 +114,7 @@ project(Stock_Base_StockBroker_svnt) : ciao_servant, avoids_ccm_noevent  {
                 Stock_Base_skel \
                 Stock_Base_stub \
                 Stock_Base_lem_stub
+  
   libpaths += ../lib
   libout = ../lib
   dynamicflags += STOCKBROKER_SVNT_BUILD_DLL
@@ -126,11 +130,15 @@ project(Stock_Base_StockBroker_svnt) : ciao_servant, avoids_ccm_noevent  {
   Header_Files {
     StockBrokerS.h
     StockBroker_svnt.h
+    StockBroker_svnt_T.h
     StockBroker_svnt_export.h
   }
 
+  Template_Files {
+    StockBroker_svnt_T.cpp
+  }
+
   Inline_Files {
-    StockBrokerS.inl
   }
 }
 
@@ -138,6 +146,7 @@ project (Stock_Base_StockBrokerDriver) : ccm_stub, valuetype, avoids_ccm_noevent
   exename = StockBrokerDriver
   after += Stock_Base_StockBroker_stub
   libs  += StockBroker_stub Stock_Base_stub Stock_Base_lem_stub
+  
   libpaths += ../lib
   exeout = ../lib
   IDL_Files {
diff --git a/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc b/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc
index 4690c2030dc..3e96a70a10a 100644
--- a/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc
+++ b/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc
@@ -10,7 +10,7 @@ project(Stock_Base_StockDistributor_idl_gen) : componentidldefaults, avoids_ccm_
               -Wb,skel_export_include=StockDistributor_svnt_export.h \
               -Wb,exec_export_macro=STOCKDISTRIBUTOR_EXEC_Export \
               -Wb,exec_export_include=StockDistributor_exec_export.h \
-              -Gxhex -Gxhsk -Gxhst
+              -Gxhex -Gxhsk -Gxhst 
 
   IDL_Files {
     StockDistributor.idl
@@ -22,7 +22,7 @@ project(Stock_Base_StockDistributor_lem_gen) : ciaoidldefaults, avoids_ccm_noeve
   custom_only = 1
   idlflags += -Wb,stub_export_macro=STOCKDISTRIBUTOR_LEM_STUB_Export \
               -Wb,stub_export_include=StockDistributor_lem_stub_export.h \
-              -SS -Gxhst
+              -SS -Gxhst 
 
   IDL_Files {
     StockDistributorE.idl
@@ -32,6 +32,7 @@ project(Stock_Base_StockDistributor_lem_gen) : ciaoidldefaults, avoids_ccm_noeve
 project(Stock_Base_StockDistributor_lem_stub) : ccm_svnt, avoids_ccm_noevent {
   after += Stock_Base_StockDistributor_lem_gen Stock_Base_StockDistributor_stub Stock_Base_stub Stock_Base_lem_stub
   libs  += Stock_Base_stub Stock_Base_lem_stub StockDistributor_stub
+  
   libpaths += ../lib
   libout = ../lib
   sharedname = StockDistributor_lem_stub
@@ -57,6 +58,7 @@ project(Stock_Base_StockDistributor_lem_stub) : ccm_svnt, avoids_ccm_noevent {
 project(Stock_Base_StockDistributor_stub) : ccm_stub, avoids_ccm_noevent {
   after += Stock_Base_StockDistributor_idl_gen Stock_Base_stub Stock_Base_lem_stub
   libs  += Stock_Base_stub Stock_Base_lem_stub
+  
   libpaths += ../lib
   libout = ../lib
   sharedname = StockDistributor_stub
@@ -83,6 +85,7 @@ project(Stock_Base_StockDistributor_exec) : ciao_executor, avoids_ccm_noevent {
   after   += Stock_Base_lem_stub Stock_Base_StockDistributor_lem_stub Stock_Base_StockDistributor_stub
   sharedname = StockDistributor_exec
   libs += Stock_Base_lem_stub StockDistributor_stub StockDistributor_lem_stub Stock_Base_stub Stock_Base_lem_stub
+  
   libpaths += ../lib
   libout = ../lib
   dynamicflags += STOCKDISTRIBUTOR_EXEC_BUILD_DLL
@@ -111,6 +114,7 @@ project(Stock_Base_StockDistributor_svnt) : ciao_servant, avoids_ccm_noevent  {
                 Stock_Base_skel \
                 Stock_Base_stub \
                 Stock_Base_lem_stub
+  
   libpaths += ../lib
   libout = ../lib
   dynamicflags += STOCKDISTRIBUTOR_SVNT_BUILD_DLL
@@ -126,11 +130,15 @@ project(Stock_Base_StockDistributor_svnt) : ciao_servant, avoids_ccm_noevent  {
   Header_Files {
     StockDistributorS.h
     StockDistributor_svnt.h
+    StockDistributor_svnt_T.h
     StockDistributor_svnt_export.h
   }
 
+  Template_Files {
+    StockDistributor_svnt_T.cpp
+  }
+
   Inline_Files {
-    StockDistributorS.inl
   }
 }
 
@@ -138,6 +146,7 @@ project (Stock_Base_StockDistributorDriver) : ccm_stub, valuetype, avoids_ccm_no
   exename = StockDistributorDriver
   after += Stock_Base_StockDistributor_stub
   libs  += StockDistributor_stub Stock_Base_stub Stock_Base_lem_stub
+  
   libpaths += ../lib
   exeout = ../lib
   IDL_Files {
diff --git a/CIAO/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc b/CIAO/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
index 0e78e03ed11..9aa72e8fc47 100644
--- a/CIAO/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
+++ b/CIAO/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
@@ -1,5 +1,5 @@
 // $Id$
-// This file is generated with "generate_component_mpc.pl -ne -l ../lib -o ../lib Stock_Base"
+// This file is generated with "generate_component_mpc.pl -n -e -l ../lib -o ../lib Stock_Base"
 
 project(Stock_Base_idl_gen) : componentidldefaults, avoids_ccm_noevent {
   custom_only = 1
@@ -8,7 +8,7 @@ project(Stock_Base_idl_gen) : componentidldefaults, avoids_ccm_noevent {
               -Wb,stub_export_include=Stock_Base_stub_export.h \
               -Wb,skel_export_macro=STOCK_BASE_SKEL_Export \
               -Wb,skel_export_include=Stock_Base_skel_export.h \
-              -Gxhex -Gxhsk -Gxhst
+              -Gxhex -Gxhsk -Gxhst 
 
   IDL_Files {
     Stock_Base.idl
@@ -20,7 +20,7 @@ project(Stock_Base_lem_gen) : ciaoidldefaults, avoids_ccm_noevent {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=STOCK_BASE_LEM_STUB_Export \
               -Wb,stub_export_include=Stock_Base_lem_stub_export.h \
-              -SS -Gxhst
+              -SS -Gxhst 
 
   IDL_Files {
     Stock_BaseE.idl
@@ -30,6 +30,7 @@ project(Stock_Base_lem_gen) : ciaoidldefaults, avoids_ccm_noevent {
 project(Stock_Base_lem_stub) : ccm_svnt, avoids_ccm_noevent {
   after += Stock_Base_lem_gen Stock_Base_stub 
   libs  +=  Stock_Base_stub
+  
   libpaths += ../lib
   libout = ../lib
   sharedname = Stock_Base_lem_stub
@@ -55,6 +56,7 @@ project(Stock_Base_lem_stub) : ccm_svnt, avoids_ccm_noevent {
 project(Stock_Base_stub) : ccm_stub, avoids_ccm_noevent {
   after += Stock_Base_idl_gen 
   libs  += 
+  
   libpaths += ../lib
   libout = ../lib
   sharedname = Stock_Base_stub
@@ -83,6 +85,7 @@ project(Stock_Base_skel) : ciao_executor, avoids_ccm_noevent  {
   sharedname  = Stock_Base_skel
   libs       += Stock_Base_stub
  
+  
   libpaths += ../lib
   libout = ../lib
   dynamicflags += STOCK_BASE_SKEL_BUILD_DLL
@@ -100,7 +103,6 @@ project(Stock_Base_skel) : ciao_executor, avoids_ccm_noevent  {
   }
 
   Inline_Files {
-    Stock_BaseS.inl
   }
 }
 
diff --git a/DAnCE/ChangeLog b/DAnCE/ChangeLog
index 0e4921f8072..0e0e6e9c1d3 100644
--- a/DAnCE/ChangeLog
+++ b/DAnCE/ChangeLog
@@ -1,420 +1,3 @@
-Wed Nov 02 08:30:13 UTC 2011  Martin Corino  <mcorino@remedy.nl>
-
-        Merged changes from Remedy work branch.
-
-        === start changelog ===
-
-        Thu Oct 27 10:10:00 UTC 2011  Martin Corino  <mcorino@remedy.nl>
-
-                * bin/ciao.localityconfig:
-
-                  Added CIAO_ReferenceLookup interceptor.
-
-                * dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp:
-
-                  Added collection of connections with exernalReference endpoints
-                  to LocalityManager_i::collect_references (without resolving).
-                  Resolving the references is deferred to be handled in a
-                  deployment interceptor. This allows for more control in the
-                  exact setup of external references without the overhead of
-                  unnecessary/unwanted resolution attempts based on (incorrect)
-                  assumptions of the nature of the external references.
-
-                * dance/Plan_Launcher/Plan_Launcher_Base.h:
-                * dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.h:
-                * dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp:
-
-                  Removed create_external_connections() method.
-
-        Wed Oct 26 10:13:47 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * tools/Domain_Validator/CORBA/CORBA_Domain_Validator.mpc:
-                  Using the correct dynamic flag now.
-
-        Wed Oct 26 09:44:25 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * tools/Domain_Validator/CORBA/CORBA_Domain_Validator.mpc:
-                  Merged Will's solution for compile issues on windows.
-
-        === end changelog ===
-
-Tue Nov  1 13:18:21 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp:
-        * dance/Plan_Launcher/Plan_Launcher_Base.h:
-        * dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.h:
-        * dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp:
-
-          Removed create_external_connections and moved functionality into the
-          LocalityManager.  Thanks to Martin Corino <mcorino@remedy.nl> for the
-          fixes.
-
-Sun Oct 30 22:42:44 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * bin/ciao.localityconfig:
-        * dance/LocalityManager/Scheduler/Events/Connect.cpp:
-        * dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp:
-
-          Moved name service resolution of external reference endpoints into the
-          CIAO deployment interceptors.
-
-Tue Oct 25 17:30:32 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Split_Plan/Split_Plan.cpp:
-
-          Moved openmp for loops inside __OPENMP ifdef, else we use
-          CORBA::ULong types for loop index.
-
-Tue Oct 25 17:29:44 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Domain_Validator/CORBA/CORBA_Domain_Validator.mpc:
-
-          Added missing dynamicflags directive.
-
-Sat Oct 22 22:01:01 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_export.h:
-        * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.h:
-
-          Export macros.
-
-Tue Oct 20 09:30:13 UTC 2011  Martin Corino  <mcorino@remedy.nl>
-
-        Merged changes from Remedy work branch.
-
-        === start changelog ===
-
-        Thu Oct 13 07:17:02 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * dance/Logger/Log_Macros.h:
-                  Fix complile errors when all logging is disabled.
-
-        Wed Oct 12 13:09:40 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * dance/DAnCE_Core.mpc:
-                * dance/LocalityManager/Configuration/Configuration.mpc:
-                * dance/LocalityManager/Interceptors/Error_Interceptors.mpc:
-                * dance/Plan_Launcher/Daemon/PL_Daemon.mpc:
-                * tools/Artifact_Installation/Artifact_Installation.mpc:
-                * tools/Convert_Plan/Convert_Plan.mpc:
-                * tools/Logger_Backend/ndds/NDDS_Logger.mpc:
-                * tools/System_Health/Interceptors/SHS_Interceptor.mpc:
-                * tools/System_Health/System_Health.mpc:
-                  Fixed several install issues.
-
-        === end changelog ===
-
-Thu Oct 20 02:37:36 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Split_Plan/Split_Plan.cpp:
-
-          Warnings.
-
-Wed Oct 19 19:14:34 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * MPC/config/dance_split_plan.mpb:
-        * tools/Split_Plan/Split_Plan.h:
-        * tools/Split_Plan/Split_Plan.cpp:
-        * tools/Split_Plan/Split_Plan.mpc:
-
-          Added capability to multithread the split plan process with openmp.
-
-Wed Oct 19 16:30:35 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * dance/DAnCE_Utility.h:
-
-          Add missing export macro.
-
-Wed Oct 19 05:03:16 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Domain_Validator/Domain_Validator.mpc:
-
-          Attempt at windows compile/linking issue.
-
-Mon Oct 17 17:27:17 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * dance/Plan_Launcher/Plan_Launcher.mpc:
-          stab at a static linking problem.
-
-        * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp:
-
-          warnings.
-
-Mon Oct 17 06:15:45 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Domain_Validator/CORBA/CORBA_Domain_Validator.mpc:
-
-          Missing from previous commit.
-
-Fri Oct 14 14:47:22 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * MPC/config/dance_domain_validator.mpb:
-
-          fuzz.
-
-Fri Oct 14 14:01:41 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * MPC/config/dance_domain_validator.mpb:
-
-          Missing from a previous commit.
-
-Fri Oct 14 02:31:06 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Domain_Validator/Domain_Validator.idl:
-        * tools/Domain_Validator/Domain_Validator.mpc:
-
-          Fuzz.
-
-Thu Oct 13 22:38:44 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * dance/Plan_Launcher/Plan_Launcher.cpp:
-        * tests/Plan_Launcher/NM-Delay/NodeMap.cdd:
-        * tests/Plan_Launcher/NM-Delay/run_test.pl:
-        * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp:
-
-          Added capability for the domain validator to check the liveness of the
-          ExecutionManager.
-
-Thu Oct 13 22:25:39 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * tests/Plan_Launcher/NM-Delay:
-        * tests/Plan_Launcher/NM-Delay/Deployment.cdp:
-        * tests/Plan_Launcher/NM-Delay/NodeMap.cdd:
-        * tests/Plan_Launcher/NM-Delay/run_test.pl:
-
-          Test for the domain validator.
-
-Thu Oct 13 22:24:56 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * dance/Plan_Launcher/Plan_Launcher.cpp:
-        * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.h:
-        * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp:
-
-          Bugfixes.
-
-Thu Oct 13 22:19:49 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Config_Handlers/XMLSchema/id_map.hpp:
-        * tools/Config_Handlers/XML_File_Intf.cpp:
-
-          1) the XML_Helper is no longer terminated in the File_Intf destructor,
-          this caused problems when several files were parsed in a single process.
-          2) We now reset the ID_Map before each parsing event.
-
-Thu Oct 13 19:10:36 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * dance/DAnCE_Utility.h:
-        * dance/DAnCE_Utility.cpp:
-        * dance/Plan_Launcher/Plan_Launcher.cpp:
-        * dance/Plan_Launcher/Plan_Launcher.mpc:
-        * tools/Domain_Validator:
-        * tools/Domain_Validator/CORBA:
-        * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.h:
-        * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp:
-        * tools/Domain_Validator/Domain_Validator.idl:
-        * tools/Domain_Validator/Domain_Validator.mpc:
-
-          Initial domain validator implementation.
-
-Thu Oct 13 19:05:45 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * dance/DAnCE_Properties.idl:
-
-          Corrected string literals for identifying CCM instance types.
-
-Mon Oct 10 08:48:51 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE version 1.0.5 released.
-
-Fri Oct  7 10:49:04 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * docs/sources/Error_Documentation.oo3/contents.xml:
-          Fuzz
-
-Fri Oct  7 09:46:53 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * docs/DAnCE_Logging.txt:
-        * docs/LocalityManager-Plugins.txt:
-          Fuzz.
-
-Fri Oct  7 09:21:58 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * dance/NodeManager/README:
-          Fuzz: Id-tags.
-
-Fri Oct  7 08:02:38 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * dance/LocalityManager/Daemon/Locality_Manager_Impl.h:
-          Fuzz: Trailing whitespace
-
-        * docs/sources/Error_Documentation.oo3/contents.xml:
-          Fuzz: No id-tag
-
-Thu Oct  6 12:37:04 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * dance/LocalityManager/Daemon/Locality_Manager_Impl.h:
-        * dance/LocalityManager/Daemon/Locality_Manager_Task.cpp:
-          Fuzz.
-
-Wed Oct  5 14:32:32 UTC 2011  William R. Otte  <wotte@dre.vanderbit.edu>
-
-        * dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp:
-        * dance/LocalityManager/Daemon/Locality_Manager_Task.cpp:
-
-          Fuzz.
-
-Tue Oct  4 19:42:56 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * dance/LocalityManager/Daemon/Locality_Manager_Impl.h:
-        * dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp:
-        * dance/LocalityManager/Daemon/Locality_Manager_Task.h:
-        * dance/LocalityManager/Daemon/Locality_Manager_Task.cpp:
-        * dance/LocalityManager/Scheduler/Plugin_Manager.h:
-        * dance/LocalityManager/Scheduler/Plugin_Manager.cpp:
-
-          Resolved some memory leaks in the pugin subsystem.
-
-Tue Oct  4 14:44:28 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * dance/LocalityManager/Scheduler/Events/Action_Base.cpp:
-
-          Reduce log priority of certain error messages.
-
-Tue Aug 23 18:17:43 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * NEWS:
-          Prepared for next release
-
-Tue Aug 23 19:01:44 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE version 1.0.4 released.
-
-Fri Jul 29 14:18:54 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * dance/LocalityManager/Configuration/CPU_Affinity.cpp:
-
-          unfuzz.
-
-Wed Jul 27 08:45:22 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * dance/LocalityManager/Configuration/CPU_Affinity.cpp:
-        * dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp:
-
-        Fixes to address crashing issues on some platforms.
-
-Sun Jul 10 16:21:29 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * docs/Error_Documentation/index.html:
-
-          Fuzz.
-
-Thu Jul  7 20:38:10 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * dance/LocalityManager/Configuration/Process_Name.cpp:
-
-          Updated to address a glibc error in some Linux distributions.
-
-Thu Jun 30 10:36:59 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * docs/Error_Documentation:
-        * docs/Error_Documentation/Checked.png:
-        * docs/Error_Documentation/Collapsed.png:
-        * docs/Error_Documentation/Expanded.png:
-        * docs/Error_Documentation/LeafRowHandle.png:
-        * docs/Error_Documentation/Mixed.png:
-        * docs/Error_Documentation/Unchecked.png:
-        * docs/Error_Documentation/blank.png:
-        * docs/Error_Documentation/index.html:
-        * docs/Error_Documentation/outliner.js:
-
-          Updated error documentation.
-
-        * docs/sources/Error_Documentation.oo3:
-        * docs/sources/Error_Documentation.oo3/contents.xml:
-
-          Source document for the error documentation.
-
-        * docs/Error_Messages.txt:
-
-          Removed this file.
-
-Thu Jun 23 12:39:08 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * etc/*.doxygen:
-          Disable html help, seems doxygen now disables the search option
-          when html help is enabled
-
-Thu Jun 23 13:46:08 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE version 1.0.3 released.
-
-Tue Jun  7 21:18:05 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * dance/Plan_Launcher/Plan_Launcher.cpp:
-        * tests/Plan_Launcher/EM-Delay/run_test_ns.pl:
-
-          Rework the plan launcher options a bit.  --em-ior is back to requiring an
-          argument, if no --{em,nm,lm}-ior option is specified, we default to
-          name service lookup.
-
-Fri Jun  3 12:07:41 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/dance_tests.lst:
-          Fixed location of tests
-
-Thu Jun  2 19:49:24 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * dance/Plan_Launcher/Plan_Launcher.cpp:
-
-          compile fix.
-
-Wed Jun  1 11:14:10 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * dance/Plan_Launcher/Plan_Launcher.cpp:
-
-          New option --manager-timeout which allows the user to indicate
-          to the plan_launcher that it should wait a specified number of
-          seconds for a manager (e.g., execution_manager) reference to
-          become valid before proceeding with deployment.
-
-        * tests/Plan_Launcher:
-        * tests/Plan_Launcher/EM-Delay:
-        * tests/Plan_Launcher/EM-Delay/run_test.pl:
-        * tests/Plan_Launcher/EM-Delay/run_test_ns.pl:
-        * bin/dance_tests.lst:
-
-          New test to excercise the new delay on manager reference functionality.
-
-Wed Jun  1 11:10:40 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * dance/ExecutionManager/ExecutionManager_Module.cpp:
-
-          Emit the IOR/register with the naming service closer to ORB
-          activation to reduce the possibility of a race condition with
-          the plan_launcher.
-
-Wed Jun  1 10:14:38 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * docs/Error_Messages.txt:
-
-          Beginning of error message documentation.
-
-Thu May 26 20:29:54 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * dance/NodeManager/Node_Manager_Module.cpp:
-        * dance/RepositoryManager/repository_manager_admin_exec.cpp:
-        * tools/Config_Handlers/SatisfierProperty_Handler.cpp:
-          Resolved gcc 4.6 warnings. Some variables were declared and assigned
-          a value but weren't used after that.
-
-Fri Apr 22 12:41:09 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * tools/Logger_Backend/ndds/svc.conf:
-          Fuzz: Added $Id string
-
-Wed Apr 20 09:52:52 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE version 1.0.2 released.
 
 Local Variables:
 mode: change-log
diff --git a/DAnCE/ChangeLogs/ChangeLog-2011b b/DAnCE/ChangeLogs/ChangeLog-2011b
new file mode 100644
index 00000000000..61b03291ffa
--- /dev/null
+++ b/DAnCE/ChangeLogs/ChangeLog-2011b
@@ -0,0 +1,444 @@
+Sun Dec 04 11:51:30 CET 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE version 1.0.6 released.
+
+Wed Nov 30 11:32:44 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * dance/LocalityManager/Scheduler/Plugin_Manager.cpp:
+          Initialise pointer with 0
+
+Wed Nov 30 11:31:40 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * dance/DAnCE_Core.mpc:
+        * dance/Deployment/Deployment_Core.mpc:
+          Remove S.inl files
+
+Wed Nov 23 17:27:01 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp:
+
+          Warning for Windows.
+
+Wed Nov 02 08:30:13 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        Merged changes from Remedy work branch.
+
+        === start changelog ===
+
+        Thu Oct 27 10:10:00 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+                * bin/ciao.localityconfig:
+
+                  Added CIAO_ReferenceLookup interceptor.
+
+                * dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp:
+
+                  Added collection of connections with exernalReference endpoints
+                  to LocalityManager_i::collect_references (without resolving).
+                  Resolving the references is deferred to be handled in a
+                  deployment interceptor. This allows for more control in the
+                  exact setup of external references without the overhead of
+                  unnecessary/unwanted resolution attempts based on (incorrect)
+                  assumptions of the nature of the external references.
+
+                * dance/Plan_Launcher/Plan_Launcher_Base.h:
+                * dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.h:
+                * dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp:
+
+                  Removed create_external_connections() method.
+
+        Wed Oct 26 10:13:47 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * tools/Domain_Validator/CORBA/CORBA_Domain_Validator.mpc:
+                  Using the correct dynamic flag now.
+
+        Wed Oct 26 09:44:25 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * tools/Domain_Validator/CORBA/CORBA_Domain_Validator.mpc:
+                  Merged Will's solution for compile issues on windows.
+
+        === end changelog ===
+
+Tue Nov  1 13:18:21 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp:
+        * dance/Plan_Launcher/Plan_Launcher_Base.h:
+        * dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.h:
+        * dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp:
+
+          Removed create_external_connections and moved functionality into the
+          LocalityManager.  Thanks to Martin Corino <mcorino@remedy.nl> for the
+          fixes.
+
+Sun Oct 30 22:42:44 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * bin/ciao.localityconfig:
+        * dance/LocalityManager/Scheduler/Events/Connect.cpp:
+        * dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp:
+
+          Moved name service resolution of external reference endpoints into the
+          CIAO deployment interceptors.
+
+Tue Oct 25 17:30:32 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tools/Split_Plan/Split_Plan.cpp:
+
+          Moved openmp for loops inside __OPENMP ifdef, else we use
+          CORBA::ULong types for loop index.
+
+Tue Oct 25 17:29:44 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tools/Domain_Validator/CORBA/CORBA_Domain_Validator.mpc:
+
+          Added missing dynamicflags directive.
+
+Sat Oct 22 22:01:01 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_export.h:
+        * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.h:
+
+          Export macros.
+
+Tue Oct 20 09:30:13 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        Merged changes from Remedy work branch.
+
+        === start changelog ===
+
+        Thu Oct 13 07:17:02 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * dance/Logger/Log_Macros.h:
+                  Fix complile errors when all logging is disabled.
+
+        Wed Oct 12 13:09:40 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * dance/DAnCE_Core.mpc:
+                * dance/LocalityManager/Configuration/Configuration.mpc:
+                * dance/LocalityManager/Interceptors/Error_Interceptors.mpc:
+                * dance/Plan_Launcher/Daemon/PL_Daemon.mpc:
+                * tools/Artifact_Installation/Artifact_Installation.mpc:
+                * tools/Convert_Plan/Convert_Plan.mpc:
+                * tools/Logger_Backend/ndds/NDDS_Logger.mpc:
+                * tools/System_Health/Interceptors/SHS_Interceptor.mpc:
+                * tools/System_Health/System_Health.mpc:
+                  Fixed several install issues.
+
+        === end changelog ===
+
+Thu Oct 20 02:37:36 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tools/Split_Plan/Split_Plan.cpp:
+
+          Warnings.
+
+Wed Oct 19 19:14:34 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * MPC/config/dance_split_plan.mpb:
+        * tools/Split_Plan/Split_Plan.h:
+        * tools/Split_Plan/Split_Plan.cpp:
+        * tools/Split_Plan/Split_Plan.mpc:
+
+          Added capability to multithread the split plan process with openmp.
+
+Wed Oct 19 16:30:35 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * dance/DAnCE_Utility.h:
+
+          Add missing export macro.
+
+Wed Oct 19 05:03:16 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tools/Domain_Validator/Domain_Validator.mpc:
+
+          Attempt at windows compile/linking issue.
+
+Mon Oct 17 17:27:17 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * dance/Plan_Launcher/Plan_Launcher.mpc:
+          stab at a static linking problem.
+
+        * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp:
+
+          warnings.
+
+Mon Oct 17 06:15:45 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tools/Domain_Validator/CORBA/CORBA_Domain_Validator.mpc:
+
+          Missing from previous commit.
+
+Fri Oct 14 14:47:22 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * MPC/config/dance_domain_validator.mpb:
+
+          fuzz.
+
+Fri Oct 14 14:01:41 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * MPC/config/dance_domain_validator.mpb:
+
+          Missing from a previous commit.
+
+Fri Oct 14 02:31:06 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tools/Domain_Validator/Domain_Validator.idl:
+        * tools/Domain_Validator/Domain_Validator.mpc:
+
+          Fuzz.
+
+Thu Oct 13 22:38:44 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * dance/Plan_Launcher/Plan_Launcher.cpp:
+        * tests/Plan_Launcher/NM-Delay/NodeMap.cdd:
+        * tests/Plan_Launcher/NM-Delay/run_test.pl:
+        * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp:
+
+          Added capability for the domain validator to check the liveness of the
+          ExecutionManager.
+
+Thu Oct 13 22:25:39 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tests/Plan_Launcher/NM-Delay:
+        * tests/Plan_Launcher/NM-Delay/Deployment.cdp:
+        * tests/Plan_Launcher/NM-Delay/NodeMap.cdd:
+        * tests/Plan_Launcher/NM-Delay/run_test.pl:
+
+          Test for the domain validator.
+
+Thu Oct 13 22:24:56 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * dance/Plan_Launcher/Plan_Launcher.cpp:
+        * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.h:
+        * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp:
+
+          Bugfixes.
+
+Thu Oct 13 22:19:49 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * tools/Config_Handlers/XMLSchema/id_map.hpp:
+        * tools/Config_Handlers/XML_File_Intf.cpp:
+
+          1) the XML_Helper is no longer terminated in the File_Intf destructor,
+          this caused problems when several files were parsed in a single process.
+          2) We now reset the ID_Map before each parsing event.
+
+Thu Oct 13 19:10:36 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * dance/DAnCE_Utility.h:
+        * dance/DAnCE_Utility.cpp:
+        * dance/Plan_Launcher/Plan_Launcher.cpp:
+        * dance/Plan_Launcher/Plan_Launcher.mpc:
+        * tools/Domain_Validator:
+        * tools/Domain_Validator/CORBA:
+        * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.h:
+        * tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp:
+        * tools/Domain_Validator/Domain_Validator.idl:
+        * tools/Domain_Validator/Domain_Validator.mpc:
+
+          Initial domain validator implementation.
+
+Thu Oct 13 19:05:45 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * dance/DAnCE_Properties.idl:
+
+          Corrected string literals for identifying CCM instance types.
+
+Mon Oct 10 08:48:51 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE version 1.0.5 released.
+
+Fri Oct  7 10:49:04 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * docs/sources/Error_Documentation.oo3/contents.xml:
+          Fuzz
+
+Fri Oct  7 09:46:53 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * docs/DAnCE_Logging.txt:
+        * docs/LocalityManager-Plugins.txt:
+          Fuzz.
+
+Fri Oct  7 09:21:58 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * dance/NodeManager/README:
+          Fuzz: Id-tags.
+
+Fri Oct  7 08:02:38 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * dance/LocalityManager/Daemon/Locality_Manager_Impl.h:
+          Fuzz: Trailing whitespace
+
+        * docs/sources/Error_Documentation.oo3/contents.xml:
+          Fuzz: No id-tag
+
+Thu Oct  6 12:37:04 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * dance/LocalityManager/Daemon/Locality_Manager_Impl.h:
+        * dance/LocalityManager/Daemon/Locality_Manager_Task.cpp:
+          Fuzz.
+
+Wed Oct  5 14:32:32 UTC 2011  William R. Otte  <wotte@dre.vanderbit.edu>
+
+        * dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp:
+        * dance/LocalityManager/Daemon/Locality_Manager_Task.cpp:
+
+          Fuzz.
+
+Tue Oct  4 19:42:56 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * dance/LocalityManager/Daemon/Locality_Manager_Impl.h:
+        * dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp:
+        * dance/LocalityManager/Daemon/Locality_Manager_Task.h:
+        * dance/LocalityManager/Daemon/Locality_Manager_Task.cpp:
+        * dance/LocalityManager/Scheduler/Plugin_Manager.h:
+        * dance/LocalityManager/Scheduler/Plugin_Manager.cpp:
+
+          Resolved some memory leaks in the pugin subsystem.
+
+Tue Oct  4 14:44:28 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * dance/LocalityManager/Scheduler/Events/Action_Base.cpp:
+
+          Reduce log priority of certain error messages.
+
+Tue Aug 23 18:17:43 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * NEWS:
+          Prepared for next release
+
+Tue Aug 23 19:01:44 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE version 1.0.4 released.
+
+Fri Jul 29 14:18:54 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * dance/LocalityManager/Configuration/CPU_Affinity.cpp:
+
+          unfuzz.
+
+Wed Jul 27 08:45:22 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * dance/LocalityManager/Configuration/CPU_Affinity.cpp:
+        * dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp:
+
+        Fixes to address crashing issues on some platforms.
+
+Sun Jul 10 16:21:29 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * docs/Error_Documentation/index.html:
+
+          Fuzz.
+
+Thu Jul  7 20:38:10 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * dance/LocalityManager/Configuration/Process_Name.cpp:
+
+          Updated to address a glibc error in some Linux distributions.
+
+Thu Jun 30 10:36:59 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * docs/Error_Documentation:
+        * docs/Error_Documentation/Checked.png:
+        * docs/Error_Documentation/Collapsed.png:
+        * docs/Error_Documentation/Expanded.png:
+        * docs/Error_Documentation/LeafRowHandle.png:
+        * docs/Error_Documentation/Mixed.png:
+        * docs/Error_Documentation/Unchecked.png:
+        * docs/Error_Documentation/blank.png:
+        * docs/Error_Documentation/index.html:
+        * docs/Error_Documentation/outliner.js:
+
+          Updated error documentation.
+
+        * docs/sources/Error_Documentation.oo3:
+        * docs/sources/Error_Documentation.oo3/contents.xml:
+
+          Source document for the error documentation.
+
+        * docs/Error_Messages.txt:
+
+          Removed this file.
+
+Thu Jun 23 12:39:08 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * etc/*.doxygen:
+          Disable html help, seems doxygen now disables the search option
+          when html help is enabled
+
+Thu Jun 23 13:46:08 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE version 1.0.3 released.
+
+Tue Jun  7 21:18:05 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * dance/Plan_Launcher/Plan_Launcher.cpp:
+        * tests/Plan_Launcher/EM-Delay/run_test_ns.pl:
+
+          Rework the plan launcher options a bit.  --em-ior is back to requiring an
+          argument, if no --{em,nm,lm}-ior option is specified, we default to
+          name service lookup.
+
+Fri Jun  3 12:07:41 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/dance_tests.lst:
+          Fixed location of tests
+
+Thu Jun  2 19:49:24 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * dance/Plan_Launcher/Plan_Launcher.cpp:
+
+          compile fix.
+
+Wed Jun  1 11:14:10 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * dance/Plan_Launcher/Plan_Launcher.cpp:
+
+          New option --manager-timeout which allows the user to indicate
+          to the plan_launcher that it should wait a specified number of
+          seconds for a manager (e.g., execution_manager) reference to
+          become valid before proceeding with deployment.
+
+        * tests/Plan_Launcher:
+        * tests/Plan_Launcher/EM-Delay:
+        * tests/Plan_Launcher/EM-Delay/run_test.pl:
+        * tests/Plan_Launcher/EM-Delay/run_test_ns.pl:
+        * bin/dance_tests.lst:
+
+          New test to excercise the new delay on manager reference functionality.
+
+Wed Jun  1 11:10:40 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * dance/ExecutionManager/ExecutionManager_Module.cpp:
+
+          Emit the IOR/register with the naming service closer to ORB
+          activation to reduce the possibility of a race condition with
+          the plan_launcher.
+
+Wed Jun  1 10:14:38 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * docs/Error_Messages.txt:
+
+          Beginning of error message documentation.
+
+Thu May 26 20:29:54 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * dance/NodeManager/Node_Manager_Module.cpp:
+        * dance/RepositoryManager/repository_manager_admin_exec.cpp:
+        * tools/Config_Handlers/SatisfierProperty_Handler.cpp:
+          Resolved gcc 4.6 warnings. Some variables were declared and assigned
+          a value but weren't used after that.
+
+Fri Apr 22 12:41:09 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * tools/Logger_Backend/ndds/svc.conf:
+          Fuzz: Added $Id string
+
+Wed Apr 20 09:52:52 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE version 1.0.2 released.
+
+Local Variables:
+mode: change-log
+add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time))
+indent-tabs-mode: nil
+End:
diff --git a/DAnCE/NEWS b/DAnCE/NEWS
index 7f375a134dc..63be2ccbda2 100644
--- a/DAnCE/NEWS
+++ b/DAnCE/NEWS
@@ -1,6 +1,11 @@
-USER VISIBLE CHANGES BETWEEN DAnCE-1.0.5 and DAnCE-1.1.0
+USER VISIBLE CHANGES BETWEEN DAnCE-1.0.6 and DAnCE-1.1.0
 =======================================================
 
+USER VISIBLE CHANGES BETWEEN DAnCE-1.0.5 and DAnCE-1.0.6
+=======================================================
+
+. None
+
 USER VISIBLE CHANGES BETWEEN DAnCE-1.0.4 and DAnCE-1.0.5
 =======================================================
 
diff --git a/DAnCE/PROBLEM-REPORT-FORM b/DAnCE/PROBLEM-REPORT-FORM
index 1b946638f5b..f6879d156f6 100644
--- a/DAnCE/PROBLEM-REPORT-FORM
+++ b/DAnCE/PROBLEM-REPORT-FORM
@@ -41,9 +41,9 @@
 To: ciao-users@list.isis.vanderbilt.edu
 Subject: [area]: [synopsis]
 
-    DAnCE VERSION: 1.0.5
-    TAO VERSION : 2.0.5
-    ACE VERSION : 6.0.5
+    DAnCE VERSION: 1.0.6
+    TAO VERSION : 2.0.6
+    ACE VERSION : 6.0.6
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/DAnCE/VERSION b/DAnCE/VERSION
index dee179ba8ba..f4944f6e84e 100644
--- a/DAnCE/VERSION
+++ b/DAnCE/VERSION
@@ -1,4 +1,4 @@
-This is DAnCE version 1.0.5, released Mon Oct 10 08:48:51 CEST 2011
+This is DAnCE version 1.0.6, released Sun Dec 04 11:51:30 CET 2011
 
 If you have any problems with or questions about DAnCE, please send
 e-mail to the CIAO mailing list (ciao-users@list.isis.vanderbilt.edu),
diff --git a/DAnCE/dance/DAnCE_Core.mpc b/DAnCE/dance/DAnCE_Core.mpc
index 5801d78dc61..5a73611c181 100644
--- a/DAnCE/dance/DAnCE_Core.mpc
+++ b/DAnCE/dance/DAnCE_Core.mpc
@@ -81,8 +81,6 @@ project (DAnCE_skel) : dancelib_with_idl, dance_output, dance_stub, \
   }
 
   Inline_Files {
-    DAnCE_LocalityManagerS.inl
-    DAnCE_ArtifactInstallationS.inl
   }
 
   Header_Files {
diff --git a/DAnCE/dance/Deployment/Deployment_Core.mpc b/DAnCE/dance/Deployment/Deployment_Core.mpc
index de2cc34fb05..897998903cb 100644
--- a/DAnCE/dance/Deployment/Deployment_Core.mpc
+++ b/DAnCE/dance/Deployment/Deployment_Core.mpc
@@ -307,7 +307,6 @@ project(Deployment_AM_skel) : install, dance_output, dance_deployment_skel, danc
   }
 
   Inline_Files {
-    Deployment_ApplicationManagerS.inl
   }
 
   Header_Files {
@@ -357,7 +356,6 @@ project(Deployment_DAM_skel) : install, dance_output, dance_applicationmanager_s
   }
 
   Inline_Files {
-    Deployment_DomainApplicationManagerS.inl
   }
 
   specific {
@@ -440,7 +438,6 @@ project(Deployment_DomainApplication_skel) : install, dance_output, dance_deploy
   }
 
   Inline_Files {
-    Deployment_DomainApplicationS.inl
   }
 
   specific {
@@ -484,7 +481,6 @@ project(Deployment_NAM_skel) : install, dance_output, dance_applicationmanager_s
   }
 
   Inline_Files {
-    Deployment_NodeApplicationManagerS.inl
   }
 
   specific {
@@ -528,7 +524,6 @@ project(Deployment_NodeManager_skel) : install, dance_output, dance_deployment_s
   }
 
   Inline_Files {
-    Deployment_NodeManagerS.inl
   }
 
   specific {
@@ -611,7 +606,6 @@ project(Deployment_RepositoryManager_skel) : install, dance_output, dance_deploy
   }
 
   Inline_Files {
-    Deployment_RepositoryManagerS.inl
   }
 
   specific {
@@ -655,7 +649,6 @@ project(Deployment_NodeApplication_skel) : install, dance_output, dance_deployme
   }
 
   Inline_Files {
-    Deployment_NodeApplicationS.inl
   }
 
   specific {
@@ -676,13 +669,12 @@ project(Deployment_skel) : install, dance_deployment_stub, dance_output, danceli
     Deployment_ApplicationS.cpp
     Deployment_ResourceCommitmentManagerS.cpp
   }
-  
+
   Header_Files {
     Deployment_skel_export.h
   }
 
   Inline_Files {
-    Deployment_ApplicationS.inl
   }
 
   specific {
diff --git a/DAnCE/dance/LocalityManager/Scheduler/Plugin_Manager.cpp b/DAnCE/dance/LocalityManager/Scheduler/Plugin_Manager.cpp
index 86af1b646d8..86eb749cd5c 100644
--- a/DAnCE/dance/LocalityManager/Scheduler/Plugin_Manager.cpp
+++ b/DAnCE/dance/LocalityManager/Scheduler/Plugin_Manager.cpp
@@ -101,7 +101,8 @@ namespace DAnCE
     }
   }
 
-  Plugin_Manager::Plugin_Manager (void)
+  Plugin_Manager::Plugin_Manager (void) :
+     config_ (0)
   {
   }
 
diff --git a/DAnCE/dance/Version.h b/DAnCE/dance/Version.h
index 0a10333bf8d..84b74caffaf 100644
--- a/DAnCE/dance/Version.h
+++ b/DAnCE/dance/Version.h
@@ -5,5 +5,5 @@
 
 #define DAnCE_MAJOR_VERSION 1
 #define DAnCE_MINOR_VERSION 0
-#define DAnCE_BETA_VERSION 5
-#define DAnCE_VERSION "1.0.5"
+#define DAnCE_BETA_VERSION 6
+#define DAnCE_VERSION "1.0.6"
diff --git a/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp b/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp
index 19feaff84fe..4afb3d0da6a 100644
--- a/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp
+++ b/DAnCE/tools/Domain_Validator/CORBA/CORBA_Domain_Validator_impl.cpp
@@ -197,7 +197,7 @@ DAnCE_Domain_Validator_i::convert_time_value (const ::DAnCE::Time_Value &time_va
       break;
 
     case DAnCE::ttUSECONDS:
-      retval.set (0, time_value.useconds ());
+      retval.set (0, static_cast <suseconds_t> (time_value.useconds ()));
       break;
 
     case DAnCE::ttFRACTIONAL:
@@ -490,4 +490,3 @@ DAnCE_Domain_Validator_i::block_for_plan (const ::Deployment::DeploymentPlan & ,
   //  ACE_Time_Value tv = this->convert_time_value (max_block_time);
   throw CORBA::NO_IMPLEMENT ();
 }
-
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 901d48cd6ca..41fa1dce919 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,2884 +1,159 @@
-Wed Nov 02 08:30:13 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+Wed Dec  7 17:54:41 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        Merged changes from Remedy work branch.
+        * TAO_IDL/util/utl_stack.cpp(UTL_ScopeStack::pop):
 
-        === start changelog ===
-
-        Tue Nov  1 14:29:07 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * TAO_IDL/be/be_visitor_component/executor_exs.cpp:
-                  Fixed link issues on windows.
-
-        Tue Nov  1 12:52:03 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * TAO_IDL/be/be_visitor_component/component_ex_idl.cpp:
-                * TAO_IDL/be/be_visitor_component/component_exh.cpp:
-                * TAO_IDL/be/be_visitor_component/executor_exh.cpp:
-                * TAO_IDL/be/be_visitor_component/executor_exs.cpp:
-                  Reverted a few of my last changes. An derived executor
-                  is not directly derived from its base anymore (on
-                  executor IDL level as well as on implementation level).
-
-        Mon Oct 31 15:14:05 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * TAO_IDL/be/be_type.cpp:
-                  Fixed new line.
-
-        Fri Oct 28 11:22:03 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * tests/Bug_3768_Regression/TestCallback.cpp:
-                * tests/Bug_3768_Regression/TestServer.cpp:
-                * tests/Bug_3768_Regression/client.cpp:
-                * tests/Bug_3768_Regression/server.cpp:
-                  Fuzz.
+          Checks if the top scope has a #pragma prefix associated with it,
+          and if so, pops the prefix (from its own stack) along with the
+          scope. Fixed the check to be more robust. Thanks to Simon Massey
+          for reporting the problem, which was revealed as an error message
+          reporting a bogus prefix inconsistency between a forward declared
+          struct and its full definition.
 
-        Fri Oct 28 10:35:06 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+Wed Dec  7 10:47:15 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-                * tests/Bug_3531b_Regression/server.cpp:
+        Merged in the changes to update AMI4CCM to match the initial revision
+        with the synchronous port and the new pragma's added
 
-                  Fix for Windoze runtime problem with TSS.
+        === start changelog ===
 
-        Fri Oct 28 10:22:48 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+        Tue Dec  6 14:42:39 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
 
-                * TAO_IDL/be/be_array.cpp:
-                * TAO_IDL/be/be_codegen.cpp:
-                * TAO_IDL/be/be_component.cpp:
                 * TAO_IDL/be/be_interface.cpp:
-                * TAO_IDL/be/be_type.cpp:
-                * TAO_IDL/be/be_visitor_array/any_op_cs.cpp:
-                * TAO_IDL/be/be_visitor_array/array_ch.cpp:
-                * TAO_IDL/be/be_visitor_array/array_cs.cpp:
+                * TAO_IDL/be/be_visitor_component/component_svh.cpp:
+                * TAO_IDL/be/be_visitor_component/component_svs.cpp:
                 * TAO_IDL/be/be_visitor_component/servant_svh.cpp:
                 * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
-                * TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp:
-                * TAO_IDL/be/be_visitor_exception/any_op_cs.cpp:
-                * TAO_IDL/be/be_visitor_exception/exception_ch.cpp:
-                * TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
-                * TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp:
-                * TAO_IDL/be/be_visitor_interface/amh_ss.cpp:
-                * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp:
-                * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
-                * TAO_IDL/be/be_visitor_interface/interface_ih.cpp:
-                * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
-                * TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp:
-                * TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp:
-                * TAO_IDL/be/be_visitor_operation/amh_sh.cpp:
-                * TAO_IDL/be/be_visitor_operation/amh_ss.cpp:
-                * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp:
-                * TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp:
-                * TAO_IDL/be/be_visitor_operation/operation_ch.cpp:
+                * TAO_IDL/be/be_visitor_operation/operation_sh.cpp:
                 * TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
-                * TAO_IDL/be/be_visitor_operation/tie_ss.cpp:
-                * TAO_IDL/be/be_visitor_root/root_ch.cpp:
-                * TAO_IDL/be/be_visitor_root/root_sth.cpp:
-                * TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp:
-                * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
-                * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp:
-                * TAO_IDL/be/be_visitor_structure/any_op_cs.cpp:
-                * TAO_IDL/be/be_visitor_structure/structure_cs.cpp:
-                * TAO_IDL/be/be_visitor_template_export.cpp:
-                * TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp:
-                * TAO_IDL/be/be_visitor_union/any_op_cs.cpp:
-                * TAO_IDL/be/be_visitor_union/discriminant_ci.cpp:
-                * TAO_IDL/be/be_visitor_union_branch/public_ci.cpp:
-                * TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp:
-                * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp:
-                * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp:
-                * TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp:
-                * TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp:
-                * TAO_IDL/be/be_visitor_valuetype/field_cs.cpp:
-                * TAO_IDL/be/be_visitor_valuetype/valuetype.cpp:
-                * TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp:
-                * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
-                * TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp:
-                * TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp:
-                  Reduced whitespaces in generated code.
-
-                * TAO_IDL/be/be_visitor_interface/tie_ss.cpp:
-                  Removed tabs from generated code.
-
-
-        Fri Oct 28 09:23:52 UTC 2011  Martin Corino  <mcorino@remedy.nl>
-
-                * tests/Bug_3531b_Regression/server.cpp:
-
-                  Fix for Windoze compile problem.
-
-        Fri Oct 28 07:36:43 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * TAO_IDL/be/be_visitor_component/executor_exh.cpp:
-                * TAO_IDL/be/be_visitor_component/executor_exs.cpp:
-                * TAO_IDL/be/be_visitor_component/executor_private_exh.cpp:
-                * TAO_IDL/be/be_visitor_component/facet_exh.cpp:
-                * TAO_IDL/be/be_visitor_component/facet_exs.cpp:
-                  Fixed compile issues.
-
-        Thu Oct 27 08:05:28 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * TAO_IDL/be/be_visitor_component/executor_exh.cpp:
-                * TAO_IDL/be/be_visitor_component/executor_exs.cpp:
-                  Removed the overrides of _is_a, marshal and _repository_id since
-                  these methods are not needed anymore.
-
-        Wed Oct 26 13:38:02 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * TAO_IDL/be/be_visitor_component/component_ex_idl.cpp:
-                * TAO_IDL/be/be_visitor_component/component_exh.cpp:
-                * TAO_IDL/be/be_visitor_component/component_exs.cpp:
-                * TAO_IDL/be/be_visitor_component/executor_exh.cpp:
-                * TAO_IDL/be/be_visitor_component/executor_exs.cpp:
-                * TAO_IDL/be/be_visitor_component/executor_exs_attr_init.cpp:
-                * TAO_IDL/be/be_visitor_component/executor_private_exh.cpp:
-                * TAO_IDL/be/be_visitor_component/facet_exh.cpp:
-                * TAO_IDL/be/be_visitor_component/facet_exs.cpp:
-                  Fixed issues regarding derived components. Derived component
-                  were not derived from the base implementation. Instead of deriving
-                  from the base implementation, a whole new base executor was
-                  generated and still wasn't derived from this. Now there's
-                  one base implementation where the derived executor is derived from.
-
-                * TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp:
-                  Fixed compile issues when a derived interface supports
-                  another interface.
-
-        Mon Oct 24 11:50:33 UTC 2011  Martin Corino  <mcorino@remedy.nl>
-
-                * tao/Connection_Handler.cpp:
-                * tao/Leader_Follower.h:
-                * tao/Leader_Follower.inl:
-                * tao/Leader_Follower.cpp:
-                * tao/Wait_On_LF_No_Upcall.h:
-                * tao/Wait_On_LF_No_Upcall.cpp:
-                * tao/Wait_On_Leader_Follower.h:
-                * tao/Wait_Strategy.h:
-                * tao/Wait_Strategy.cpp:
-
-                  Implemented a solution for two known problems:
-                  a) deadlocking possibility because of upcall handling
-                    in client leader threads without abdicating
-                    leadership
-                  b) inefficient handling of nested upcalls in
-                    client leader threads in case MT_NOUPCALL
-                    strategy
-                  This solution implements leadership abdication
-                  (as also proposed by Russell Mora in Bugzilla #3531
-                  and David Kinder in Bugzilla #3768) when a client
-                  leader thread receives an upcall (triggering a
-                  call to Leader_Follower::set_upcall_thread) so
-                  any waiting (regular) leader thread could now
-                  take over. Futhermore leader abdication for client
-                  leader threads is also implemented in case an event
-                  causes a client leader thread to wake up and it detects
-                  leader threads waiting which are capable to take over
-                  leadership.
-                  With this out of the way the solution for MT_NOUPCALL
-                  could now be optimized with a 'handle deferring'
-                  mechanism which allows a client leader thread to
-                  temporarily defer an upcall until the client leader
-                  thread has abdicated and leadership switches (which
-                  should happen almost immediately after the client
-                  leader thread deferred the upcall handle(r)).
-
-                * tao/Resume_Handle_Deferred.h:
-                * tao/Resume_Handle_Deferred.cpp:
-
-                  Removed these files. Part of previous, non-optimal,
-                  MT_NOUPCALL solution.
-
-                * tao/tao.mpc:
-
-                  Removed Resume_Handle_Deferred.{h,cpp}
-
-                * tests/Bug_3531b_Regression/Bug_3531b_Regression.mpc:
-                * tests/Bug_3531b_Regression/server.cpp:
-
-                  Fixed compile problems due to TAO version
-                  incompatibilities and removed dummy_label
-                  restriction.
-
-                * tests/Bug_3768_Regression:
-                * tests/Bug_3768_Regression/Bug_3768_Test.mpc:
-                * tests/Bug_3768_Regression/Test.idl:
-                * tests/Bug_3768_Regression/TestCallback.h:
-                * tests/Bug_3768_Regression/TestCallback.cpp:
-                * tests/Bug_3768_Regression/TestServer.h:
-                * tests/Bug_3768_Regression/TestServer.cpp:
-                * tests/Bug_3768_Regression/client.cpp:
-                * tests/Bug_3768_Regression/run_test.pl:
-                * tests/Bug_3768_Regression/server.cpp:
-
-                  Added new test for Bugzilla #3768.
+                revert changes after 2011-11-30 (ChangeLog.BRANCH missing those items)
 
-                * bin/tao_orb_tests.lst
+        Wed Nov 30 16:45:10 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
 
-                  Added Bug_3531_Regression, Bug_3531b_Regression and
-                  Bug_3768_Regression to regular test runs.
-
-        === end changelog ===
-
-Tue Nov 01 14:34:13 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-        * On_Demand_Act_Direct_Coll/Collocated_Test.cpp:
-        * On_Demand_Act_Direct_Coll/test_i.cpp:
-        * On_Demand_Act_Direct_Coll/test_i.h:
-        * On_Demand_Act_Direct_Coll/Client_Task.cpp:
-        * On_Demand_Act_Direct_Coll/test.idl:
-        Clean up test.
-
-
-Tue Nov 01 10:54:13 UTC 2011  Martin Corino  <mcorino@remedy.nl>
-
-        Merged changes from Remedy SA work branch.
-
-        === start changelog ===
-
-        Mon Oct 31 13:14:04 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
-                * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
-                Add safe_servant_base in CIAO consumers servant
-
-
-        Fri Oct 28 11:37:40 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
-                * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
-                Changes for removing activators for CIAO consumers
+                * TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp:
+                * TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp:
+                * TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp:
 
-        Wed Oct 26 07:18:40 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+        Wed Nov 30 14:19:10 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
 
                 * TAO_IDL/be/be_codegen.cpp:
-                Remove include files for ciao servant- and port_activator.
-
-                * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
-                Changes for removing activators in CIAO
-
-        === end changelog ===
-
-Thu Oct 27 16:16:09 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * utils/logWalker/HostProcess.h:
-        * utils/logWalker/HostProcess.cpp:
-        * utils/logWalker/Log.cpp:
-
-          Clean up treatment of connection closure and reuse of handles.
-
-Thu Oct 27 12:13:40 UTC 2011  Simon Massey <sma at prismtech dot com>
-
-        * tao/PI_Server/PI_Server_include.pidl:
-        Was duplicating the tao/PortableServer/PortableServer_include.pidl
-        #define guard name.
-
-Tue Oct 25 08:10:00 UTC 2011  Marijke Hengstmengel <mhengstmengel@remedy.nl>
-
-        * tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp:
-        Solved error in destroying the orb.
-
-Fri Oct 21 14:44:28 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IORManipulation/IORManipulation.mpc:
-        * tao/IORTable/IORTable.mpc:
-        * tao/ZIOP/ZIOP.mpc:
-          Generate export files as part of the build
-
-        * tao/IORManipulation/ior_manip_export.h:
-        * tao/IORTable/iortable_export.h:
-        * tao/ZIOP/ziop_export.h:
-          Removed these files.
-
-        * tao/ZIOP/ZIOP.h:
-          Doxygen fix
-
-Thu Oct 20 17:34:00 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/POA/On_Demand_Act_Direct_Coll/On_Demand_Act_D_Coll.mpc:
-          Don't build this test with minimum corba and CORBA/e
-
-Thu Oct 20 12:50:09 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be_include/be_interface.h:
-          Fixed gcc warning
-
-Tue Oct 20 09:30:13 UTC 2011  Martin Corino  <mcorino@remedy.nl>
-
-        Merged changes from Remedy work branch.
-
-        === start changelog ===
-
-        Thu Oct 20 08:42:33 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
-
-                * On_Demand_Act_Direct_Coll:
-                * On_Demand_Act_Direct_Coll/Collocated_Test.cpp:
-                * On_Demand_Act_Direct_Coll/Servant_Activator.cpp:
-                * On_Demand_Act_Direct_Coll/test_i.cpp:
-                * On_Demand_Act_Direct_Coll/Server_Task.h:
-                * On_Demand_Act_Direct_Coll/run_test.pl:
-                * On_Demand_Act_Direct_Coll/test_i.h:
-                * On_Demand_Act_Direct_Coll/Client_Task.cpp:
-                * On_Demand_Act_Direct_Coll/Server_Task.cpp:
-                * On_Demand_Act_Direct_Coll/Servant_Activator.h:
-                * On_Demand_Act_Direct_Coll/Client_Task.h:
-                * On_Demand_Act_Direct_Coll/On_Demand_Act_D_Coll.mpc:
-                * On_Demand_Act_Direct_Coll/test.idl:
-                Test with Servant Activator and thru_poa- and direct collocation.
-
-                * bin/tao_orb_tests.lst
-                Added On_Demand_Act_Direct_Coll test.
-
-
-        Wed Oct 19 14:15:57 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * docs/tutorials/Quoter/RTCORBA/Broker.cpp:
-                * docs/tutorials/Quoter/RTCORBA/docs/distributor.html:
-                  Fixed typos.
-
-                * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h:
-                  Fixed typo.
-
-                * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp:
-                  ++x instead of x++;
-
-        Tue Oct 18 13:47:54 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * TAO_IDL/be/be_visitor_component/context_svh.cpp:
-                * TAO_IDL/be/be_visitor_component/context_svs.cpp:
-                  Reverted last changes. Need a more robust implementation to
-                  fix re-entrancy
-
-        Tue Oct 18 11:35:58 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * TAO_IDL/be/be_visitor_exception/any_op_cs.cpp:
-                * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp:
-                * TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp:
-                * TAO_IDL/be/be_visitor_structure/any_op_cs.cpp:
-                  Layout changes to the generated code
-
-        Tue Oct 18 10:51:21 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * TAO_IDL/be/be_visitor_component/context_svh.cpp:
-                * TAO_IDL/be/be_visitor_component/context_svs.cpp:
-                  Using recursive mutexes instead of normal mutexes.
-
-        Tue Oct 18 10:39:23 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * TAO_IDL/be/be_visitor_component/context_svs.cpp:
-                  Fixed a minor indentation issue.
-
-        Tue Oct 18 10:03:32 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-                * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
-                  Using the container_ variable in a thread safe way.
-
-        Tue Oct 18 07:01:33 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
-                * tests/Collocated_DerivedIF/Collocated_DerivedIF.mpc:
-                Changes for duplicate project names.
-
-        Mon Oct 17 13:08:33 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
-                * tests/Collocated_DerivedIF:
-                * tests/Collocated_DerivedIF/Client_Task.h:
-                * tests/Collocated_DerivedIF/Client_Task.cpp:
-                * tests/Collocated_DerivedIF/Collocated_DerivedIF.mpc:
-                * tests/Collocated_DerivedIF/Collocated_Test.cpp:
-                * tests/Collocated_DerivedIF/Hello.h:
-                * tests/Collocated_DerivedIF/Hello.cpp:
-                * tests/Collocated_DerivedIF/Server_Task.h:
-                * tests/Collocated_DerivedIF/Server_Task.cpp:
-                * tests/Collocated_DerivedIF/Test.idl:
-                * tests/Collocated_DerivedIFl/run_test.pl:
-                * tests/Collocated_DerivedIFl/README:
-                Test for -ORBCollocationStrategy direct and interface inheritance
-
-                * tests/Collocated_Best/README:
-              Add ID
-
-        Mon Oct 17 12:33:33 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
-                * docs/Options.html
-                Added new define TAO_DEFAULT_COLLOCATION_STRATEGY .
-
-        Mon Oct 17 11:41:33 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
-                * docs/Options.html
-                Add new ORBCollocationStrategy best .
-
-        Thu Oct 13 12:57:25 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * TAO_IDL/be_include/be_valuetype.h:
-                * TAO_IDL/be/be_valuetype.cpp:
-                  Removed gen_skel_helper from here, not used at all
-
-                * orbsvcs/tests/Notify/lib/Options_Parser.cpp:
-                  Fixed compile error with gcc 4.6
-
-        Thu Oct 13 12:14:00 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * TAO_IDL/be/be_interface.cpp:
-                * TAO_IDL/be/be_visitor_interface/amh_si.cpp:
-                  static_cast seems to be required, not sure why, reverting this part
-                  to get our branch build green again
-
-        Thu Oct 13 11:15:06 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/AnyTypeCode/Any_Impl.cpp:
-                  Layout changes
-
-                * tao/LocalObject.cpp:
-                * tao/Object.cpp:
-                  Log an error before throwing a NO_IMPLEMENT system exception
-
-        Thu Oct 13 07:15:34 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * TAO_IDL/be/be_interface.cpp:
-                * TAO_IDL/be/be_visitor_interface/amh_si.cpp:
-                  Further reduction of code being generated in case of interface
-                  inheritance
-
-        Thu Oct 13 06:46:25 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * TAO_IDL/be/be_interface.cpp:
-                  Fixed problem with num_args that still was generated for arguments
-
-        Wed Oct 12 14:14:32 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * TAO_IDL/be/be_interface.cpp:
-                * TAO_IDL/be/be_visitor_interface/interface_si.cpp:
-                  Changed indentation and removed not needed static cast in the
-                  generated code
-
-        Wed Oct 12 12:06:33 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
-                * tests/Collocated_NoColl:
-                * tests/Collocated_NoColl/Client_Task.h:
-                * tests/Collocated_NoColl/Client_Task.cpp:
-                * tests/Collocated_NoColl/Collocated_NoColl.mpc:
-                * tests/Collocated_NoColl/Collocated_Test.cpp:
-                * tests/Collocated_NoColl/Hello.h:
-                * tests/Collocated_NoColl/Hello.cpp:
-                * tests/Collocated_NoColl/Server_Task.h:
-                * tests/Collocated_NoColl/Server_Task.cpp:
-                * tests/Collocated_NoColl/Test.idl:
-                * tests/Collocated_NoColl/run_test.pl:
-                Test for -ORBCollocation NO
-
-
-        Wed Oct 12 12:02:04 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Collocation_Strategy.h:
-                * tao/Invocation_Adapter.cpp:
-                  Print the collocation strategy that we have determined
-
-                * tests/Hello/run_test.pl:
-                  Added -cdebug that enables ORBDebugLevel 10 for the client
-
-        Wed Oct 12 10:09:25 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp:
-                * TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp:
-                * tao/Abstract_Servant_Base.h:
-                * tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp:
-                * tao/PortableServer/Operation_Table.h:
-                  Removed the num_args argument for the direct collocation skeleton
-                  functions because it was not used at all
-
-        Wed Oct 12 09:55:38 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * TAO_IDL/be/be_visitor_interface/amh_ss.cpp:
-                * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
-                * tao/Object_T.h:
-                * tao/Object_T.cpp:
-                * tao/PolicyC.cpp:
-                * tao/Valuetype/AbstractBase_T.h:
-                * tao/Valuetype/AbstractBase_T.cpp:
-                  unchecked_narrow method was available with and without repository_id
-                  argument but that wasn't used at all. merged both methods into one
-                  and updated tao_idl code generation to not generate the repository_id
-                  anymore
-
-        Wed Oct 12 09:01:19 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * TAO_IDL/be/be_visitor_interface/amh_ss.cpp:
-                * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp:
-                * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
-                * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
-                * tao/Object_T.h:
-                * tao/Object_T.cpp:
-                * tao/PolicyC.cpp:
-                * tao/PortableServer/PolicyS.cpp:
-                * tao/Valuetype/AbstractBase_T.h:
-                * tao/Valuetype/AbstractBase_T.cpp:
-                  Removed the collocation opportunity from the narrow calls, the
-                  boolean collocated only means whether the servant is collocated or
-                  not and shouldn't include the fact whether we have a collocation
-                  opportunity or not
-
-        Tue Oct 11 17:38:06 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp:
-                * tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.cpp:
-                * tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.cpp:
-                  Also check the string that returned
-
-        Tue Oct 11 10:53:17 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/Object_T.cpp:
-                  Don't use collocation opportunity, just determine whether the
-                  object is collocated or not. If this doesn't break any tests, we
-                  need to do some more cleanup here
-
-        Tue Oct 11 10:41:02 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/CORBANAME_Parser.cpp:
-                * tao/Remote_Object_Proxy_Broker.cpp:
-                  Enable through poa collocation by default
-
-        Tue Oct 11 07:17:47 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
-                  Layout changes and just always generate the orb optimize flags
-
-        Mon Oct 10 17:43:50 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/IIOP_Connector.cpp:
-                * tao/Invocation_Adapter.h:
-                * tao/Invocation_Adapter.cpp:
-                * tao/ORB_Core.h:
-                * tao/ORB_Core.cpp:
-                  Moved collocation_strategy from the orb core to the invocation adapter
-
-                * tests/Collocated_ThruP_Sp/Collocated_Test.cpp:
-                * tests/Collocated_ThruP_Sp/README:
-                * tests/Collocated_ThruP_Sp/Server_Task.cpp:
-                * tests/Collocated_ThruP_Sp/run_test.pl:
-                * tests/Collocated_ThruP_Sp_Gd/README:
-                * tests/Collocated_ThruP_Sp_Gd/run_test.pl:
-                  Add -debug to the script, layout changes, missing Id
-
-        Fri Oct  7 10:54:09 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * tao/ORB_Core.cpp:
-                  Tweaked collocation strategy a little bit more, for direct we need
-                  a servant, not for poa. If we are not collocated, we just go remote and
-                  not give an exception
-
-        Fri Oct  7 09:17:36 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
-                  Layout change to generated code
-
-                * tao/Invocation_Adapter.cpp:
-                  Removed the check that servant != 0 before being able to invoke
-                  collocated, collocation opportunities test shows a case where this
-                  happens
-
-                * tao/ORB_Core.cpp:
-                  Added logging before we throw an exception related to collocation
-                  mis configuration. If we are collocated with best opportunity without
-                  any opportunity we default to remote instead of having an exception.
-                  Through poa seems possible without a servant pointer
-
-        Thu Oct  6 09:34:57 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
-              * tao/DynamicInterface/DII_Invocation_Adapter.cpp:
-              Set collocation_opportunity to TAO_CO_THRU_POA_STRATEGY instead of 0.
-
-        Thu Oct  6 08:56:57 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc:
-                * orbsvcs/examples/RtEC/IIOPGateway/RtEC_IIOPGateway.mpc:
-                * tests/Oneway_Buffering/Oneway_Buffering.mpc:
-                * tests/Policies/Policies.mpc:
-                  requires for corba_messaging is already pulled in through the
-                  base projects
-
-        Wed Oct  5 18:49:30 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * TAO_IDL/be/be_interface.cpp:
-                * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
-                * TAO_IDL/be/be_visitor_root/root_ch.cpp:
-                * TAO_IDL/be_include/be_global.h:
-                * TAO_IDL/be_include/be_interface.h:
-                * TAO_IDL/be_include/be_visitor_root/root_ch.h:
-                  Even more cleanup of old stuff
-
-        Wed Oct  5 18:42:43 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * TAO_IDL/be/be_home.cpp:
-                * TAO_IDL/be/be_interface.cpp:
-                * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
-                * TAO_IDL/be_include/be_interface.h:
-                * TAO_IDL/be/be_visitor_operation/base_proxy_impl_ch.cpp:
-                * TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp:
-                  More cleanup
-
-                * TAO_IDL/be_include/be_visitor_operation/base_proxy_impl_ch.h:
-                * TAO_IDL/be_include/be_visitor_operation/remote_proxy_impl_cs.h:
-                  Removed these files.
-
-        Wed Oct  5 18:34:21 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-                * TAO_IDL/be/be_home.cpp:
-                * TAO_IDL/be/be_interface.cpp:
-                * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
-                * TAO_IDL/be_include/be_interface.h:
-                  Cleanup of very old stuff
-
-                * TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
-                  Fixed cpb
-
-                * tao/Valuetype/AbstractBase_T.h:
-                * tao/Valuetype/AbstractBase_T.cpp:
-                  Updated for changes below
-
-                * tests/CSD_Collocation/svc.conf.csd:
-                  Removed deprecated arguments
-
-        Wed Oct  5 13:01:20 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
-
-                * tests/Collocated_Best/README
-                * tests/Collocated_ThruP_Sp/README
-                * tests/Collocated_ThruP_Sp_Gd/README
-                * tests/Bug_2241_Regression/README
-                Add README's
-
-                * bin/tao_orb_tests.lst
-                Added Collocated_ThruP_Sp_Gd test.
-
-        Wed Oct  5 12:41:20 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
-
-                * TAO_IDL/be/be_visitor_interface/amh_ss.cpp:
-                * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp:
-                * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
-                * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
-                * TAO_IDL/be/be_visitor_operation/operation.cpp:
-                * tao/PolicyC.cpp:
-                * tao/Collocation_Strategy.h:
-                * tao/PortableServer/PolicyS.cpp:
-                Change define TAO_CO_DIRECT_POA,remove POA
+                // remove debug info
+                * TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp:
+                * TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp:
+                * TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h:
+                Add visit_attribute functionality.
 
-                * tao/DynamicInterface/DII_Invocation_Adapter.h:
-                * tao/DynamicInterface/DII_Invocation_Adapter.cpp:
-                * tao/Messaging/Asynch_Invocation_Adapter.h:
-                * tao/Messaging/Asynch_Invocation_Adapter.cpp:
-                * tao/Valuetype/AbstractBase_Invocation_Adapter.h:
-                * tao/Valuetype/AbstractBase_Invocation_Adapter.cpp:
-                Change proxybroker for collocation opertunities
+        Tue Nov 29 12:59:03 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+                * TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp:
+                Correct check nil pointer in facet operation
 
-                * tao/ORB_Core.cpp:
-                * tao/Invocation_Adapter.cpp:
-                Extended collocation_strategy with opertunities
-                Handling of BEST strategy and checking other strategies.
+        Mon Nov 28 15:26:03 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
 
-                * tests/Collocated_Best/Collocated_Best_Direct/run_test.pl:
+                * TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp:
+                * TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp:
+                * TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp:
+                * TAO_IDL/be_include/be_visitor_connector/facet_ami_exh.h:
+                * TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h:
+                Add traverse_inheritance_graph, needed  for derived interfaces
 
+        Wed Nov 23 14:00:38 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
 
+                * TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp:
+                Changed return of sync operations.
 
-        Wed Oct  5 08:35:20 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+        Mon Nov 21 13:32:38 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
 
                 * TAO_IDL/be/be_codegen.cpp:
-                * TAO_IDL/be/be_component.cpp:
-                * TAO_IDL/be/be_interface.cpp:
-                * TAO_IDL/be/be_visitor_interface.cpp:
-                * TAO_IDL/be/be_visitor_interface/amh_ss.cpp:
-                * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp:
-                * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
-                * TAO_IDL/be/be_visitor_interface/interface_ci.cpp:
-                * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
-                * TAO_IDL/be/be_visitor_interface/interface_sh.cpp:
-                * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
-                * TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
-                * TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp:
-                * TAO_IDL/be/be_visitor_operation/operation.cpp:
-                * TAO_IDL/be/be_visitor_root/root_ch.cpp:
-                * TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp:
-                * TAO_IDL/be_include/be_component.h:
-                * TAO_IDL/be_include/be_interface.h:
-                * TAO_IDL/be_include/be_visitor_interface.h:
-                * tao/Abstract_Servant_Base.h:
-                * tao/Collocated_Invocation.h:
-                * tao/Collocated_Invocation.cpp:
-                * tao/Collocation_Strategy.h:
-                * tao/Invocation_Adapter.h:
-                * tao/Invocation_Adapter.inl:
-                * tao/Invocation_Adapter.cpp:
-                * tao/ORB_Core.h:
-                * tao/ORB_Core.cpp:
-                * tao/Object.h:
-                * tao/Object.cpp:
-                * tao/Object_T.h:
-                * tao/Object_T.cpp:
-                * tao/PolicyC.h:
-                * tao/PolicyC.inl:
-                * tao/PolicyC.cpp:
-                * tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h:
-                * tao/PortableServer/PolicyS.h:
-                * tao/PortableServer/PolicyS.cpp:
-                * tao/PortableServer/Servant_Base.h:
-                * tao/PortableServer/Servant_Base.cpp:
-                * tao/tao.mpc:
-                  Rough reimplementatin of handling of collocated call. A pre condition
-                  for using collocation is having a servant pointer. The core of TAO
-                  also couldn't detect whether through poa collocation is requested
-                  without having -Gp being enabled. The collocated proxy broker (cpb)
-                  was only used for direct collocation, but didn't contain any interface
-                  specific code. TAO_IDL now generated a collocation opportunity to
-                  indicate which support it did generate, when the core than has
-                  a servant pointer it can determine which opportunities it has an
-                  what is requested.
-
-                  As side effect we get smaller generated code, less complexity, and
-                  better performance
-
-                  This has to be finished but committing it right now.
-
-                * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp:
-                * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp:
-                * TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_sh.h:
-                * TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_ss.h:
-                * tao/Collocation_Proxy_Broker.h:
-                * tao/Collocation_Proxy_Broker.cpp:
-                  Removed these files.
-
-        Wed Oct  5 07:15:46 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
+                Exclude include *.AE.idl in *E.idl
 
-                * tao/PortableServer/Collocated_Object_Proxy_Broker.cpp:
-                  Add prefix TAO_COLLOCATION_ to Collocated strategy Thru_POA
-
-        Tue Oct  4 16:36:46 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
-
-                * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
-                Clean up debug text
-
-                * tao/Invocation_Adapter.cpp:
-                * tao/ORB_Core.h:
-                * tao/ORB_Core.cpp:
-                Change Exception for collocated errors.
-                Add prefix TAO_COLLOCATION_ to Collocated strategies DIrect, Best and Thru_POA
-                Add TAO_DEFAULT_COLLOCATION_STRATEGY
-
-                * tao/orbconf.h:
-                Add TAO_DEFAULT_COLLOCATION_STRATEGY
-
-                * tests/Bug_2241_Regression/run_test.pl:
-                * tests/Collocated_Best/Collocated_Best_Direct/Collocated_Best_Direct.mpc:
-                * tests/Collocated_Best/Collocated_Best_NoColl/Hello.cpp:
-                * tests/Collocated_Best/Collocated_Best_ThuP/Collocated_Best_ThruP.mpc:
-
-                * tests/Collocated_ThruP_Sp_Gd:
-                * tests/Collocated_ThruP_Sp_Gd/Client_Task.h:
-                * tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp:
-                * tests/Collocated_ThruP_Sp_Gd/Collocated_Test.cpp:
-                * tests/Collocated_ThruP_Sp_Gd/Collocated_ThruP_Sp_Gd.mpc:
-                * tests/Collocated_ThruP_Sp_Gd/Hello.h:
-                * tests/Collocated_ThruP_Sp_Gd/Hello.cpp:
-                * tests/Collocated_ThruP_Sp_Gd/Server_Task.h:
-                * tests/Collocated_ThruP_Sp_Gd/Server_Task.cpp:
-                * tests/Collocated_ThruP_Sp_Gd/Test.idl:
-                * tests/Collocated_ThruP_Sp_Gd/run_test.pl:
-                New test for combination Sp and Gd
-
-        Mon Oct  3 15:33:35 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
-
-                * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
-                Change dead to 0 for Collocation_Proxy_Broker
-
-                * tao/Collocation_Strategy.h:
-                * tao/Invocation_Adapter.cpp:
-                * tao/ORB_Core.h:
-                * tao/ORB_Core.cpp:
-                Add exceptions for situations if not used -Gp or used -Sp idl flags and
-                ORBCollocationStrategies Direct and Thru_Poa. Add strategie BEST.
-                To do: add prefix COLLOCATION_.
-
-                * tests/Bug_2241_Regression/Client_Task.cpp:
-                * tests/Bug_2241_Regression/Hello.cpp:
-                * tests/Bug_2241_Regression/run_test.pl:
-                Catch expected exceptions.
-
-                * tests/Collocated_Best:
-                * tests/Collocated_Best/Collocated_Best_Direct:
-                * tests/Collocated_Best/Collocated_Best_Direct/Client_Task.h:
-                * tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp:
-                * tests/Collocated_Best/Collocated_Best_Direct/Collocated_Best_Direct.mpc:
-                * tests/Collocated_Best/Collocated_Best_Direct/Collocated_Test.cpp:
-                * tests/Collocated_Best/Collocated_Best_Direct/Hello.h:
-                * tests/Collocated_Best/Collocated_Best_Direct/Hello.cpp:
-                * tests/Collocated_Best/Collocated_Best_Direct/Server_Task.h:
-                * tests/Collocated_Best/Collocated_Best_Direct/Server_Task.cpp:
-                * tests/Collocated_Best/Collocated_Best_Direct/Test.idl:
-                * tests/Collocated_Best/Collocated_Best_Direct/run_test.pl:
-
-                * tests/Collocated_Best/Collocated_Best_NoColl:
-
-                * tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.h:
-                * tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.cpp:
-                * tests/Collocated_Best/Collocated_Best_NoColl/Collocated_Best_NoColl.mpc:
-                * tests/Collocated_Best/Collocated_Best_NoColl/Collocated_Test.cpp:
-                * tests/Collocated_Best/Collocated_Best_NoColl/Hello.h:
-                * tests/Collocated_Best/Collocated_Best_NoColl/Hello.cpp:
-                * tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.h:
-                * tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.cpp:
-                * tests/Collocated_Best/Collocated_Best_NoColl/Test.idl:
-                * tests/Collocated_Best/Collocated_Best_NoColl/run_test.pl:
-
-                * tests/Collocated_Best/Collocated_Best_ThuP:
-
-                * tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.h:
-                * tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.cpp:
-                * tests/Collocated_Best/Collocated_Best_ThuP/Collocated_Best_ThruP.mpc:
-                * tests/Collocated_Best/Collocated_Best_ThuP/Collocated_Test.cpp:
-                * tests/Collocated_Best/Collocated_Best_ThuP/Hello.h:
-                * tests/Collocated_Best/Collocated_Best_ThuP/Hello.cpp:
-                * tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.h:
-                * tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.cpp:
-                * tests/Collocated_Best/Collocated_Best_ThuP/Test.idl:
-                * tests/Collocated_Best/Collocated_Best_ThuP/run_test.pl:
+                * TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp:
+                * TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp:
+                * TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp:
+                * TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp:
+                * TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp:
+                * TAO_IDL/be_include/be_visitor_connector/facet_ami_exh.h:
+                * TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h:
+              Changes for sync port on AMI connector
 
-                * tests/Collocated_ThruP_Sp:
+        Mon Nov  7 13:02:55 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
 
-                * tests/Collocated_ThruP_Sp/Client_Task.h:
-                * tests/Collocated_ThruP_Sp/Client_Task.cpp:
-                * tests/Collocated_ThruP_Sp/Collocated_Test.cpp:
-                * tests/Collocated_ThruP_Sp/Collocated_ThruP_Sp.mpc:
-                * tests/Collocated_ThruP_Sp/Hello.h:
-                * tests/Collocated_ThruP_Sp/Hello.cpp:
-                * tests/Collocated_ThruP_Sp/Server_Task.h:
-                * tests/Collocated_ThruP_Sp/Server_Task.cpp:
-                * tests/Collocated_ThruP_Sp/Test.idl:
-                * tests/Collocated_ThruP_Sp/run_test.pl:
-                tests for COLLOCATION_DIRECT. To do: add readme
+                * TAO_IDL/fe/idl.ll:
+                * TAO_IDL/fe/lex.yy.cpp:
+                Add beside pragma's 'ciao ami4ccm ...' the pragma's 'ami4ccm ...' , according to ami4ccm spec.
+                In the future '#pragma ciao ami4ccm ...' has to  be removed.
 
         === end changelog ===
 
-Mon Oct 10 08:48:51 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO version 2.0.5 released.
-
-Fri Oct  7 10:45:41 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * docs/tutorials/Quoter/Event_Service/stock_list.txt:
-        * docs/tutorials/Quoter/Event_Service/stock_list1.txt:
-        * docs/tutorials/Quoter/Event_Service/stock_list2.txt:
-
-        * docs/tutorials/Quoter/Simple/ImprovedServer/stock_list.txt:
-
-        * orbsvcs/examples/Notify/MC/TkMonitor/modules/GeometryStore.pm:
-        * orbsvcs/examples/Notify/MC/TkMonitor/modules/MonitorControl.pm:
-
-        * performance-tests/Protocols/set_lksctp_params.sh:
-        * performance-tests/Protocols/set_sctp_params.sh:
-        * performance-tests/Protocols/show_lksctp_params.sh:
-        * performance-tests/Protocols/show_sctp_params.sh:
-          Fuzz
-
-Fri Oct  7 09:45:58 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * docs/PP_Memory_Management.txt:
-        * orbsvcs/tests/FT_App/replica.cmd:
-        * orbsvcs/tests/InterfaceRepo/Union_Forward_Test/README.txt:
-        * orbsvcs/tests/Log/README:
-        * orbsvcs/tests/Time/README:
-          Fuzz.
-
-Fri Oct  7 09:12:23 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * DevGuideExamples/AMH/README:
-        * DevGuideExamples/AMH_AMI/README:
-        * DevGuideExamples/BiDirectionalGIOP/README:
-        * DevGuideExamples/GettingStarted/README:
-        * DevGuideExamples/Messaging/AMIcallback/README:
-        * DevGuideExamples/Messaging/RelativeRoundtripTimeout/README:
-        * DevGuideExamples/Multithreading/GracefulShutdown/README:
-        * DevGuideExamples/Multithreading/README:
-        * DevGuideExamples/Multithreading/Reactive/README:
-        * DevGuideExamples/Multithreading/ThreadPerConnection/README:
-        * DevGuideExamples/Multithreading/ThreadPool/README:
-        * DevGuideExamples/PortableInterceptors/Auth/README:
-        * DevGuideExamples/PortableInterceptors/IOR/README:
-        * DevGuideExamples/PortableInterceptors/PICurrent/README:
-        * DevGuideExamples/PortableInterceptors/SimpleCodec/README:
-        * DevGuideExamples/RTCORBA/README:
-        * DevGuideExamples/SmartProxies/README:
-        * DevGuideExamples/ValueTypes/Bank/README:
-        * DevGuideExamples/ValueTypes/Messenger/README:
-        * DevGuideExamples/readme.txt:
-        * README:
-        * examples/AMI/FL_Callback/README:
-        * examples/Buffered_AMI/README:
-        * examples/Buffered_Oneways/README:
-        * examples/CSD_Strategy/ThreadPool/README:
-        * examples/CSD_Strategy/ThreadPool2/README:
-        * examples/CSD_Strategy/ThreadPool3/README:
-        * examples/CSD_Strategy/ThreadPool4/README:
-        * examples/CSD_Strategy/ThreadPool6/README:
-        * examples/Load_Balancing/README:
-        * examples/OBV/Typed_Events/README:
-        * examples/RTCORBA/Activity/README:
-        * interop-tests/wchar/README:
-        * orbsvcs/DevGuideExamples/EventServices/OMG_Basic/README:
-        * orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/README:
-        * orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/README:
-        * orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/README:
-        * orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/README:
-        * orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/README:
-        * orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/README:
-        * orbsvcs/DevGuideExamples/ImplRepo/README:
-        * orbsvcs/DevGuideExamples/NamingService/Messenger/README:
-        * orbsvcs/DevGuideExamples/NamingService/Naming_Client/README:
-        * orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/README:
-        * orbsvcs/DevGuideExamples/NamingService/Naming_Server/README:
-        * orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/README:
-        * orbsvcs/DevGuideExamples/NotifyService/EventSequence/README:
-        * orbsvcs/DevGuideExamples/NotifyService/Filtering/README:
-        * orbsvcs/DevGuideExamples/NotifyService/Messenger/README:
-        * orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/README:
-        * orbsvcs/DevGuideExamples/NotifyService/QoSProperties/README:
-        * orbsvcs/DevGuideExamples/NotifyService/RTNotify/README:
-        * orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/README:
-        * orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/README:
-        * orbsvcs/DevGuideExamples/Security/PolicyControllingApp/README:
-        * orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/README:
-        * orbsvcs/DevGuideExamples/ValueTypes/Notify/readme.txt:
-        * orbsvcs/FT_ReplicationManager/README:
-        * orbsvcs/ImplRepo_Service/README.txt:
-        * orbsvcs/LoadBalancer/README:
-        * orbsvcs/TAO_Service/README:
-        * orbsvcs/examples/CosEC/Factory/README:
-        * orbsvcs/examples/CosEC/RtEC_Based/README:
-        * orbsvcs/examples/CosEC/RtEC_Based/bin/README:
-        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/README:
-        * orbsvcs/examples/CosEC/Simple/README:
-        * orbsvcs/examples/Log/Basic/README:
-        * orbsvcs/examples/Log/Event/README:
-        * orbsvcs/examples/Log/Notify/README:
-        * orbsvcs/examples/Log/README:
-        * orbsvcs/examples/Log/RTEvent/README:
-        * orbsvcs/examples/Notify/Federation/Agent/README:
-        * orbsvcs/examples/Notify/Federation/SpaceCraft/README:
-        * orbsvcs/examples/Notify/Filter/README:
-        * orbsvcs/examples/Notify/Lanes/README:
-        * orbsvcs/examples/Notify/MC/TkMonitor/README:
-        * orbsvcs/examples/Notify/README:
-        * orbsvcs/examples/Notify/Subscribe/README:
-        * orbsvcs/examples/Notify/ThreadPool/README:
-        * orbsvcs/examples/RtEC/IIOPGateway/README:
-        * orbsvcs/examples/RtEC/MCast/README:
-        * orbsvcs/examples/RtEC/Schedule/README:
-        * orbsvcs/examples/RtEC/Simple/README:
-        * orbsvcs/examples/Security/README:
-        * orbsvcs/examples/Security/SecurityLevel1/README:
-        * orbsvcs/orbsvcs/HTIOP/README.txt:
-        * orbsvcs/orbsvcs/Naming/README:
-        * orbsvcs/tests/AVStreams/Component_Switching/README:
-        * orbsvcs/tests/AVStreams/Latency/README:
-        * orbsvcs/tests/AVStreams/Multicast/README:
-        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/README:
-        * orbsvcs/tests/AVStreams/README:
-        * orbsvcs/tests/AVStreams/Simple_Three_Stage/README:
-        * orbsvcs/tests/AVStreams/mpeg/README.uav:
-        * orbsvcs/tests/Bug_1334_Regression/README:
-        * orbsvcs/tests/Bug_1393_Regression/README:
-        * orbsvcs/tests/Bug_1395_Regression/README:
-        * orbsvcs/tests/Bug_1436_Regression/README:
-        * orbsvcs/tests/Bug_1437_Regression/README:
-        * orbsvcs/tests/Bug_2137_Regression/README:
-        * orbsvcs/tests/Bug_2247_Regression/README:
-        * orbsvcs/tests/Bug_2248_Regression/README:
-        * orbsvcs/tests/Bug_2285_Regression/README:
-        * orbsvcs/tests/Bug_2287_Regression/README:
-        * orbsvcs/tests/Bug_2615_Regression/README:
-        * orbsvcs/tests/Bug_2709_Regression/README:
-        * orbsvcs/tests/Bug_2777_Regression/README:
-        * orbsvcs/tests/Bug_3215_Regression/README:
-        * orbsvcs/tests/Bug_3216_Regression/README:
-        * orbsvcs/tests/CosEvent/Timeout/README:
-        * orbsvcs/tests/EC_Custom_Marshal/README:
-        * orbsvcs/tests/EC_MT_Mcast/README:
-        * orbsvcs/tests/EC_Mcast/README:
-        * orbsvcs/tests/EC_Multiple/README:
-        * orbsvcs/tests/EC_Throughput/README:
-        * orbsvcs/tests/Event/Mcast/AddrServer/README:
-        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/README:
-        * orbsvcs/tests/Event/Mcast/Two_Way/README:
-        * orbsvcs/tests/Event/Performance/README:
-        * orbsvcs/tests/Event/lib/README:
-        * orbsvcs/tests/FaultTolerance/IOGR/README:
-        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/README:
-        * orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/ReadMe.txt:
-        * orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/ReadMe.txt:
-        * orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/ReadMe.txt:
-        * orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/README:
-        * orbsvcs/tests/InterfaceRepo/Union_Forward_Test/README.txt:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/README:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/README:
-        * orbsvcs/tests/Log/Basic_Log_Test/README:
-        * orbsvcs/tests/Notify/lib/README:
-        * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/README:
-        * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/README:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/README:
-        * orbsvcs/tests/Redundant_Naming/README:
-        * orbsvcs/tests/Security/Big_Request/README:
-        * orbsvcs/tests/Security/Bug_1107_Regression/README:
-        * orbsvcs/tests/Security/Bug_2908_Regression/README:
-        * orbsvcs/tests/Security/Callback/README:
-        * orbsvcs/tests/Security/Secure_Invocation/README:
-        * orbsvcs/tests/Security/cert/README:
-        * orbsvcs/tests/Security/ssliop_CSD/README:
-        * orbsvcs/tests/Simple_Naming/README:
-        * orbsvcs/tests/unit/Notify/MC/MonitorControlExt/README:
-        * performance-tests/Cubit/README:
-        * performance-tests/Latency/README:
-        * performance-tests/README:
-        * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/README:
-        * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/README:
-        * performance-tests/Sequence_Latency/Sequence_Operations_Time/README.txt:
-        * tests/Any/Recursive/README:
-        * tests/BiDirectional_DelayedUpcall/README:
-        * tests/Big_AMI/README:
-        * tests/Bug_1330_Regression/README:
-        * tests/Bug_1551_Regression/README:
-        * tests/Bug_1627_Regression/README:
-        * tests/Bug_2119_Regression/README:
-        * tests/Bug_2122_Regression/README:
-        * tests/Bug_2124_Regression/README:
-        * tests/Bug_2126_Regression/README:
-        * tests/Bug_2134_Regression/README:
-        * tests/Bug_2183_Regression/README:
-        * tests/Bug_2186_Regression/README:
-        * tests/Bug_2289_Regression/README:
-        * tests/Bug_2375_Regression/README:
-        * tests/Bug_2399_Regression/README:
-        * tests/Bug_2419_Regression/README:
-        * tests/Bug_2424_Regression/README:
-        * tests/Bug_2429_Regression/README:
-        * tests/Bug_2549_Regression/README:
-        * tests/Bug_2669_Regression/README:
-        * tests/Bug_2791_Regression/README:
-        * tests/Bug_2805_Regression/README.txt:
-        * tests/Bug_2935_Regression/README.txt:
-        * tests/Bug_3068_Regression/README:
-        * tests/Bug_3276_Regression/README:
-        * tests/Bug_3299_Regression/README:
-        * tests/Bug_3311_Regression/README:
-        * tests/Bug_3513_Regression/README:
-        * tests/Bug_3524_Regression/README:
-        * tests/Bug_3574_Regression/README:
-        * tests/Bug_3575_Regression/README:
-        * tests/Bug_3632_Regression/README:
-        * tests/Bug_3676_Regression/README:
-        * tests/Bug_3743_Regression/README:
-        * tests/Bug_3748_Regression/README:
-        * tests/Bug_3755_Ext_Regression/README:
-        * tests/Bug_3790_Regression/README:
-        * tests/Bug_3821_Regression/README:
-        * tests/Bug_3827_Regression/README:
-        * tests/Bug_3837_Regression/README:
-        * tests/Bug_3926_Regression/README:
-        * tests/Bug_3941_Regression/README:
-        * tests/CSD_Strategy_Tests/TP_Test_4/README:
-        * tests/CodeSets/simple/README:
-        * tests/Collocation_Opportunities/README:
-        * tests/DIOP/README:
-        * tests/DSI_Gateway/README:
-        * tests/FL_Cube/README:
-        * tests/Faults/README:
-        * tests/HandleExhaustion/README:
-        * tests/Hello/README:
-        * tests/ICMG_Any_Bug/README:
-        * tests/IPV6/README:
-        * tests/Leader_Followers/README:
-        * tests/LongUpcalls/README:
-        * tests/MProfile/README:
-        * tests/MProfile_Connection_Timeout/README:
-        * tests/MT_BiDir/README:
-        * tests/MT_Client/README:
-        * tests/MT_Server/README:
-        * tests/MT_Timeout/README:
-        * tests/Multiple/README:
-        * tests/Multiple_Inheritance/README:
-        * tests/Muxed_GIOP_Versions/README:
-        * tests/Muxing/README:
-        * tests/Native_Exceptions/README:
-        * tests/Nested_Event_Loop/README:
-        * tests/No_Server_MT_Connect_Test/README:
-        * tests/OBV/Any/README:
-        * tests/OBV/Supports/README:
-        * tests/ORB_Local_Config/Bug_1459/README:
-        * tests/ORB_Local_Config/Bug_3049/README:
-        * tests/ORB_Local_Config/README:
-        * tests/ORB_Local_Config/Two_DLL_ORB/README:
-        * tests/ORB_destroy/README:
-        * tests/Object_Loader/README:
-        * tests/Objref_Sequence_Test/README:
-        * tests/OctetSeq/README:
-        * tests/POA/Adapter_Activator/README:
-        * tests/POA/Bug_1592_Regression/README:
-        * tests/POA/DSI/README:
-        * tests/POA/Explicit_Activation/Alt_Resources/README:
-        * tests/POA/Explicit_Activation/README:
-        * tests/POA/FindPOA/README:
-        * tests/POA/README:
-        * tests/POA/Reference_Counted_Servant/README:
-        * tests/POA/RootPOA/README:
-        * tests/Policies/README:
-        * tests/Portable_Interceptors/Benchmark/README:
-        * tests/Portable_Interceptors/Dynamic/README:
-        * tests/Portable_Interceptors/ForwardRequest/README:
-        * tests/Portable_Interceptors/IORInterceptor/README:
-        * tests/Portable_Interceptors/ORB_Shutdown/README:
-        * tests/Portable_Interceptors/PICurrent/README:
-        * tests/Portable_Interceptors/Request_Interceptor_Flow/README:
-        * tests/RTScheduling/Current/README:
-        * tests/RTScheduling/DT_Spawn/README:
-        * tests/RTScheduling/Thread_Cancel/README:
-        * tests/RTScheduling/VoidData/README:
-        * tests/Smart_Proxies/Collocation/README:
-        * tests/Timed_Buffered_Oneways/README:
-        * tests/Timeout/README:
-        * tests/TransportCurrent/Framework/README:
-        * tests/Xt_Stopwatch/README:
-          Fuzz: Missing Id-tags.
-
-Fri Oct  7 07:55:46 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * examples/PluggableUDP/tests/Performance/svc.conf.xml:
-        * examples/PluggableUDP/tests/SimplePerformance/svc.conf.xml:
-        * examples/Simple/time-date/client.conf.xml:
-        * examples/Simple/time-date/svc.conf.xml:
-        * interop-tests/wchar/build.xml:
-        * orbsvcs/Concurrency_Service/svc.conf.xml:
-        * orbsvcs/ImplRepo_Service/repository.xml:
-        * orbsvcs/Notify_Service/svc.conf.xml:
-        * orbsvcs/TAO_Service/svc.conf.xml:
-        * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf.xml:
-        * orbsvcs/tests/CosEvent/Basic/svc.pull.conf.xml:
-        * orbsvcs/tests/Event/Basic/control.conf.xml:
-        * orbsvcs/tests/Event/UDP/svc.conf.xml:
-        * orbsvcs/tests/FaultTolerance/IOGR/svc.conf.xml:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf.xml:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf.xml:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf.xml:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf.xml:
-        * orbsvcs/tests/Miop/McastHello/client.conf.xml:
-        * orbsvcs/tests/Miop/McastHello/server.conf.xml:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf.xml:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf.xml:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/reactive.conf.xml:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf.xml:
-        * orbsvcs/tests/Security/MT_IIOP_SSL/client.conf.xml:
-        * orbsvcs/tests/Security/MT_IIOP_SSL/server.conf.xml:
-        * orbsvcs/tests/Security/MT_SSLIOP/client.conf.xml:
-        * orbsvcs/tests/Security/MT_SSLIOP/server.conf.xml:
-        * orbsvcs/tests/Security/ssliop_corbaloc/client.conf.xml:
-        * orbsvcs/tests/Security/ssliop_corbaloc/server.conf.xml:
-        * orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf.xml:
-        * performance-tests/RTCorba/Thread_Pool/native-svc.conf.xml:
-        * performance-tests/RTCorba/Thread_Pool/svc.conf.xml:
-        * performance-tests/Throughput/svc.conf.xml:
-        * tests/AMI/exclusive.conf.xml:
-        * tests/AMI/muxed.conf.xml:
-        * tests/AMI/server.conf.xml:
-        * tests/AMI_Timeouts/svc.conf.xml:
-        * tests/Bug_3251_Regression/Bug_3251.conf.xml:
-        * tests/Bug_3801_Regression/exclusive.conf.xml:
-        * tests/Bug_3801_Regression/muxed.conf.xml:
-        * tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf.xml:
-        * tests/POA/Explicit_Activation/alternate.conf.xml:
-        * tests/RTCORBA/Banded_Connections/svc.conf.xml:
-        * tests/RTCORBA/Client_Propagated/svc.conf.xml:
-        * tests/RTCORBA/Client_Protocol/svc.conf.xml:
-        * tests/RTCORBA/Collocation/continuous.conf.xml:
-        * tests/RTCORBA/Collocation/svc.conf.xml:
-        * tests/RTCORBA/Destroy_Thread_Pool/continuous.conf.xml:
-        * tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml:
-        * tests/RTCORBA/Dynamic_Thread_Pool/svc.conf.xml:
-        * tests/RTCORBA/Explicit_Binding/svc.conf.xml:
-        * tests/RTCORBA/Linear_Priority/svc.conf.xml:
-        * tests/RTCORBA/MT_Client_Protocol_Priority/svc.conf.xml:
-        * tests/RTCORBA/Persistent_IOR/continuous.conf.xml:
-        * tests/RTCORBA/Policy_Combinations/svc.conf.xml:
-        * tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf.xml:
-        * tests/RTCORBA/Priority_Inversion_With_Bands/svc.conf.xml:
-        * tests/RTCORBA/Server_Declared/continuous.conf.xml:
-        * tests/RTCORBA/Server_Declared/svc.conf.xml:
-        * tests/RTCORBA/Server_Protocol/server_iiop.conf.xml:
-        * tests/RTCORBA/Server_Protocol/server_reverse.conf.xml:
-        * tests/RTCORBA/Server_Protocol/server_reverse_nt.conf.xml:
-        * tests/RTCORBA/Server_Protocol/server_shmiop.conf.xml:
-        * tests/RTCORBA/Server_Protocol/server_uiop.conf.xml:
-        * tests/RTCORBA/Thread_Pool/continuous.conf.xml:
-        * tests/RTCORBA/Thread_Pool/svc.conf.xml:
-          Fuzz: No Id-tags.
-
-Wed Sep 28 12:46:14 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/BiDir_GIOP/BiDir_GIOP.mpc:
-        * tao/CodecFactory/CodecFactory.mpc:
-          Added the generated export files so that they get installed
-
-Wed Sep 28 12:42:14 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Generic_Sequence_T.h:
-        * tao/Valuetype/AbstractBase.h:
-        * tao/Valuetype/Valuetype_Adapter_Impl.h:
-          Doxygen changes
-
-        * tao/Object.cpp:
-        * tao/PortableServer/Basic_SArgument_T.h:
-        * tao/DynamicAny/DynAny_i.h:
-          Layout changes
-
-Wed Sep 28 12:39:12 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/AV/AVStreams_i.h:
-        * orbsvcs/tests/Notify/lib/Peer_T.cpp:
-          Layout changes and cleanup
+Wed Dec  7 10:28:00 UTC 2011  Simon Massey <simon dot massey at prismtech dot com>
 
-Wed Sep 28 12:37:05 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tests/IDL_Test/IDL_Tests.mpc:
 
-        * examples/Persistent_Grid/Grid_i.h:
-        * examples/Simple/bank/AccountManager_i.h:
-        * examples/Simple/echo/Echo_i.h:
-        * examples/Simple/grid/Grid_i.h:
-        * examples/Simple/time/Time_i.h:
-          Layout changes, remove workarounds
+          Since the below modification removed the -GA from the valuetype.idl
+          generation step in the mpc file, the valuetypeA.cpp is now
+          not generated, thus this file should not be mentioned in the
+          DLL projects Source_Files section. Machines were compiling and
+          linking the old file or stating that it was not found.
 
-Wed Sep 28 12:35:58 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Dec  5 20:32:56 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp:
-          Layout changes to the generated code
-
-Wed Sep 28 12:34:31 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_3683_Regression/Echo_i.h:
-          Remove workaround
-
-        * tests/IDL_Test/typedef.idl:
-        * tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h:
-          Layout changes
-
-Wed Sep 28 12:31:44 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/HandleExhaustion/run_test.pl:
-          Added missing GetFile
-
-Wed Sep 28 11:39:31 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
-        * tests/Bug_2241_Regression:
-        * tests/Bug_2241_Regression/Bug_2241_Regression.mpc:
-        * tests/Bug_2241_Regression/Client_Task.h:
-        * tests/Bug_2241_Regression/Client_Task.cpp:
-        * tests/Bug_2241_Regression/Collocated_Test.cpp:
-        * tests/Bug_2241_Regression/Hello.h:
-        * tests/Bug_2241_Regression/Hello.cpp:
-        * tests/Bug_2241_Regression/Server_Task.h:
-        * tests/Bug_2241_Regression/Server_Task.cpp:
-        * tests/Bug_2241_Regression/Test.idl:
-        * tests/Bug_2241_Regression/run_test.pl:
-        * bin/tao_orb_tests.lst:
-        New test for '-ORBCollocationStrategy direct'
-
-Sun Sep 25 17:02:27 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * tests/Parallel_Connect_Strategy/run_test.pl:
-          Copy only those configuration files that are needed by the targets.
-          We don't want to solve this in the test framework; the script knows
-          which configuration files should be copied.
-
-Wed Sep 21 13:40:30 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/MT_Client/run_test.pl:
-          Removed conf files that are not in the repo at all
-
-Tue Sep 20 06:43:33 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * tests/AMI/run_mt_noupcall.pl:
-        * tests/MT_Client/run_test.pl:
-          Copy only those configuration files that are needed by the targets.
-          We don't want to solve this in the test framework; the script knows
-          which configuration files should be copied.
-
-Tue Sep 20 06:27:42 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * tests/Oneway_Send_Timeouts/run_test.pl:
-          Fixed runtime issues
-
-Fri Sep 16 12:01:35 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * DevGuideExamples/Multithreading/ThreadPerConnection/run_test.pl:
-        * tests/CSD_Collocation/run_test.pl:
-        * tests/Connection_Purging/run_test.pl:
-        * tests/Hang_Shutdown/run_test.pl:
-        * tests/LongUpcalls/run_test.pl:
-          Copy only those configuration files that are needed by the targets.
-          We don't want to solve this in the test framework; the script knows
-          which configuration files should be copied.
-
-Fri Sep 16 07:55:50 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * tests/Faults/run_test.pl:
-        * tests/Faults/run_test_pp.pl:
-        * tests/MT_NoUpcall_Client_Leader/run_test.pl:
-        * tests/POA/EndpointPolicy/run_test_dh.pl:
-          Copy only those configuration files that are needed by the targets.
-          We don't want to solve this in the test framework; the script knows
-          which configuration files should be copied.
-
-Fri Sep 16 07:37:12 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * tests/Connect_Strategy_Test/run_test.pl:
-        * tests/MT_BiDir/run_test.pl:
-        * tests/MT_Server/run_test.pl:
-        * tests/No_Server_MT_Connect_Test/run_test.pl:
-        * tests/RTCORBA/Server_Protocol/run_test.pl:
-          Copy only those configuration files that are needed by the targets.
-          We don't want to solve this in the test framework; the script knows
-          which configuration files should be copied.
-
-Fri Sep 16 07:02:26 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * tests/Bug_3163_Regression/run_test.pl:
-        * tests/Bug_3630_Regression/run_test.pl:
-        * tests/Bug_3683_Regression/run_test.pl:
-          Copy only those configuration files that are needed by the targets.
-          We don't want to solve this in the test framework; the script knows
-          which configuration files should be copied.
-
-        * tests/Bug_3630_Regression/server.cpp:
-          Added \n
-
-Thu Sep 15 07:42:01 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * tests/AMI/run_test.pl:
-        * tests/Bug_2183_Regression/run_test.pl:
-        * tests/Bug_2186_Regression/run_test.pl:
-        * tests/Bug_2935_Regression/run_test.pl:
-        * tests/Bug_3068_Regression/run_test.pl:
-        * tests/Leader_Followers/run_test.pl:
-        * tests/Oneway_Send_Timeouts/run_test.pl:
-          Copy only those configuration files that are needed by the targets.
-          We don't want to solve this in the test framework; the script knows
-          which configuration files should be copied.
-
-Wed Sep 14 07:34:56 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/TAO_Internal.cpp:
-          When we can't find the service config file output a message that
-          has error in it, so that the scoreboard parser also detects those
-          errors
-
-Wed Sep  7 18:07:24 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/CodecFactory/CodecFactory.h:
-        * tao/CodecFactory/CodecFactory.cpp:
-        * tao/CodecFactory/CodecFactory.mpc:
-          export file is now generated by tao_idl
-
-        * tao/CodecFactory/codecfactory_export.h:
-          Removed this file.
-
-Wed Sep  7 17:31:31 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/BiDir_GIOP/BiDirGIOP.h:
-        * tao/BiDir_GIOP/BiDirGIOP.cpp:
-        * tao/BiDir_GIOP/BiDirPolicy_Validator.h:
-        * tao/BiDir_GIOP/BiDir_GIOP.mpc:
-          export file is now generated by tao_idl
-
-        * tao/BiDir_GIOP/bidirgiop_export.h:
-          Removed this file.
+        * TAO_IDL/be/be_visitor_valuetype/valuetype.cpp:
 
-Wed Sep  7 17:27:01 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Added missing switch cases in visit_union() and visit_typedef().
+          Not all context states were covered and we were seeing errors
+          and bailouts.
 
-        * MPC/modules/IDLHelper.pm:
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_global.cpp:
-        * TAO_IDL/be/be_util.cpp:
-        * TAO_IDL/be_include/be_global.h:
-          Added skel_export_file and stub_export_file to define an explicit
-          filename for these export files that are different than the stub/skel
-          export_include which could be a full path. This fixes bugzilla 3980
+        * tests/IDL_Test/valuetype.idl:
+        * tests/IDL_Test/IDL_Tests.mpc:
 
-Tue Sep  6 11:45:16 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+          Added test case for the above problem, also removed -GA IDL
+          compiler option for valuetype.idl, since the new test case
+          has IDL constructed types declared inside a valuetype - the
+          generated typecode for the nested types cannot be in a separate
+          file since the generated valuetype class declaration cannot
+          be reopened. Thanks to Simon Massey <simon dot massey at
+          prismtech dot com> for reporting the problem and supplying
+          example IDL.
 
-        * tao/PortableServer/Servant_Base.h:
-          Fixed problem with versioned namespace support
+Mon Dec  5 19:57:02 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Tue Sep  6 08:14:42 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/AnyTypeCode/Any.h:
-        * tao/AnyTypeCode/Any.cpp:
-          Added support for std::wstring
-
-Tue Sep  6 08:06:46 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/Basic_SArguments.h:
-          Added support for std::wstring
-
-Thu Sep  1 09:59:22 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h:
-        * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp:
-        * tao/AnyTypeCode_Adapter.h:
-        * tao/Basic_Arguments.h:
-          Added support for std::wstring
-
-Thu Sep  1 06:31:53 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/BD_String_SArgument_T.cpp:
-        * tao/PortableServer/Basic_SArgument_T.cpp:
-        * tao/PortableServer/Fixed_Array_SArgument_T.cpp:
-        * tao/PortableServer/Fixed_Size_SArgument_T.cpp:
-        * tao/PortableServer/Object_SArgument_T.cpp:
-        * tao/PortableServer/Special_Basic_SArgument_T.cpp:
-        * tao/PortableServer/UB_String_SArgument_T.cpp:
-        * tao/PortableServer/Var_Array_SArgument_T.cpp:
-        * tao/PortableServer/Var_Size_SArgument_T.cpp:
-        * tao/PortableServer/Vector_SArgument_T.cpp:
-          Fixed coverity issues
-
-Mon Aug 29 07:20:29 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp:
-          Fixed runtime issues in orbsvcs.
-
-        * tests/OBV/ValueBox/client.cpp:
-          Fixed runtime issues.
-
-Fri Aug 26 11:09:12 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * DevGuideExamples/ValueTypes/Bank/client.cpp:
+        * examples/AMH/Sink_Server/Base_Server.h:
+        * examples/AMH/Sink_Server/Base_Server.cpp:
+        * examples/AMH/Sink_Server/Client_Task.cpp:
+        * examples/AMH/Sink_Server/MT_AMH_Server.cpp:
         * examples/AMH/Sink_Server/client.cpp:
-        * examples/Event_Comm/supplier.cpp:
-        * examples/Simple/bank/server.cpp:
-        * examples/Simple/echo/server.cpp:
-        * examples/Simple/grid/server.cpp:
-        * examples/Simple/time/server.cpp:
-        * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp:
-        * orbsvcs/tests/Bug_2112_Regression/client.cpp:
-        * orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp:
-        * orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp:
-        * orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp:
-        * orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp:
-        * performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp:
-        * tests/Bug_1383_Regression/SimpleClient.cpp:
-        * tests/Bug_3506_Regression/client.cpp:
-        * tests/Bug_3548_Regression/client.cpp:
-        * tests/CDR/allocator.cpp:
-        * tests/Connection_Failure/client.cpp:
-        * tests/DII_AMI_Forward/client.cpp:
-        * tests/DynAny_Test/driver.cpp:
-        * tests/OBV/ValueBox/client.cpp:
-        * tests/POA/EndpointPolicy/server.cpp:
-        * tests/POA/Loader/server.cpp:
-        * tests/Param_Test/driver.cpp:
-        * tests/Portable_Interceptors/AdvSlot/client.cpp:
-        * tests/Portable_Interceptors/AdvSlot/server.cpp:
-        * tests/Portable_Interceptors/AdvSlotDblCpy/client.cpp:
-        * tests/Portable_Interceptors/AdvSlotExt/client.cpp:
-        * tests/RTScheduling/Scheduling_Interceptor/test_client.cpp:
-        * tests/RTScheduling/VoidData/test_client.cpp:
-        * tests/Sequence_Unit_Tests/bounded_object_reference_sequence_ut.cpp:
-        * tests/Sequence_Unit_Tests/bounded_sequence_cdr_ut.cpp:
-        * tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp:
-        * tests/Sequence_Unit_Tests/bounded_value_sequence_ut.cpp:
-        * tests/Sequence_Unit_Tests/object_reference_sequence_element_ut.cpp:
-        * tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp:
-        * tests/Sequence_Unit_Tests/testing_allocation_traits_ut.cpp:
-        * tests/Sequence_Unit_Tests/unbounded_object_reference_sequence_ut.cpp:
-        * tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp:
-        * tests/Sequence_Unit_Tests/unbounded_octet_sequence_ut.cpp:
-        * tests/Sequence_Unit_Tests/unbounded_sequence_cdr_ut.cpp:
-        * tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp:
-        * tests/Sequence_Unit_Tests/unbounded_value_sequence_ut.cpp:
-        * utils/nslist/nsadd.cpp:
-        * utils/nslist/nsdel.cpp:
-        * utils/nslist/nslist.cpp:
-          Fixed issues regarding exceptions which are not caught.
-
-Tue Aug 23 18:19:01 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * NEWS:
-          Prepared for next release
-
-Tue Aug 23 19:01:44 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO version 2.0.4 released.
-
-Mon Aug 22 15:39:52 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * orbsvcs/tests/Security/BiDirectional/ssl/ca.pem:
-        * orbsvcs/tests/Security/BiDirectional/ssl/client-cert.pem:
-        * orbsvcs/tests/Security/BiDirectional/ssl/client-key.pem:
-        * orbsvcs/tests/Security/BiDirectional/ssl/server-cert.pem:
-        * orbsvcs/tests/Security/BiDirectional/ssl/server-key.pem:
-
-          Regenerated these certs so the test works.
-
-Thu Aug 11 18:55:10 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * NEWS:
-
-          Edited existing entry about generation of argument traits.
-
-Mon Aug  8 14:26:30 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
-          Don't generate arg traits if they are disabled
-
-Mon Aug  8 09:01:55 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_global.cpp:
-        * TAO_IDL/be/be_util.cpp:
-        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
-        * TAO_IDL/be/be_visitor_root/root_ch.cpp:
-        * TAO_IDL/be/be_visitor_root/root_cs.cpp:
-        * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_structure/structure_cs.cpp:
-        * TAO_IDL/be/be_visitor_traits.cpp:
-        * TAO_IDL/be_include/be_global.h:
-          Added support for -Scdr which suppresses the CDR streaming operations.
-          This safes footprint when we are using IDL defined types, but these
-          are not intended to be send through remote CORBA interfaces
-
-Thu Aug  4 15:47:33 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * TAO-INSTALL.html:
-
-          Added note about building for Android.
-
-        * tests/Sequence_Unit_Tests/string_sequence_tester.hpp:
-
-          Additional compiler macro added to build on Android.
-
-          Thanks to Trevor Fields of OCI for doing the heavy lifting
-          for porting TAO to Android.
-
-Sat Jul 23 22:40:39 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * TAO_IDL/be/be_visitor_arg_traits.cpp:
-
-          Fuzz fix.
+        * examples/AMH/Sink_Server/mt_server.cpp:
+        * examples/AMH/Sink_Server/run_test.pl:
+        * examples/AMH/Sink_Server/st_server.cpp:
+          Improving this test, looks the crashing on some build systems is
+          mostly timing due to a badly written example
 
-Sat Jul 23 14:55:15 UTC 2011  Phil Mesnier <mesnier_p@ociweb.com>
+Mon Dec  5 12:30:15 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * TAO/tao/IFR_Client/IFR_Client.mpc
+        * TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp:
+          const fix
 
-          Fixed dependencies on new IFR_Client_Skel project so it
-          builds on windows.
+        * TAO_IDL/be/be_visitor_valuetype/field_cs.cpp:
+          Layout changes and generate doxygen style documentation
 
-Wed Jul 20 18:53:29 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/ast/ast_interface:
-
-          Removed an unnecessary 'seen' flag for arg traits, it was
-          not only unneeded, but also pulling in #includes in the
-          *S.h file that wouldn't compile if the IDL contains
-          valuetypes and no non-local interfaces.
-
-Tue Jul 19 13:25:22 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_arg_traits.cpp:
-
-          Added global scope double colons to code generation of
-          arg traits template plate arg names. Some builds had
-          confusion, thinking that the name was scoped inside the
-          TAO namespace.
-
-        * TAO_IDL/be/be_codegen.cpp:
-
-          Added #include generation check for valuetypes/valueboxes
-          when generating the proper arg traits base class
-          includes.
-
-Mon Jul 18 20:02:59 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_arg_traits.cpp:
-        * TAO_IDL/be/be_global.cpp:
-        * TAO_IDL/be_include/be_global.h:
-
-          Added new option to IDL compiler -Gata, which
-          generates arg traits instantiations using the
-          AnyTypeCode_Adapter version of the last template
-          parameter (if Any support is not suppressed). The
-          option is used when processing IDL for the
-          sequences of basic types, so their arg traits
-          may be included by application whether or not
-          the application is suppressing Any support.
-
-        * tao/tao.mpc:
-
-          Added the new option to the basic sequence PIDL files.
-
-        * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h:
-        * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp:
-        * tao/AnyTypeCode_Adapter.h:
-
-          Added new overloads to the AnyTypeCode_Adapter and
-          AnyTypeCode_Adapter_Impl classes, with the basic
-          type sequences as the second argument.
-
-        * docs/compiler.html:
-
-          Documented the new IDL compiler option.
-
-Mon Jul 18 19:01:17 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * MPC/config/ifr_client_skel.mpb:
-
-          Fix suggested by Johnny to get build order correct on windows.
-
-Mon Jul 18 18:22:55 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * orbsvcs/IFR_Service/IFR_Service.cpp:
-
-          Fixed the include path for IFR_ComponentS.h
-
-Mon Jul 18 06:37:53 UTC 2011  Martin Corino  <mcorino@remedy.nl>
-
-        * TAO_IDL/be/be_codegen.cpp:
-          Changed server header start and end generation in case of
-          skeleton file suppression (-SS) to fix versioning bracketing
-          problems as a result of changed arg traits generation.
-
-Fri Jul 15 12:46:14 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_root/root_sh.cpp:
-        * TAO_IDL/be/be_visitor_root/root_ch.cpp:
-
-          Added missing check for suppress option before generating
-          skeleton arg traits, and made layout changes to both stub
-          and skeleton root visitors.
-
-Fri Jul 15 11:59:37 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Monitor/Monitor.h:
-          Fixed compile error
-
-Fri Jul 15 09:00:55 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_util.cpp:
-          Fixed layout of one of the help messages
-
-Fri Jul 15 08:33:20 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * MPC/config/ifr_client_skel.mpb:
-        * MPC/config/ifrservice.mpb:
-        * orbsvcs/IFR_Service/IFR_Service.mpc:
-        * orbsvcs/orbsvcs/IFRService.mpc:
-        * orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h:
-        * orbsvcs/orbsvcs/IFRService/ComponentDef_i.h:
-        * orbsvcs/orbsvcs/IFRService/EventPortDef_i.h:
-        * orbsvcs/orbsvcs/IFRService/HomeDef_i.h:
-        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp:
-        * orbsvcs/orbsvcs/IFRService/IRObject_i.h:
-        * orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp:
-        * tao/IFR_Client/IFR_Client.mpc:
-        * tao/IFR_Client/ifr_client_skel_export.h:
-          Generate a new IFR_Client_skel library that contains all
-          skeletons for the IFR_Client. This is generated under TAO/tao/IFR_Client
-          and than used by the IFRService
-
-        * orbsvcs/orbsvcs/IFRService/IFR_BaseS.h:
-        * orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl:
-        * orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp:
-        * orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h:
-        * orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl:
-        * orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp:
-        * orbsvcs/orbsvcs/IFRService/IFR_BasicS.h:
-        * orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl:
-        * orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp:
-        * orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h:
-        * orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl:
-        * orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp:
-        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h:
-        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl:
-        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp:
-        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h:
-        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl:
-        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp:
-        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h:
-        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl:
-        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp:
-        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h:
-        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl:
-        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp:
-          Removed these files, it are generated files that shouldn't be in
-          the repository
-
-Fri Jul 15 07:29:03 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/IFRService/AliasDef_i.h:
-        * orbsvcs/orbsvcs/IFRService/ArrayDef_i.h:
-        * orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h:
-        * orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h:
-        * orbsvcs/orbsvcs/IFRService/ModuleDef_i.h:
-        * orbsvcs/orbsvcs/IFRService/NativeDef_i.h:
-        * orbsvcs/orbsvcs/IFRService/OperationDef_i.h:
-        * orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h:
-        * orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h:
-        * orbsvcs/orbsvcs/IFRService/PublishesDef_i.h:
-        * orbsvcs/orbsvcs/IFRService/Repository_i.h:
-        * orbsvcs/orbsvcs/IFRService/SequenceDef_i.h:
-        * orbsvcs/orbsvcs/IFRService/StringDef_i.h:
-        * orbsvcs/orbsvcs/IFRService/StructDef_i.h:
-        * orbsvcs/orbsvcs/IFRService/TypedefDef_i.h:
-        * orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h:
-        * orbsvcs/orbsvcs/IFRService/WstringDef_i.h:
-          Layout changes
-
-Fri Jul 15 07:11:02 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/IFR_Client/IFR_Client_Adapter_Impl.h:
-        * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp:
-          Layout changes, removed hardcrafted arg_trait
-
-Thu Jul 14 19:49:02 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/PolicyC.cpp:
-        * tao/PortableServer/PolicyS.cpp:
-
-          Removed arg traits instantiations and #includes from these
-          hand_crafted files.
-
-        * tao/tao.mpc:
-
-          - Added IDL compiler option to suppress Any operator
-            generation for Policy_Forward.pidl.
-
-          - Added new IDL compiler option (see below) to
-            suppress arg traits generation for ParameterMode.pidl.
-
-        * tests/Param_Test/Param_Test.mpc:
-
-          Added header and inline file lists.
-
-        * TAO_IDL/include/idl_global.h:
-        * TAO_IDL/be/be_attribute.cpp:
-        * TAO_IDL/be/be_visitor_arg_traits.cpp:
-        * TAO_IDL/be/be_valuetype.cpp:
-        * TAO_IDL/be/be_visitor_operation/arglist.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation_cs.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation.cpp:
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_visitor_valuebox.cpp:
-        * TAO_IDL/be/be_visitor_union.cpp:
-        * TAO_IDL/be/be_visitor_structure.cpp:
-        * TAO_IDL/be/be_visitor_root/root_cs.cpp:
-        * TAO_IDL/be/be_visitor_root/root_sh.cpp:
-        * TAO_IDL/be/be_visitor_root/root_ss.cpp:
-        * TAO_IDL/be/be_visitor_root/root_ch.cpp:
-        * TAO_IDL/be/be_type.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
-        * TAO_IDL/be/be_valuebox.cpp:
-        * TAO_IDL/be/be_decl.cpp:
-        * TAO_IDL/be/be_util.cpp:
-        * TAO_IDL/be/be_visitor_sequence.cpp:
-        * TAO_IDL/be/be_visitor_array/array_ch.cpp:
-        * TAO_IDL/be/be_argument.cpp:
-        * TAO_IDL/be/be_visitor_valuetype.cpp:
-        * TAO_IDL/be/be_global.cpp:
-        * TAO_IDL/be/be_visitor_enum/enum_ch.cpp:
-        * TAO_IDL/be/be_sequence.cpp:
-        * TAO_IDL/be/be_operation.cpp:
-        * TAO_IDL/be/be_enum.cpp:
-        * TAO_IDL/be/be_string.cpp:
-        * TAO_IDL/ast/ast_interface.cpp:
-        * TAO_IDL/ast/ast_interface_fwd.cpp:
-        * TAO_IDL/be_include/be_visitor_root/root_ch.h:
-        * TAO_IDL/be_include/be_visitor_root/root_cs.h:
-        * TAO_IDL/be_include/be_visitor_root/root_sh.h:
-        * TAO_IDL/be_include/be_visitor_root/root_ss.h:
-        * TAO_IDL/be_include/be_codegen.h:
-        * TAO_IDL/be_include/be_util.h:
-        * TAO_IDL/be_include/be_decl.h:
-        * TAO_IDL/be_include/be_global.h:
-        * TAO_IDL/util/utl_global.cpp:
-
-          - Moved arg traits generation targets from the stub
-            and skeleton source files to the corresponding
-            header files. This checking addresses [BUGID:3969].
-
-          - Many changes to #include file generation logic,
-            since arg traits generation is now triggered from the IDL
-            declaration and not from its use as an operation argument.
-
-          - Added a new command line option -Sat to suppress
-            the generation of arg tratis altogether.
-
-        * tao/docs/compiler.html:
-
-          Added the new IDL compiler command line option to the table.
-
-Tue Jul 12 13:15:24 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_codegen.cpp:
-
-          Added code generation of a preprocessor version check that
-          will output an error message if the generated file's version
-          doesn't match the IDL compiler's (TAO's) version. This fix
-          closes [BUGID:3979].
-
-Mon Jul 11 14:55:57 UTC 2011  Adam Mitz  <mitza@ociweb.com>
-
-        * TAO_IDL/be/be_util.cpp:
-
-          Removed usage text for command line options that were
-          removed a long time ago.
-
-Fri Jul  8 14:57:31 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_arg_traits.cpp:
-
-          Relocated the spot where a typedef node is marked as having
-          its arg traits instantiation generated. There is a use case
-          where the old location gave rise to infinite recursion and
-          a stack overflow. Thanks to Johnny Willemsen
-          <jwillemsen@remedy.nl> for uncovering the bug and submitting
-          example IDL. This fix closes [BUGID:3978].
-
-        * tests/IDL_Test/interface.cpp:
-
-          Added the example IDL above to the test.
-
-Fri Jul  8 06:39:27 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/PortableServer/Servant_Base.h:
-          Added some typedefs useful for template meta programming
-
-Mon Jul  4 11:02:28 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/ImplRepo_Service/ImR_Locator_i.h:
-        * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
-          Fixed Coverity error
-
-        * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp:
-          Fixed mismatched delete as reported by Coverity
-
-Wed Jun 29 12:44:21 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Advanced/TO-DO:
-        * examples/Advanced/ch_21/client.cpp:
-        * examples/Quoter/Quoter_i.cpp:
-        * examples/Simple/bank/README:
-          Cleanup
-
-Wed Jun 29 11:27:19 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/OBV/Simple/Client_i.h:
-        * tests/OBV/Simple/OBV_impl.h:
-        * tests/OBV/Simple/Server_i.h:
-        * tests/OBV/Simple/Server_i.cpp:
-        * tests/OBV/Simple/server.cpp:
-          Cleanup
-
-Wed Jun 29 11:13:02 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/AnyTypeCode/TypeCode_Case_T.h:
-        * tao/Basic_Argument_T.h:
-        * tao/Invocation_Adapter.h:
-        * tao/Bounded_Basic_String_Sequence_T.h:
-        * tao/Generic_Sequence_T.h:
-          Layout changes
-
-        * tao/Object.cpp:
-          Fixed coverity errors
-
-        * tao/Incoming_Message_Stack.h:
-          Removed borland workaround
-
-Wed Jun 29 10:47:05 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB_Core.cpp:
-          Fixed coverity errors
-
-Mon Jun 27 10:28:15 UTC 2011  Martin Corino  <mcorino@remedy.nl>
-
-        * tao/CDR.h:
-        * tao/CDR.inl:
-          Added CDR streaming ops for std::wstring and helper classes
-          and streaming ops to extract bounded strings into std strings.
-
-Thu Jun 23 12:39:08 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * etc/*.doxygen:
-          Disable html help, seems doxygen now disables the search option
-          when html help is enabled
-
-Thu Jun 23 13:46:08 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO version 2.0.3 released.
-
-Wed Jun 22 18:25:21 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/AnyTypeCode/Any_Basic_Impl.cpp:
-        * tao/AnyTypeCode/Any_Basic_Impl.h:
-        * tests/LongDouble/client.cpp:
-        * tests/IDL_Test/constants.idl:
-        * tests/IDL_Test/union.idl:
-        * TAO_IDL/include/ast_expression.h:
-        * TAO_IDL/be/be_helper.cpp:
-        * TAO_IDL/be/be_visitor_constant/constant_cs.cpp:
-        * TAO_IDL/be/be_visitor_constant/constant_ch.cpp:
-        * TAO_IDL/ast/ast_constant.cpp:
-        * TAO_IDL/ast/ast_expression.cpp:
-        * NEWS:
-
-          Reverted all changes related to support for long double
-          constants in IDL.
-
-Wed Jun 22 15:15:05 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        * orbsvcs/orbsvcs/Naming/Naming_Server.cpp:
-
-          Ensure the naming service can use the CSD_TP strategy if necessary.
-          Since the naming service is single threaded, it can become a
-          bottleneck when there is very heavy use.
-
-          The need for this change may also indicate a problem with the
-          CSD strategy implementation. It appears that the thread pool at
-          least is only initialized when the POA Manager is activated. If
-          A POA is created with using a POA Manager already in the active
-          state, the TP is not initialized. Alternatively this might be a
-          problem with the POA creation, that create_POA can be supplied a
-          POA Manager that is already been activated, and the new POA is
-          itself instantly active.
-
-Wed Jun 22 14:49:09 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/Security/BiDirectional/run_test.pl:
-        * orbsvcs/tests/Security/Big_Request/run_test.pl:
-          Added -clog and -slog to write a separate client and server log file
-          to disk
-
-Tue Jun 21 13:07:15 UTC 2011  Olli Savia  <ops@iki.fi>
-
-        * TAO_IDL/util/utl_err.cpp:
-          Fixed typo.
-
-Thu Jun 16 15:30:23 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tests/IDL_Test/constants.idl:
-
-          Guarded out the long double constant set to the double max
-          value, for MinGW, which outputs a floating point error
-          for this value.
-
-Thu Jun 16 14:00:53 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tests/LongDouble/client.cpp:
-
-          Replaced '==' with equivalent '<' and '>' expressions for
-          a long double, some platoforms warn that '==' shouldn't
-          be used with floating point types.
-
-Thu Jun 16 07:56:54 UTC 2011  Simon Massey  <sma at prismtech dot com>
-
-        * orbsvcs/tests/Security/Big_Request/cacert.pem:
-        * orbsvcs/tests/Security/Big_Request/client_cert.pem:
-        * orbsvcs/tests/Security/Big_Request/client_key.pem:
-        * orbsvcs/tests/Security/Big_Request/server_cert.pem:
-        * orbsvcs/tests/Security/Big_Request/server_key.pem:
-
-          Updated certificates - Missed one.
-
-Wed Jun 15 14:36:54 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * orbsvcs/tests/Security/Bug_1107_Regression/cacert.pem:
-        * orbsvcs/tests/Security/Bug_1107_Regression/client_cert.pem:
-        * orbsvcs/tests/Security/Bug_1107_Regression/client_key.pem:
-        * orbsvcs/tests/Security/Bug_1107_Regression/server_cert.pem:
-        * orbsvcs/tests/Security/Bug_1107_Regression/server_key.pem:
-        * orbsvcs/tests/Security/Callback/cacert.pem:
-        * orbsvcs/tests/Security/Callback/client_cert.pem:
-        * orbsvcs/tests/Security/Callback/client_key.pem:
-        * orbsvcs/tests/Security/Callback/server_cert.pem:
-        * orbsvcs/tests/Security/Callback/server_key.pem:
-        * orbsvcs/tests/Security/Crash_Test/cacert.pem:
-        * orbsvcs/tests/Security/Crash_Test/client_cert.pem:
-        * orbsvcs/tests/Security/Crash_Test/client_key.pem:
-        * orbsvcs/tests/Security/Crash_Test/server_cert.pem:
-        * orbsvcs/tests/Security/Crash_Test/server_key.pem:
-        * orbsvcs/tests/Security/Null_Cipher/cacert.pem:
-        * orbsvcs/tests/Security/Null_Cipher/client_cert.pem:
-        * orbsvcs/tests/Security/Null_Cipher/client_key.pem:
-        * orbsvcs/tests/Security/Null_Cipher/server_cert.pem:
-        * orbsvcs/tests/Security/Null_Cipher/server_key.pem:
-        * orbsvcs/tests/Security/Secure_Invocation/cacert.pem:
-        * orbsvcs/tests/Security/Secure_Invocation/client_cert.pem:
-        * orbsvcs/tests/Security/Secure_Invocation/client_key.pem:
-        * orbsvcs/tests/Security/Secure_Invocation/server_cert.pem:
-        * orbsvcs/tests/Security/Secure_Invocation/server_key.pem:
-        * orbsvcs/tests/Security/mixed_security_test/cacert.pem:
-        * orbsvcs/tests/Security/mixed_security_test/client_cert.pem:
-        * orbsvcs/tests/Security/mixed_security_test/client_key.pem:
-        * orbsvcs/tests/Security/mixed_security_test/server_cert.pem:
-        * orbsvcs/tests/Security/mixed_security_test/server_key.pem:
-
-          Updated certificates.
-
-        * orbsvcs/tests/Security/cert:
-        * orbsvcs/tests/Security/cert/DOCCA:
-        * orbsvcs/tests/Security/cert/DOCCA/cacert.pem:
-        * orbsvcs/tests/Security/cert/DOCCA/certs:
-        * orbsvcs/tests/Security/cert/DOCCA/index.txt:
-        * orbsvcs/tests/Security/cert/DOCCA/index.txt.attr:
-        * orbsvcs/tests/Security/cert/DOCCA/index.txt.attr.old:
-        * orbsvcs/tests/Security/cert/DOCCA/index.txt.old:
-        * orbsvcs/tests/Security/cert/DOCCA/newcerts:
-        * orbsvcs/tests/Security/cert/DOCCA/newcerts/1000.pem:
-        * orbsvcs/tests/Security/cert/DOCCA/newcerts/1001.pem:
-        * orbsvcs/tests/Security/cert/DOCCA/private:
-        * orbsvcs/tests/Security/cert/DOCCA/private/cakey.pem:
-        * orbsvcs/tests/Security/cert/DOCCA/serial:
-        * orbsvcs/tests/Security/cert/DOCCA/serial.old:
-        * orbsvcs/tests/Security/cert/README:
-        * orbsvcs/tests/Security/cert/cacert.pem:
-        * orbsvcs/tests/Security/cert/client_cert.pem:
-        * orbsvcs/tests/Security/cert/client_key.pem:
-        * orbsvcs/tests/Security/cert/openssl.cnf:
-        * orbsvcs/tests/Security/cert/server_cert.pem:
-        * orbsvcs/tests/Security/cert/server_key.pem:
-
-          Added the full CA information used to sign the above certs.  These certs
-          are good for the next 20 years.
-
-        * orbsvcs/tests/Security/Secure_Invocation/client_key_nopasswd.pem:
-        * orbsvcs/tests/Security/Secure_Invocation/server_key_nopasswd.pem:
-        * orbsvcs/tests/Security/mixed_security_test/client_key_nopasswd.pem:
-        * orbsvcs/tests/Security/mixed_security_test/server_key_nopasswd.pem:
-
-          Removed these files.
-
-Wed Jun 15 08:54:50 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_operation/operation_ch.cpp:
-          Reverted 3971 change, broke some CCM tests
-
-Tue Jun 14 13:12:05 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_valuetype.cpp:
-        * TAO_IDL/be/be_valuetype.h:
-        * TAO_IDL/be/be_visitor_amh_pre_proc.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp:
-
-          Added code generation for AMH exception holder's default
-          constructor to initialize the CORBA::Exception* member
-          to 0. This fix closes [BUGID:3970].
-
-Tue Jun 14 12:18:00 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_operation/operation_ch.cpp:
-          Only the methods for operations in local interfaces need to be
-          virtual. This reduces footprint and improves performance, this
-          fixes bugzilla 3971
-
-Fri Jun 10 19:08:19 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_helper.cpp:
-
-          Used the recently added ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII
-          to generate long double literals portably.
-
-Fri Jun 10 12:41:00 UTC 2011  Simon Massey <sma at prismtech dot com>
-
-        * tests/MT_NoUpcall_Client_Leader/run_test.pl:
-
-          This test wasn't capable of exiting with an error, it was
-          always successful even if the test failed.
-
-        * tests/MT_NoUpcall_Client_Leader/client.cpp:
-        * tests/MT_NoUpcall_Client_Leader/server.cpp:
-
-          The mutex needed to be locked prior to worker thread creation
-          and the stop_condition.wait condition, then released after,
-          otherwise worker threads can signal prior to the server/client
-          being ready to deal with the event. Client needed to
-          pause before the issuing the shutdown request to the server
-          so as to allow it to finish its own worker thread.
-
-        * tests/MT_NoUpcall_Client_Leader/police.cpp:
-
-          The stat test in the loop was occationally detecting the creation
-          of the ior file before the contents had been written. Moving
-          the sleep after the stat and before the test allows the contents to
-          be output before allowing the client/server to use the ior it
-          has just detected.
-
-        * tests/MT_NoUpcall_Client_Leader/chatter.cpp:
-        * tests/MT_NoUpcall_Client_Leader/chatter.h:
-
-          Need to mutex control access to the two nrequests_ and nreplies_
-          counts, as the client has two concurrent worker threads competing
-          to update them, these counts also need to be volitile.
-
-Thu Jun  9 19:38:48 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_helper.cpp:
-
-          Changed print format of long double literal to be conditional,
-          based on the existence of a native 16-byte long double, in
-          order to eliminate warnings of rhs and lhs type mismatch.
-
-Thu Jun  9 17:28:25 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_constant/constant_ch.cpp:
-        * TAO_IDL/be/be_visitor_constant/constant_cs.cpp:
-
-          Changed generated code to always use a constructor with an
-          ACE_CDR::LongDoubleAssign argument for long double constants.
-
-Thu Jun  9 07:05:59 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp:
-        * orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp:
-          Fixed gcc 4.6 warnings
-
-Thu Jun  9 01:09:40 UTC 2011  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp (TAO_Notify_ThreadPool_Task::execute):
-          Fixed a memory leak that occurred when the enqueue() failed.
-          Thanks to Jochen Meier <gesammeltimusenet2009 at arcor dot de> for
-          reporting this and suggesting a fix.
-
-Mon Jun  6 19:53:54 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/AnyTypeCode/Any_Basic_Impl.cpp:
-        * tao/AnyTypeCode/Any_Basic_Impl.h:
-
-          Restored the long double member back to the member union of
-          Any_Basic_Impl. A change suggested by Adam Mitz <mitza at
-          ociweb dot com> enabled the use of the LongDouble emulator
-          struct without constructors or assignment operators.
-
-        * TAO_IDL/be/be_visitor_constant/constant_ch.cpp:
-        * TAO_IDL/be/be_visitor_constant/constant_cs.cpp:
-
-          Changed code generation for long double constant initialization,
-          when 16-byte native long double does not exist, to use the
-          new LongDoubleAssign struct in ACE_CDR.
-
-        * tests/IDL_Test/union.idl:
-
-          Added a test case of a union containing a long double, to
-          test that the generated union doesn't contain a member
-          with a constructor.
-
-Mon Jun  6 18:59:41 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_helper.cpp:
-
-          Restored minimum significant digit suggestions for the format
-          string for double, and added them to the format string for
-          long double.
-
-Mon Jun  6 17:28:05 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/AnyTypeCode/Any_Basic_Impl.cpp:
-        * tao/AnyTypeCode/Any_Basic_Impl.h:
-
-          Added a separate member for long doubles, rather than have
-          support for long doubles on all platforms disabled because
-          the struct that is now used for some long double representations
-          has a constructor.
-
-        * tests/DynAny_Test/test_dynany.cpp:
-
-          Reverted the change in
-
-          Fri Jun  3 18:54:59 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-          since that part of the test will work again.
-
-Mon Jun  6 15:06:42 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_global.cpp:
-        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
-        * TAO_IDL/be_include/be_global.h:
-        * TAO_IDL/fe/lex.yy.cpp:
-        * TAO_IDL/include/idl_global.h:
-        * TAO_IDL/util/utl_global.cpp:
-          Extended DDS support
-
-Fri Jun  3 18:54:59 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tao/AnyTypeCode/Any_Basic_Impl.cpp:
-        * tao/AnyTypeCode/Any_Basic_Impl.h:
-
-          On platforms where native long doubles aren't 16 bytes,
-          eliminated case where an Any contains a CORBA::LongDouble.
-          The class contains a C++ union, which can't contain a
-          non-native LongDouble ( a struct) since it now has a constructor.
-          A fair tradeoff since in return for the recent changes to
-          ACE_CDR::LongDouble, we now have support for IDL constants
-          of type CORBA::LongDouble on all platforms.
-
-        * tests/DynAny_Test/test_dynany.cpp:
-
-          Similarly to the above item, eliminated the test for long
-          double on platforms where a non-native struct alternative
-          is used.
-
-Thu Jun  2 12:24:59 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_helper.cpp:
-
-          - Fixed print format for long double, eliminated warnings.
-          - Added '#' flag to all floating point print formats, forces
-            printing of decimal point even if not present in IDL.
-
-Wed Jun  1 19:39:08 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/include/AST_Expression.h:
-        * TAO_IDL/ast/AST_Expression.cpp
-        * TAO_IDL/ast/AST_Constant.cpp
-        * TAO_IDL/be/be_helper.cpp:
-        * TAO_IDL/be/be_visitor_constant/constant_ch.cpp:
-        * TAO_IDL/be/be_visitor_constant/constant_cs.cpp:
-
-          Added support for long double constants in IDL.
-
-        * tests/IDL_Test/constants.idl:
-
-          Added test cases for long double constants.
-
-        * NEWS:
-
-          Added item about long double constant support.
-
-Wed Jun  1 09:46:54 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp:
-        * orbsvcs/tests/Log/Basic_Log_Test/client.cpp:
-        * tests/ORB_Local_Config/Two_DLL_ORB/client.cpp:
-        * tests/ORB_Local_Config/Two_DLL_ORB/server.cpp:
-          Fixed Coverity warnings regarding uncaught exceptions.
-
-Tue May 31 05:47:19 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * tests/Sequence_Unit_Tests/string_sequence_tester.hpp:
-          Fixed gcc 4.6 warnings: variable was set but not used.
-
-Mon May 30 10:21:08 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * examples/Logging/Logger_i.cpp:
-          Resolved gcc 4.6 warning: variable may be used uninitialized
-          in this function
-
-Mon May 30 10:00:33 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * orbsvcs/LoadBalancer/LoadMonitor.cpp:
-          Fixed compiler error on Windows.
-
-Mon May 30 06:39:12 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * tests/Sequence_Unit_Tests/string_sequence_tester.hpp:
-        * tests/Smart_Proxies/Benchmark/client.cpp:
-          Resolved gcc 4.6 warnings: variable was set but not used.
-
-Fri May 27 14:35:57 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * tests/Bug_2936_Regression/bug2936.cpp:
-        * tests/Bug_3926_Regression/Client_Request_Interceptor.cpp:
-        * tests/Exposed_Policies/RT_Properties.cpp:
-        * tests/IOR_Endpoint_Hostnames/list_interfaces.cpp:
-          Resolved gcc 4.6 warnings: variable was set but not used.
-
-        * tests/POA/Bug_2511_Regression/server.cpp:
-          Resolved gcc 4.6 warnings: variable was set but not used.
-          Code alignment.
-
-Fri May 27 14:13:08 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * performance-tests/POA/Demux/demux_test_server.cpp:
-        * tests/Bug_2677_Regression/DllORB.cpp:
-        * tests/Bug_2683_Regression/server.cpp:
-          Resolved gcc 4.6 warnings: variable was set but not used.
-
-Fri May 27 13:52:37 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_union/union_ch.cpp:
-          Removed generation of holder_ member of an union, it is not used
-          at all
-
-Fri May 27 10:09:25 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * orbsvcs/examples/ImR/Advanced/TestClient.cpp:
-        * orbsvcs/tests/IOR_MCast/client.cpp:
-        * orbsvcs/tests/Security/Bug_1107_Regression/client.cpp:
-          Statisfy Coverity and the GNU 4.6 gcc compiler. Using a
-          returned value either by using ACE_UNUSED_ARG or to print
-          in a log message.
-
-        * tests/Sequence_Unit_Tests/value_sequence_tester.hpp:
-          Fuzz.
-
-Fri May 27 09:14:29 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * orbsvcs/LoadBalancer/LoadMonitor.cpp:
-        * orbsvcs/examples/ImR/Advanced/TestClient.cpp:
-        * orbsvcs/tests/Bug_3486_Regression/server.cpp:
-        * orbsvcs/tests/IOR_MCast/client.cpp:
-        * orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp:
-        * orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp:
-        * orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp:
-        * orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp:
-        * orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp:
-        * orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp:
-        * orbsvcs/tests/Security/Bug_1107_Regression/client.cpp:
-          Resolved gcc 4.6 warnings: variable was set but not used.
-
-Thu May 26 15:25:36 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * TAO_IDL/fe/fe_utils.cpp:
-          tmp variable wasn't necessary. Removed it.
-
-Thu May 26 14:13:05 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp:
-        * TAO_IDL/fe/fe_utils.cpp:
-        * tao/Strategies/COIOP_Acceptor.cpp:
-          Resolved gcc 4.6 warnings: variable was set but not used.
-
-Thu May 26 13:48:29 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp:
-        * tests/Sequence_Unit_Tests/Bounded_String.cpp:
-        * tests/Sequence_Unit_Tests/Unbounded_Octet.cpp:
-        * tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp:
-        * tests/Sequence_Unit_Tests/Unbounded_String.cpp:
-          Catch uncaught exceptions in main.
-
-Thu May 26 13:11:19 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * tao/Generic_Sequence_T.h:
-          Added file name to doxygen documentation
-
-        * tests/Sequence_Unit_Tests/value_sequence_tester.hpp:
-          Resolved Coverity warning: catching a uncaught BAD_PARAM exception.
-
-Fri May 20 22:07:56 UTC 2011  Adam Mitz  <mitza@ociweb.com>
-
-        * tao/AnyTypeCode/TAO_AnyTypeCode.rc:
-        * tao/Codeset/TAO_Codeset.rc:
-        * tao/PI/TAO_PI.rc:
-        * tao/PI_Server/TAO_PI_Server.rc:
-        * tao/Utils/TAO_Utils.rc:
-        * tao/ZIOP/TAO_ZIOP.rc:
-
-          Add resource files to get TAO version number on DLLs.
-
-Fri May 20 14:20:53 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Oneway_Timeouts/test.mpc:
-          Added explicit idl project to get correct build order on VMS
-
-Thu May 19 14:53:55 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
-        * tests/QtTests/client.cpp:
-        * tests/QtTests/client.h:
-        * tests/QtTests/QtTests.mpc:
-        * tests/QtTests/server.cpp:
-        * tests/QtTests/test_i.h:
-        Adapted to qt4.
-
-Tue May 17 19:20:55 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/OBV/Indirection/MessengerServer.cpp:
-        * tests/Portable_Interceptors/Slot/driver.cpp:
-          Catch exceptions in main
-
-Tue May 17 11:32:18 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp:
           Layout changes to the generated code
 
-Fri May 13 08:04:48 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * tao/Bounded_Basic_String_Sequence_T.h:
-        * tao/Bounded_Object_Reference_Sequence_T.h:
-        * tao/Bounded_Value_Sequence_T.h:
-        * tao/Unbounded_Basic_String_Sequence_T.h:
-        * tao/Unbounded_Object_Reference_Sequence_T.h:
-          Doxygen changes.
-
-Wed May 11 18:43:15 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ObjectKey_Table.h:
-        * tao/orbconf.h:
-        * tao/params.h:
-          Doxygen changes
-
-Wed May 11 13:35:28 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
-        * tao/QtResource/QtResource_Loader.h:
-        Changed for QT4 deprecated include QT/..
-
-Tue May 10 18:15:28 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ImR_Client/ImR_Client.cpp:
-          changed variable name to not match method argument
-
-        * utils/catior/catior.cpp:
-        * utils/nslist/nsadd.cpp:
-        * utils/nslist/nsdel.cpp:
-        * utils/nslist/nslist.cpp:
-          Fixed coverity errors, not leak exceptions
-
-Tue May 10 06:15:43 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * tao/IORManipulation/IORManip_IIOP_Filter.cpp:
-          Fixed compile error.
-
-Mon May  9 19:10:54 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_interface.cpp:
-        * tao/CSD_ThreadPool/CSD_TP_Task.cpp:
-        * tao/IORManipulation/IORManip_IIOP_Filter.cpp:
-          Fixed coverity errors
-
-Wed Apr 27 13:35:10 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO.mwc:
-          Exclude DAnCE, thanks to Remko Duppen <remko dot duppen at syntel dot nl>
-          for reporting this
-
-Tue Apr 26 13:12:03 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp:
-          Layout changes generated code
-
-Tue Apr 26 13:04:11 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Collocation_Resolver.h:
-        * tao/Connect_Strategy.h:
-        * tao/Endpoint_Selector_Factory.h:
-        * tao/GIOP_Message_Base.h:
-        * tao/GIOP_Message_Generator_Parser.h:
-        * tao/GIOP_Message_Generator_Parser_10.h:
-        * tao/GIOP_Message_Generator_Parser_11.h:
-        * tao/GIOP_Message_Generator_Parser_Impl.h:
-        * tao/GIOP_Message_State.h:
-        * tao/GIOP_Utils.h:
-        * tao/GUIResource_Factory.h:
-        * tao/LF_Connect_Strategy.h:
-        * tao/LF_Follower.cpp:
-          Doxygen changes
-
-Tue Apr 26 12:50:24 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/ORB_Core.cpp:
-        * tao/Thread_Lane_Resources.h:
-        * tao/Thread_Lane_Resources_Manager.h:
-        * tao/Thread_Per_Connection_Handler.h:
-        * tao/Transport.h:
-        * tao/Transport_Connector.h:
-        * tao/TypeCodeFactory_Adapter.h:
-          Doxygen changes
-
-Tue Apr 26 12:21:05 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Acceptor_Impl.h:
-        * tao/Acceptor_Impl.cpp:
-        * tao/Acceptor_Registry.h:
-        * tao/Adapter_Registry.h:
-        * tao/Bind_Dispatcher_Guard.h:
-        * tao/Blocked_Connect_Strategy.h:
-        * tao/Blocked_Connect_Strategy.cpp:
-        * tao/Cleanup_Func_Registry.h:
-        * tao/Collocated_Invocation.cpp:
-        * tao/LF_Event_Loop_Thread_Helper.inl:
-        * tao/LF_Follower_Auto_Adder.inl:
-        * tao/Leader_Follower.cpp:
-        * tao/Queued_Message.h:
-        * tao/Transport_Cache_Manager_T.cpp:
-        * tao/Wait_On_LF_No_Upcall.h:
-        * tao/Wait_On_LF_No_Upcall.cpp:
-        * tao/Wait_On_Reactor.h:
-        * tao/Wait_On_Read.h:
-          Doxygen changes
-
-Tue Apr 26 11:57:42 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Leader_Follower.h:
-        * tao/Leader_Follower.inl:
-        * tao/Wait_On_LF_No_Upcall.h:
-        * tao/Wait_On_Leader_Follower.h:
-        * tao/Wait_On_Reactor.h:
-        * tao/Wait_On_Read.h:
-        * tao/Wait_Strategy.h:
-          Use explicit for single argument constructors, doxygen improvements
-
-Tue Apr 26 11:13:59 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/MT_NoUpcall_Client_Leader/client.cpp:
-        * tests/MT_NoUpcall_Client_Leader/run_test.pl:
-        * tests/MT_NoUpcall_Client_Leader/server.cpp:
-          Make it possible to pass number of threads through the commandline
-
-Tue Apr 26 09:42:36 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Leader_Follower.h:
-        * tao/Leader_Follower.inl:
-          Use bool instead of int for several methods
-
-        * tao/Thread_Lane_Resources.cpp:
-          Simplied some code
-
-Tue Apr 26 09:26:48 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          MT_NoUpcall_Client_Leader shouldn't run when there is no messaging
-
-Tue Apr 26 09:00:31 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Disabled some tests with CORBA/e micro
-
-        * tao/Connection_Handler.cpp:
-        * tao/Resume_Handle_Deferred.h:
-        * tao/Resume_Handle_Deferred.cpp:
-          Use reference counting for deletion, also log an error and return -1
-          when schedule_timer fails, we have a critical error at that moment
-
-        * tao/Policy_Validator.cpp:
-        * tao/TAO_Singleton.cpp:
-        * tao/Leader_Follower.cpp:
-          Use %@ for logging pointers
-
-Fri Apr 22 12:41:53 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * orbsvcs/tests/Bug_3418_Regression/b.conf:
-        * orbsvcs/tests/HTIOP/HT_Config.conf:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/non-windows.conf:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/windows.conf:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/non-windows.conf:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf:
-        * orbsvcs/tests/Notify/Lanes/consumer.conf:
-        * orbsvcs/tests/Notify/Lanes/notify.conf:
-        * performance-tests/Protocols/lksctp_params.conf:
-        * performance-tests/Protocols/sctp_params.conf:
-        * performance-tests/RTCorba/Thread_Pool/native-svc.conf:
-        * tests/Bug_3068_Regression/server.conf:
-        * tests/ORB_Local_Config/Bug_1459/m.conf:
-        * tests/ORB_Local_Config/Two_DLL_ORB/secondary-empty.conf:
-        * tests/RTCORBA/Explicit_Binding/svc.conf:
-          Fuzz: added $Id string
-
-Fri Apr 22 12:14:18 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Connection_Handler.cpp:
-        * tao/Resume_Handle_Deferred.h:
-        * tao/Resume_Handle_Deferred.cpp:
-          Notify a specific event handler
-
-        * tao/Resume_Handle_Deferred.inl:
-          Removed this file, virtual methods may not be inline
-
-Fri Apr 22 11:56:20 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Resume_Handle_Deferred.h:
-        * tao/Resume_Handle_Deferred.inl:
-        * tao/Resume_Handle_Deferred.cpp:
-          We should only trigger the reactor
-
-        * tao/Transport.cpp:
-          Doxygen changes
-
-Fri Apr 22 07:28:43 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * DevGuideExamples/Multithreading/Reactive/svc.conf:
-        * DevGuideExamples/Multithreading/ThreadPerConnection/server.conf:
-        * DevGuideExamples/RTCORBA/svc.conf:
-        * docs/tutorials/Quoter/Event_Service/ec.conf:
-        * examples/PluggableUDP/tests/Performance/svc.conf:
-        * examples/PluggableUDP/tests/SimplePerformance/svc.conf:
-        * examples/RTCORBA/Activity/client.conf:
-        * examples/RTCORBA/Activity/server.conf:
-        * examples/RTCORBA/Activity/svc.conf.client:
-        * examples/RTCORBA/Activity/svc.conf.server:
-        * examples/RTScheduling/Fixed_Priority_Scheduler/svc.conf.client:
-        * examples/RTScheduling/Fixed_Priority_Scheduler/svc.conf.server:
-        * examples/RTScheduling/MIF_Scheduler/svc.conf.client:
-        * examples/RTScheduling/MIF_Scheduler/svc.conf.server:
-        * orbsvcs/Concurrency_Service/svc.conf:
-        * orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/supplier.conf:
-        * orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/ec.conf:
-        * orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/supplier.conf:
-        * orbsvcs/DevGuideExamples/NotifyService/RTNotify/notify.conf:
-        * orbsvcs/DevGuideExamples/NotifyService/RTNotify/nsclient.conf:
-        * orbsvcs/DevGuideExamples/ValueTypes/Notify/notify.conf:
-        * orbsvcs/Event_Service/svc.conf:
-        * orbsvcs/Logging_Service/Notify_Logging_Service/svc.conf:
-        * orbsvcs/TAO_Service/svc.conf:
-        * orbsvcs/examples/ImR/Combined_Service/dynserver.conf:
-        * orbsvcs/examples/ImR/Combined_Service/start_all.conf:
-        * orbsvcs/examples/Notify/Lanes/client.conf:
-        * orbsvcs/examples/Notify/Lanes/notify.conf:
-        * orbsvcs/examples/Notify/ThreadPool/client.conf:
-        * orbsvcs/examples/Notify/ThreadPool/notify.conf:
-        * orbsvcs/examples/RtEC/IIOPGateway/ec.conf:
-        * orbsvcs/examples/RtEC/IIOPGateway/gateway.conf:
-        * orbsvcs/examples/RtEC/Kokyu/svc.conf:
-        * orbsvcs/examples/RtEC/MCast/svc.conf:
-        * orbsvcs/examples/RtEC/Schedule/svc.conf:
-        * orbsvcs/examples/RtEC/Simple/ec.conf:
-        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_reactive.conf:
-        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_rtcorba.conf:
-        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_threaded.conf:
-        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_null.conf:
-        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_per_supplier.conf:
-        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_read.conf:
-        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_write.conf:
-        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_delayed.conf:
-        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_immediate.conf:
-        * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/roundtrip.conf:
-        * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/realtime.conf:
-        * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/realtime.conf:
-        * orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_reactive.conf:
-        * orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_rtcorba.conf:
-        * orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_threaded.conf:
-        * orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_read.conf:
-        * orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_write.conf:
-        * orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_delayed.conf:
-        * orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_immediate.conf:
-        * orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_null.conf:
-        * orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_per_supplier.conf:
-        * orbsvcs/performance-tests/RTEvent/Roundtrip/roundtrip.conf:
-        * orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf:
-        * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf:
-        * orbsvcs/tests/Bug_2316_Regression/svc.conf:
-        * orbsvcs/tests/Bug_2377_Regression/svc.conf:
-        * orbsvcs/tests/Bug_2925_Regression/svc.conf:
-        * orbsvcs/tests/Bug_3387_Regression/NotSvc.conf:
-        * orbsvcs/tests/Bug_3418_Regression/m.conf:
-        * orbsvcs/tests/Bug_3444_Regression/diop_svc.conf:
-        * orbsvcs/tests/Bug_3444_Regression/miop_svc.conf:
-        * orbsvcs/tests/CosEvent/Basic/svc.pull.conf:
-        * orbsvcs/tests/CosEvent/Timeout/cosevent.conf:
-        * orbsvcs/tests/EC_MT_Mcast/svc.conf:
-        * orbsvcs/tests/EC_Mcast/svc.conf:
-        * orbsvcs/tests/EC_Throughput/ec.conf:
-        * orbsvcs/tests/Event/Basic/control.conf:
-        * orbsvcs/tests/Event/Basic/mt.svc.conf:
-        * orbsvcs/tests/Event/Basic/observer.conf:
-        * orbsvcs/tests/Event/Basic/svc.complex.conf:
-        * orbsvcs/tests/Event/Basic/svc.conf:
-        * orbsvcs/tests/Event/Mcast/Complex/consumer-ec.conf:
-        * orbsvcs/tests/Event/Mcast/Complex/supplier-ec.conf:
-        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/supplier.conf:
-        * orbsvcs/tests/Event/Mcast/Two_Way/gateway.conf:
-        * orbsvcs/tests/Event/Performance/ec.list.conf:
-        * orbsvcs/tests/Event/Performance/ec.mt.conf:
-        * orbsvcs/tests/Event/Performance/ec.rb_tree.conf:
-        * orbsvcs/tests/Event/Performance/ec.st.conf:
-        * orbsvcs/tests/Event/Performance/latency.conf:
-        * orbsvcs/tests/Event/UDP/svc.conf:
-        * orbsvcs/tests/HTIOP/AMI/exclusive.conf:
-        * orbsvcs/tests/HTIOP/AMI/muxed.conf:
-        * orbsvcs/tests/ImplRepo/scale/client.conf:
-        * orbsvcs/tests/InterfaceRepo/Persistence_Test/svc.conf:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/svc.conf:
-        * orbsvcs/tests/Miop/McastHello/svc.conf:
-        * orbsvcs/tests/Notify/Basic/notify.mt.conf:
-        * orbsvcs/tests/Notify/Basic/notify.reactive.conf:
-        * orbsvcs/tests/Notify/Basic/notify.rt.conf:
-        * orbsvcs/tests/Notify/Blocking/notify.conf:
-        * orbsvcs/tests/Notify/Bug_1385_Regression/notify.conf:
-        * orbsvcs/tests/Notify/Bug_1884_Regression/ecf.conf:
-        * orbsvcs/tests/Notify/Lanes/consumer.conf:
-        * orbsvcs/tests/Notify/Persistent_Filter/NS.conf:
-        * orbsvcs/tests/Notify/PluggableTopology/plugtop_ns.conf:
-        * orbsvcs/tests/Notify/Reconnecting/event.conf:
-        * orbsvcs/tests/Notify/Reconnecting/ns_mt.conf:
-        * orbsvcs/tests/Notify/Reconnecting/ns_mt_both.conf:
-        * orbsvcs/tests/Notify/Reconnecting/ns_mt_topo.conf:
-        * orbsvcs/tests/Notify/Reconnecting/ns_st.conf:
-        * orbsvcs/tests/Notify/Reconnecting/ns_st_both.conf:
-        * orbsvcs/tests/Notify/Reconnecting/ns_st_topo.conf:
-        * orbsvcs/tests/Notify/ThreadPool/consumer.conf:
-        * orbsvcs/tests/Notify/ThreadPool/notify.conf:
-        * orbsvcs/tests/Notify/ThreadPool/supplier.conf:
-        * orbsvcs/tests/Notify/Validate_Client/notify.conf:
-        * orbsvcs/tests/Notify/XML_Persistence/svc.conf:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf:
-        * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf:
-        * orbsvcs/tests/Security/BiDirectional/client.conf:
-        * orbsvcs/tests/Security/BiDirectional/server.conf:
-        * orbsvcs/tests/Security/Bug_2908_Regression/client.conf:
-        * orbsvcs/tests/Security/Bug_2908_Regression/server.conf:
-        * orbsvcs/tests/Security/EndpointPolicy/svc.conf:
-        * orbsvcs/tests/Security/InsecureReferences/client.conf:
-        * orbsvcs/tests/Security/MT_IIOP_SSL/client.conf:
-        * orbsvcs/tests/Security/MT_IIOP_SSL/server.conf:
-        * orbsvcs/tests/Security/MT_SSLIOP/client.conf:
-        * orbsvcs/tests/Security/MT_SSLIOP/server.conf:
-        * orbsvcs/tests/Security/ssliop_CSD/csd.conf:
-        * orbsvcs/tests/Security/ssliop_corbaloc/client.conf:
-        * orbsvcs/tests/Security/ssliop_corbaloc/server.conf:
-        * orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf:
-        * performance-tests/Protocols/altq.conf:
-        * performance-tests/Protocols/svc.conf:
-        * performance-tests/RTCorba/Thread_Pool/svc.conf:
-        * tests/AMI/muxed.conf:
-        * tests/AMI_Timeouts/svc.conf:
-        * tests/Bug_2186_Regression/server.conf:
-        * tests/Bug_2935_Regression/middle.conf:
-        * tests/Bug_3000_Regression/rw.conf:
-        * tests/Bug_3068_Regression/client.conf:
-        * tests/Bug_3163_Regression/server.conf:
-        * tests/Bug_3251_Regression/Bug_3251.conf:
-        * tests/Bug_3598a_Regression/svc.conf:
-        * tests/Bug_3630_Regression/TAO Conf File.conf:
-        * tests/Bug_3630_Regression/TAO_Conf_File.conf:
-        * tests/Bug_3683_Regression/svc.conf:
-        * tests/Bug_3801_Regression/exclusive.conf:
-        * tests/Bug_3801_Regression/muxed.conf:
-        * tests/Bug_3837_Regression/logger.conf:
-        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/svc.conf:
-        * tests/CSD_Strategy_Tests/TP_Test_Static/svc.conf:
-        * tests/CodeSets/simple/cs_test.conf:
-        * tests/CodeSets/simple/svc.conf:
-        * tests/CodeSets/simple/wcs_test.conf:
-        * tests/Collocation_Opportunities/svc.conf:
-        * tests/Exposed_Policies/svc.conf:
-        * tests/Leader_Followers/select_mt.conf:
-        * tests/Leader_Followers/tp.conf:
-        * tests/ORB_Local_Config/Bug_1459/a.conf:
-        * tests/ORB_Local_Config/Bug_1459/b.conf:
-        * tests/ORB_Local_Config/Bug_1459/d.conf:
-        * tests/ORB_Local_Config/Bug_1459/m1.conf:
-        * tests/ORB_Local_Config/Bug_3049/a.conf:
-        * tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf:
-        * tests/ORB_Local_Config/Two_DLL_ORB/primary-csd.conf:
-        * tests/ORB_Local_Config/Two_DLL_ORB/primary-ssl.conf:
-        * tests/ORB_Local_Config/Two_DLL_ORB/secondary-csd.conf:
-        * tests/ORB_Local_Config/Two_DLL_ORB/secondary-ssl.conf:
-        * tests/Oneway_Send_Timeouts/block_flush.conf:
-        * tests/Oneway_Send_Timeouts/lf_flush.conf:
-        * tests/Oneway_Send_Timeouts/reactive_flush.conf:
-        * tests/Optimized_Connection/oc_svc.conf:
-        * tests/POA/EndpointPolicy/multi_prot.conf:
-        * tests/POA/Explicit_Activation/alternate.conf:
-        * tests/Parallel_Connect_Strategy/blocked.conf:
-        * tests/Parallel_Connect_Strategy/reactive.conf:
-        * tests/RTCORBA/Banded_Connections/svc.conf:
-        * tests/RTCORBA/Bug_3382_Regression/svc.conf:
-        * tests/RTCORBA/Bug_3643_Regression/svc.conf.dynamic:
-        * tests/RTCORBA/Client_Propagated/svc.conf:
-        * tests/RTCORBA/Client_Protocol/svc.conf:
-        * tests/RTCORBA/Collocation/continuous.conf:
-        * tests/RTCORBA/Collocation/svc.conf:
-        * tests/RTCORBA/Destroy_Thread_Pool/continuous.conf:
-        * tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf:
-        * tests/RTCORBA/Dynamic_Thread_Pool/svc.conf:
-        * tests/RTCORBA/Linear_Priority/svc.conf:
-        * tests/RTCORBA/MT_Client_Protocol_Priority/svc.conf:
-        * tests/RTCORBA/Persistent_IOR/continuous.conf:
-        * tests/RTCORBA/Policy_Combinations/svc.conf:
-        * tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf:
-        * tests/RTCORBA/Priority_Inversion_With_Bands/svc.conf:
-        * tests/RTCORBA/Profile_And_Endpoint_Selection/svc.conf:
-        * tests/RTCORBA/Server_Declared/continuous.conf:
-        * tests/RTCORBA/Server_Declared/svc.conf:
-        * tests/RTCORBA/Server_Protocol/server_iiop.conf:
-        * tests/RTCORBA/Server_Protocol/server_iiop_shmiop.conf:
-        * tests/RTCORBA/Server_Protocol/server_iiop_uiop.conf:
-        * tests/RTCORBA/Server_Protocol/server_reverse.conf:
-        * tests/RTCORBA/Server_Protocol/server_reverse_nt.conf:
-        * tests/RTCORBA/Server_Protocol/server_shmiop.conf:
-        * tests/RTCORBA/Server_Protocol/server_uiop.conf:
-        * tests/RTCORBA/Thread_Pool/continuous.conf:
-        * tests/RTCORBA/Thread_Pool/svc.conf:
-        * tests/TransportCurrent/Framework/client-static.conf:
-        * tests/TransportCurrent/Framework/client.conf:
-        * tests/TransportCurrent/Framework/server-static.conf:
-        * tests/TransportCurrent/Framework/server.conf:
-        * tests/TransportCurrent/IIOP/client_dynamic.conf:
-        * tests/TransportCurrent/IIOP/client_static.conf:
-        * tests/TransportCurrent/IIOP/server_dynamic.conf:
-        * tests/TransportCurrent/IIOP/server_static.conf:
-          Fuzz. Added lacking $Id string.
-
-Thu Apr 21 13:02:25 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Updated test list
-
-        * tests/AMI/mt_noupcall.conf:
-        * tests/AMI/run_mt_noupcall.pl:
-        * tests/AMI/run_test.pl:
-          New run_mt_noupcall, the existing script was using -ORBCollocation no
-          which doesn't work with AMI and mt_noupcall
-
-        * tests/AMI/simple_client.cpp:
-          Layout change
-
-Thu Apr 21 12:07:41 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/tao_orb_tests.lst:
-          Run AMI test with more options
-
-        * tests/AMI/exclusive.conf:
-        * tests/AMI/server.conf:
-          Added Id tag
-
-        * tests/AMI/mt_noupcall.conf:
-          New file for testing with mt_noupcall
-
-        * tests/AMI/run_test.pl:
-          Add option -mt_noupcall and give client/server separate debug levels
-
-Thu Apr 21 11:17:36 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Wait_On_LF_No_Upcall.cpp:
-          Log transport id
-
-Thu Apr 21 10:31:58 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/Connection_Handler.cpp:
-          Use the orb core reactor which is the LF reactor
-
-Wed Apr 20 08:59:58 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
-          Improved portability
-
-        * bin/tao_orb_tests.lst:
-          Added new test
-
-        * tao/Leader_Follower.h:
-          Layout change
-
-        * tao/Strategies/SHMIOP_Acceptor.cpp:
-        * tao/Wait_On_LF_No_Upcall.cpp:
-          Fixed coverity errors
-
-        * tests/Bug_3531b_Regression:
-        * tests/Bug_3531b_Regression/Bug_3531b_Regression.mpc:
-        * tests/Bug_3531b_Regression/run_test.pl:
-        * tests/Bug_3531b_Regression/server.cpp:
-          New test
+        * examples/AMH/Sink_Server/run_test.pl:
+        * tao/PortableServer/Adapter_Activator.h:
+        * tests/Multiple/Multiple_Impl.h:
+          Zapped empty lines
 
-Wed Apr 20 09:52:52 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * tests/Multiple/server.cpp:
+          Fixed typo in comment
 
-        * TAO version 2.0.2 released.
+        * tests/POA/DSI/server.cpp:
+        * tests/POA/Explicit_Activation/server.cpp:
+        * tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp:
+        * tests/POA/On_Demand_Loading/Server_Manager.cpp:
+        * tests/POA/Reference_Counted_Servant/server.cpp:
+          Close file descriptors earlier to resolve Coverity errors
 
 Local Variables:
 mode: change-log
 add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time))
 indent-tabs-mode: nil
 End:
-ambiguous
diff --git a/TAO/ChangeLog.BRANCH b/TAO/ChangeLog.BRANCH
deleted file mode 100644
index 7afeffc8f98..00000000000
--- a/TAO/ChangeLog.BRANCH
+++ /dev/null
@@ -1,71 +0,0 @@
-Tue Dec  6 14:42:39 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_visitor_component/component_svh.cpp:
-        * TAO_IDL/be/be_visitor_component/component_svs.cpp:
-        * TAO_IDL/be/be_visitor_component/servant_svh.cpp:
-        * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation_sh.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
-        revert changes after 2011-11-30 (ChangeLog.BRANCH missing those items) 
-
-Wed Nov 30 16:45:10 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp:
-        * TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp:
-        * TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp:
-
-Wed Nov 30 14:19:10 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
-        * TAO_IDL/be/be_codegen.cpp:
-        // remove debug info
-        * TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp:
-        * TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp:
-        * TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h:
-        Add visit_attribute functionality.
-
-Tue Nov 29 12:59:03 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-        * TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp:
-        Correct check nil pointer in facet operation
-
-Mon Nov 28 15:26:03 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp:
-        * TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp:
-        * TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp:
-        * TAO_IDL/be_include/be_visitor_connector/facet_ami_exh.h:
-        * TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h:
-        Add traverse_inheritance_graph, needed  for derived interfaces
-
-Wed Nov 23 14:00:38 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp:
-        Changed return of sync operations.
-
-Mon Nov 21 13:32:38 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
-
-        * TAO_IDL/be/be_codegen.cpp:
-        Exclude include *.AE.idl in *E.idl
-
-        * TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp:
-        * TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp:
-        * TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp:
-        * TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp:
-        * TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp:
-        * TAO_IDL/be_include/be_visitor_connector/facet_ami_exh.h:
-        * TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h:
-       Changes for sync port on AMI connector
-
-Mon Nov  7 13:02:55 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
-
-        * TAO_IDL/fe/idl.ll:
-        * TAO_IDL/fe/lex.yy.cpp:
-        Add beside pragma's 'ciao ami4ccm ...' the pragma's 'ami4ccm ...' , according to ami4ccm spec.
-        In the future '#pragma ciao ami4ccm ...' has to  be removed.
-
-
-Local Variables:
-mode: change-log
-add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time))
-indent-tabs-mode: nil
-End:
diff --git a/TAO/ChangeLogs/ChangeLog-2011b b/TAO/ChangeLogs/ChangeLog-2011b
new file mode 100644
index 00000000000..4d387011a94
--- /dev/null
+++ b/TAO/ChangeLogs/ChangeLog-2011b
@@ -0,0 +1,3954 @@
+Sun Dec 04 11:51:30 CET 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO version 2.0.6 released.
+
+Fri Dec  2 10:07:48 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * tao/Leader_Follower.cpp:
+        * tao/Messaging/Messaging_Queueing_Strategies.h:
+        * tao/Messaging/Messaging_Queueing_Strategies.cpp:
+        * tao/ORB_Core.cpp:
+        * tao/Transport.cpp:
+        * tao/params.h:
+        * tao/params.inl:
+        * tao/params.cpp:
+
+          Reverting timer changes to be replaced by better and more
+          flexible changes after the coming release.
+
+Wed Nov 30 15:55:22 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Bug_2285_Regression/Hello.cpp:
+        * orbsvcs/tests/Bug_2285_Regression/client2.cpp:
+          Code cleanup
+
+        * tests/Mixed_Sync_ASync_Events/main.cpp:
+        * tests/Mixed_Sync_ASync_Events/test_i.cpp:
+          Fixed LynxOS compile warnings
+
+Tue Nov 29 15:50:06 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * tao/ORB_Core.cpp:
+        * tao/params.h:
+        * tao/params.inl:
+        * tao/params.cpp:
+
+          Added -ORBUseHighresTimer ORB parameter switch to specifiy
+          if the ORB should use the HR timer for the reactor timer queue
+          and related objects (like countdowns).
+
+        * tao/Transport.cpp:
+        * tao/Leader_Follower.cpp:
+        * tao/Messaging/Messaging_Queueing_Strategies.h:
+        * tao/Messaging/Messaging_Queueing_Strategies.cpp:
+
+          Changes to support the new UseHighresTimer switch.
+
+Tue Nov 29 14:07:11 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Messaging/AMH_Skeletons.h:
+        * tao/PortableServer/SUpcall_commands.h:
+          Fixed pragma once warnings
+
+Tue Nov 29 12:21:12 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_orb_tests.lst:
+          Enable some more tests in the static configuration
+
+        * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
+          Doxygen changes and small code improvements
+
+Tue Nov 29 12:15:13 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/tao.mpc:
+          Added PolicyC.inl
+
+        * TAO_IDL/be/be_visitor_interface/interface_ci.cpp:
+          Layout changes to the generated code
+
+Tue Nov 29 09:54:05 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_exception/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
+          Layout and fixed msvc problems
+
+        * TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp:
+          First do a dynamic_cast and check the result before using it
+
+Mon Nov 28 20:36:09 UTC 2011  Adam Mitz  <mitza@ociweb.com>
+
+        * tao/tao.mpc:
+
+          Set skel_export_macro and skel_export_include for Policy.pidl.
+
+Mon Nov 28 19:14:23 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/tao.mpc:
+          Policy.pidl shouldn't use -Sorb
+
+Mon Nov 28 15:41:10 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_interface.cpp:
+        * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp:
+        * TAO_IDL/be_include/be_interface.h:
+          Reduced amount of static methods generated for direct collocation.
+          Next step is to move the direct collocation static methods into
+          the regular skeleton, there is really no need for its own
+          special class hierarchy
+
+        * tests/Skeleton_Inheritance/skel_inheritance.mpc:
+          Enable direct collocation
+
+Mon Nov 28 14:29:45 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ImR_Client/ImR_Client.cpp:
+        * tao/ImR_Client/ImplRepo.pidl:
+        * tao/PortableServer/Operation_Table_Dynamic_Hash.cpp:
+        * tao/PortableServer/Operation_Table_Perfect_Hash.cpp:
+          Const and layout changes
+
+Mon Nov 28 14:09:16 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
+          Generate _tao_type for policy exceptions
+
+Mon Nov 28 12:57:57 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * bin/tao_orb_tests.lst:
+
+          Removed !FIXED_BUGS_ONLY for Bug_3000_Regression since this
+          might be fixed.
+
+Mon Nov 28 12:28:14 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Servant_Base.h:
+        * tao/PortableServer/Servant_Base.cpp:
+          Disable serveral methods with CORBA/e or minimum corba, fixes
+          bugzilla 3019
+
+Mon Nov 28 10:49:43 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/taobaseidldefaults.mpb:
+          Handle the S extension also manually, needed when using -oS
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+          When generating CORBA::Policy add some special methods
+
+        * tao/AnyTypeCode/AnyTypeCode.mpc:
+        * tao/PolicyS.h:
+        * tao/PortableServer/PortableServer.mpc:
+        * tao/tao.mpc:
+          Generate the Policy.pidl as part of the build process, prevents
+          us from doing manual hacks in the generated code
+
+        * tao/AnyTypeCode/PolicyA.h:
+        * tao/AnyTypeCode/PolicyA.cpp:
+        * tao/PolicyC.h:
+        * tao/PolicyC.inl:
+        * tao/PolicyC.cpp:
+        * tao/PortableServer/PolicyS.h:
+        * tao/PortableServer/PolicyS.cpp:
+        * tao/PortableServer/PolicyS_T.h:
+        * tao/PortableServer/PolicyS_T.inl:
+        * tao/PortableServer/PolicyS_T.cpp:
+          Removed these files.
+
+Mon Nov 28 08:26:29 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/facet_svth.cpp:
+        * TAO_IDL/be/be_visitor_component/facet_svts.cpp:
+        * TAO_IDL/be_include/be_visitor_component/facet_svth.h:
+        * TAO_IDL/be_include/be_visitor_component/facet_svts.h:
+        * TAO_IDL/be_include/be_visitor_root/root_svth.h:
+          Fuzz.
+
+Sun Nov 27 18:19:18 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Merging in another set of changes. The skeletons got refactored even
+        more and now the S.inl files are not generated anymore. For CIAO
+        we now generate the facet servants in new _svnt_T.{h,cpp} files, which
+        is the first step in a major refactoring and simplification of the
+        CCM servants which is also a first step in the direction of a Common
+        Component Model
+
+        === start changelog ===
+
+        Sat Nov 26 11:58:18 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_provides.cpp:
+                * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+                  Fixed keyword clash regarding c++ keywords.
+
+        Fri Nov 25 13:28:08 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/facet_svth.cpp:
+                * TAO_IDL/be/be_visitor_component/facet_svts.cpp:
+                * TAO_IDL/be_include/be_visitor_component/facet_svth.h:
+                * TAO_IDL/be_include/be_visitor_component/facet_svts.h:
+                  Templated servants for connector were not generated. Fixed this.
+
+        Thu Nov 24 14:23:25 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_codegen.cpp:
+                  Added appropriate ifdefs for including templated source
+                  files.
+
+                * TAO_IDL/be/be_visitor_attribute/attribute.cpp:
+                  Also generate the setters in case templated code,
+
+        Thu Nov 24 12:19:07 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_attribute/attribute.cpp:
+                  Fixed an issues related to the generation of attribute
+                  getter and setter methods.
+
+        Thu Nov 24 11:14:31 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_codegen.cpp:
+                  Don't use the fullname for the included template source.
+
+        Thu Nov 24 10:59:28 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_codegen.cpp:
+                * TAO_IDL/be/be_provides.cpp:
+                * TAO_IDL/be/be_visitor_operation/operation_svs.cpp:
+                  Included templated source file into the templated header.
+                  Fixed some compile issues related to this.
+
+        Thu Nov 24 07:43:27 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/facet_svth.cpp:
+                * TAO_IDL/be/be_visitor_component/facet_svts.cpp:
+                  Fixed warnings on windows.
+
+        Thu Nov 24 07:25:47 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+                  Fixed generation issue in case a component is not part of
+                  module.
+
+        Wed Nov 23 15:07:59 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * MPC/config/taobaseidldefaults.mpb:
+                  Prevent building a second time when make was invoked a
+                  second time.
+
+        Fri Nov  4 15:45:54 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * examples/AMI/FL_Callback/FL_Callback.mpc:
+                * examples/RTScheduling/Job.mpc:
+                * examples/RTScheduling/Synch.mpc:
+                * orbsvcs/orbsvcs/CosConcurrency.mpc:
+                * orbsvcs/orbsvcs/CosEvent.mpc:
+                * orbsvcs/orbsvcs/CosLifeCycle.mpc:
+                * orbsvcs/orbsvcs/CosNaming_Skel.mpc:
+                * orbsvcs/orbsvcs/CosNotification.mpc:
+                * orbsvcs/orbsvcs/CosProperty.mpc:
+                * orbsvcs/orbsvcs/CosTime.mpc:
+                * orbsvcs/orbsvcs/CosTrading.mpc:
+                * orbsvcs/orbsvcs/DsEventLogAdmin.mpc:
+                * orbsvcs/orbsvcs/DsLogAdmin.mpc:
+                * orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc:
+                * orbsvcs/orbsvcs/RTEventLogAdmin.mpc:
+                * orbsvcs/orbsvcs/RTEvent_Skel.mpc:
+                * orbsvcs/orbsvcs/ec_typed_events_skel.mpb:
+                * tao/IFR_Client/IFR_Client.mpc:
+                * tests/Alt_Mapping/alt_mapping.mpc:
+                * tests/IDL_Inherited_Operation/InheritedOp.mpc:
+                * tests/Monitor/Marshal_Buffer/marshal_buffer.mpc:
+                * tests/Param_Test/Param_Test.mpc:
+                  Removed all S.inl entries from the MPC files
+
+        Fri Nov  4 16:17:33 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/tao_idl.1:
+                * docs/compiler.html:
+                * docs/tutorials/Quoter/Simple/Client/index.html:
+                * orbsvcs/tests/Bug_1393_Regression/run_test.pl:
+                * tests/Bug_3743_Regression/run_test.pl:
+                  Removed references to S.inl files.
+
+        Wed Nov 23 10:17:10 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_provides.cpp:
+                * TAO_IDL/be/be_visitor_operation/operation_svs.cpp:
+                * TAO_IDL/be_include/be_visitor_operation/operation_svs.h:
+                  Found a better way whether we need to use a templated
+                  class definition
+
+        Fri Nov  4 16:24:26 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * MPC/config/taobaseidldefaults.mpb:
+                  Don't generate S.inl extensions in the make files.
+
+        Tue Nov 22 15:53:18 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_provides.cpp:
+                * TAO_IDL/be/be_visitor_component/facet_svth.cpp:
+                * TAO_IDL/be/be_visitor_component/facet_svts.cpp:
+                * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+                * TAO_IDL/be/be_visitor_module/module.cpp:
+                * TAO_IDL/be/be_visitor_operation/operation_svs.cpp:
+                * TAO_IDL/be_include/be_visitor_component/facet_svth.h:
+                * TAO_IDL/be_include/be_visitor_component/facet_svts.h:
+                * TAO_IDL/be_include/be_visitor_operation/operation_svs.h:
+                  Rename actions and prevented template declarations when not needed.
+
+        Tue Nov 22 10:51:12 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL:
+
+                * TAO_IDL/be/be_codegen.cpp:
+                * TAO_IDL/be/be_global.cpp:
+                * TAO_IDL/be/be_interface.cpp:
+                * TAO_IDL/be/be_produce.cpp:
+                * TAO_IDL/be/be_util.cpp:
+
+                * TAO_IDL/be/be_visitor_component/component.cpp:
+                * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+
+                * TAO_IDL/be/be_visitor_interface.cpp:
+
+                * TAO_IDL/be/be_visitor_interface/amh_sh.cpp:
+                * TAO_IDL/be/be_visitor_interface/amh_ss.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_sh.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+
+                * TAO_IDL/be/be_visitor_module/module.cpp:
+
+                * TAO_IDL/be/be_visitor_root.cpp:
+                * TAO_IDL/be/be_visitor_valuetype.cpp:
+
+                * TAO_IDL/be/be_visitor_valuetype/valuetype.cpp:
+
+                * TAO_IDL/be_include/be_codegen.h:
+                * TAO_IDL/be_include/be_global.h:
+                * TAO_IDL/be_include/be_interface.h:
+                * TAO_IDL/be_include/be_visitor_interface.h:
+
+                * TAO_IDL/be_include/be_visitor_interface/amh_ss.h:
+                * TAO_IDL/be_include/be_visitor_interface/interface_ss.h:
+
+                * TAO_IDL/be_include/be_visitor_root.h:
+                * TAO_IDL/be_include/be_visitor_valuetype.h:
+
+                * TAO_IDL/tao_idl.1:
+                  Merged in skeleton refactoring which now should work, no S.inl
+                  files are generated anymore
+
+                * TAO_IDL/be/be_visitor_interface/interface_si.cpp:
+                * TAO_IDL/be/be_visitor_root/root_si.cpp:
+                * TAO_IDL/be/be_visitor_valuetype/valuetype_si.cpp:
+                * TAO_IDL/be_include/be_visitor_interface/amh_si.h:
+                * TAO_IDL/be_include/be_visitor_interface/interface_si.h:
+                * TAO_IDL/be_include/be_visitor_root/root_si.h:
+                * TAO_IDL/be_include/be_visitor_valuetype/valuetype_si.h:
+                  Removed these files.
+
+        Mon Nov 21 16:48:25 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_provides.cpp:
+                  Removed _get_component method.
+
+                * TAO_IDL/be/be_visitor_operation/operation_svs.cpp:
+                  Added template argument to method declaration.
+
+        Mon Nov 21 15:35:54 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_provides.cpp:
+                  Layout changes in generated code.
+
+        Mon Nov 21 15:21:53 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_codegen.cpp:
+                * TAO_IDL/be/be_provides.cpp:
+                * TAO_IDL/be/be_visitor_component.cpp:
+                * TAO_IDL/be/be_visitor_component/executor_exh.cpp:
+                * TAO_IDL/be/be_visitor_component/facet_svth.cpp:
+                * TAO_IDL/be/be_visitor_component/facet_svts.cpp:
+                * TAO_IDL/be/be_visitor_component/servant_svh.cpp:
+                * TAO_IDL/be_include/be_provides.h:
+                * TAO_IDL/be_include/be_visitor_component.h:
+                * TAO_IDL/be_include/be_visitor_component/facet_svth.h:
+                * TAO_IDL/be_include/be_visitor_component/facet_svts.h:
+                  Template code for header is saved to _svnt_T.h.
+
+                * TAO_IDL/be/be_visitor_component/facet_svh.cpp:
+                * TAO_IDL/be/be_visitor_component/facet_svs.cpp:
+                * TAO_IDL/be_include/be_visitor_component/facet_svh.h:
+                * TAO_IDL/be_include/be_visitor_component/facet_svs.h:
+                  Renamed these files.
+
+        Mon Nov 21 09:17:14 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_codegen.cpp:
+                * TAO_IDL/be/be_visitor_component/component_svh.cpp:
+                * TAO_IDL/be/be_visitor_component/component_svs.cpp:
+                * TAO_IDL/be/be_visitor_component/facet_svh.cpp:
+                * TAO_IDL/be/be_visitor_component/facet_svs.cpp:
+                * TAO_IDL/be/be_visitor_module/module.cpp:
+                * TAO_IDL/be_include/be_codegen.h:
+                * TAO_IDL/be_include/be_helper.h:
+                * TAO_IDL/be_include/be_visitor_component/facet_svh.h:
+                * TAO_IDL/be_include/be_visitor_component/facet_svs.h:
+                  Determined the right file to write to (_svnt_T.cpp/h).
+
+        Thu Nov 17 15:55:04 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_interface.cpp:
+                * TAO_IDL/be/be_visitor_interface/amh_si.cpp:
+                * TAO_IDL/be/be_visitor_operation/amh_sh.cpp:
+                * TAO_IDL/be/be_visitor_operation/amh_ss.cpp:
+                * TAO_IDL/be/be_visitor_operation/operation_sh.cpp:
+                * TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
+                * tao/Abstract_Servant_Base.h:
+                * tao/Messaging/AMH_Skeletons.h:
+                * tao/Messaging/AMH_Skeletons.cpp:
+                * tao/PortableServer/Operation_Table.h:
+                * tao/PortableServer/PolicyS.h:
+                * tao/PortableServer/PolicyS.cpp:
+                * tao/PortableServer/Servant_Base.h:
+                * tao/PortableServer/Servant_Base.cpp:
+                  Changed the third argument of the skel methods from void* to
+                  TAO_ServantBase*. As a result the static_cast in the skeleton
+                  methods has been replaced with a dynamic_cast, something we couldn't
+                  use in the past when we wheren't allowed to use RTTI.
+
+        Thu Nov 17 11:33:52 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * tao/Abstract_Servant_Base.h:
+                  synchronous_upcall_dispatch is not needed here
+
+                * tao/PortableServer/PS_ForwardC.h:
+                  Removed LocalServantBase, not part of CORBA anymore
+
+                * tao/PortableServer/Servant_Base.h:
+                * tao/PortableServer/Servant_Base.cpp:
+                  Start changing void* to TAO_ServantBase*
+
+                * tao/PortableServer/Local_Servant_Base.cpp:
+                * tao/PortableServer/Local_Servant_Base.inl:
+                * tao/PortableServer/Local_Servant_Base.h:
+                  Removed these files, not part of the CORBA spec anymore
+
+        Thu Nov 17 10:46:22 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * MPC/config/taobaseidldefaults.mpb:
+                * TAO_IDL/be/be_codegen.cpp:
+                * TAO_IDL/be/be_global.cpp:
+                * TAO_IDL/be/be_produce.cpp:
+                * TAO_IDL/be/be_visitor_component/component.cpp:
+                * TAO_IDL/be/be_visitor_component/facet_svh.cpp:
+                * TAO_IDL/be/be_visitor_component/facet_svs.cpp:
+                * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+                * TAO_IDL/be/be_visitor_module/module.cpp:
+                * TAO_IDL/be/be_visitor_root.cpp:
+                * TAO_IDL/be/be_visitor_root/root_svth.cpp:
+                * TAO_IDL/be/be_visitor_root/root_svts.cpp:
+                * TAO_IDL/be_include/be_codegen.h:
+                * TAO_IDL/be_include/be_global.h:
+                * TAO_IDL/be_include/be_visitor_root.h:
+                * TAO_IDL/be_include/be_visitor_root/root_svth.h:
+                * TAO_IDL/be_include/be_visitor_root/root_svts.h:
+                  The IDL compileren doesn't generated the facet servants
+                  in the _svnt.cpp/h files.
+                  The IDL compiler now uses the template facet servant
+                  implementation (which still need to be generated)
+                  in the _svnt.cpp file.
+                  The IDL compiler now creates the _svnt_T.cpp/h files and
+                  initialize them.
+
+        === end changelog ===
+
+Thu Nov 24 08:33:42 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * tests/Mixed_Sync_ASync_Events/main.cpp:
+        * tests/Mixed_Sync_ASync_Events/test_i.cpp:
+
+          Fixed OpenVMS build errors.
+
+Wed Nov 23 14:37:02 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * MPC/config/taobaseidldefaults.mpb:
+        * MPC/modules/IDLHelper.pm:
+
+          Moved addition of generated executor files (-Gex) from
+          taobaseidldefaults.mpb to IDLHelper.pm to be able to
+          correctly and transparently handle -oE and -oN switches.
+
+Tue Nov 22 12:46:00 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * tests/Bug_3531b_Regression/server.cpp:
+
+          Fix ST build errors.
+
+Mon Nov 21 11:59:40 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Upcall_Wrapper.h:
+          Fixed gcc warnings
+
+Mon Nov 21 08:37:38 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * tests/Mixed_Sync_ASync_Events/test_i.h:
+        * tests/Mixed_Sync_ASync_Events/test_i.cpp:
+          New attempt to silence some compiler warnings.
+
+Sun Nov 20 19:22:58 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Abstract_Servant_Base.h:
+        * tao/PortableServer/Operation_Table.h:
+        * tao/ServerRequestInterceptor_Adapter.h:
+          Fixed gcc warnings
+
+Sun Nov 20 19:16:59 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Skeleton_Inheritance/skel_inheritance.mpc:
+          Fixed windows link errors
+
+Thu Nov 17 17:15:35 UTC 2011  Trevor Fields  <fields_t@ociweb.com>
+
+        * bin/tao_other_tests.lst:
+
+          Added orbsvcs/tests/Security/MT_BiDir_SSL test.
+
+Thu Nov 17 11:30:59 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/ForwardUponObjectNotExist/client.cpp:
+          First shutdown the ORB before destroying it
+
+Thu Nov 17 10:05:08 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        Merged changes from Remedy work branch.
+
+        === start changelog ===
+
+        Thu Nov 17 07:35:20 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * performance-tests/Latency/DSI/Roundtrip.h:
+                * performance-tests/Sequence_Latency/DSI/Roundtrip.h:
+                * tests/DSI_AMI_Gateway/test_dsi.h:
+                  Last runtime fixes
+
+        Wed Nov 16 07:26:18 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h:
+                * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h:
+                  Doxygen changes
+
+        Wed Nov 16 07:18:56 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h:
+                * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h:
+                * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h:
+                * orbsvcs/tests/Bug_2285_Regression/Hello.h:
+                * orbsvcs/tests/Bug_2287_Regression/Hello.h:
+                * orbsvcs/tests/Bug_2615_Regression/Hello.h:
+                * orbsvcs/tests/Bug_2800_Regression/Hello.h:
+                * orbsvcs/tests/Bug_2800_Regression/NsShutdown.h:
+                * orbsvcs/tests/Bug_3215_Regression/Hello.h:
+                * orbsvcs/tests/Bug_3216_Regression/Hello.h:
+                * orbsvcs/tests/Bug_3598b_Regression/Hello.h:
+                * orbsvcs/tests/Bug_3673_Regression/Hello.h:
+                * orbsvcs/tests/Bug_3673_Regression/NsShutdown.h:
+                * orbsvcs/tests/COIOP_Naming_Test/Hello.h:
+                * orbsvcs/tests/HTIOP/Hello/Hello.h:
+                * orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h:
+                * performance-tests/Latency/AMH_Single_Threaded/Roundtrip.h:
+                * performance-tests/Latency/AMI/Roundtrip.h:
+                * performance-tests/Latency/Collocation/Roundtrip.h:
+                * performance-tests/Latency/DII/Roundtrip.h:
+                * performance-tests/Latency/Deferred/Roundtrip.h:
+                * performance-tests/Latency/Single_Threaded/Roundtrip.h:
+                * performance-tests/Latency/Thread_Per_Connection/Roundtrip.h:
+                * performance-tests/Latency/Thread_Pool/Roundtrip.h:
+                * performance-tests/Memory/IORsize/Memory_Growth.h:
+                * performance-tests/Memory/Single_Threaded/Memory_Growth.h:
+                * performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h:
+                * performance-tests/Sequence_Latency/AMI/Roundtrip.h:
+                * performance-tests/Sequence_Latency/DII/Roundtrip.h:
+                * performance-tests/Sequence_Latency/Deferred/Roundtrip.h:
+                * performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h:
+                * performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h:
+                * performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h:
+                * tests/Bug_1330_Regression/Test_i.h:
+                * tests/Bug_1482_Regression/Hello.h:
+                * tests/Bug_2084_Regression/EventNode.h:
+                * tests/Bug_2084_Regression/Hello.h:
+                * tests/Bug_2183_Regression/Hello.h:
+                * tests/Bug_2186_Regression/Hello.h:
+                * tests/Bug_2241_Regression/Hello.h:
+                * tests/Bug_2328_Regression/Hello.h:
+                * tests/Bug_2593_Regression/Hello.h:
+                * tests/Bug_2654_Regression/Hello.h:
+                * tests/Bug_2683_Regression/test_i.h:
+                * tests/Bug_2768_Regression/Messenger_i.h:
+                * tests/Bug_2966_Regression/Hello.h:
+                * tests/Bug_3299_Regression/Hello.h:
+                * tests/Bug_3333_Regression/Hello.h:
+                * tests/Bug_3430_Regression/Hello.h:
+                * tests/Bug_3479_Regression/Hello.h:
+                * tests/Bug_3547_Regression/Stock_Quoter_i.h:
+                * tests/Bug_3553_Regression/Hello.h:
+                * tests/Bug_3558_Regression/Hello.h:
+                * tests/Bug_3598a_Regression/Hello.h:
+                * tests/Bug_3636_Regression/Hello.h:
+                * tests/Bug_3676_Regression/Hello.h:
+                * tests/Bug_3746_Regression/Test_i.h:
+                * tests/Bug_3748_Regression/Hello.h:
+                * tests/Bug_3790_Regression/simple_test_i.h:
+                * tests/Bug_3837_Regression/Hello.h:
+                * tests/Bug_3896_Regression/Hello.h:
+                * tests/Bug_3954_Regression/Hello.h:
+                * tests/Bug_933_Regression/Messenger_i.h:
+                * tests/COIOP/Hello.h:
+                * tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h:
+                * tests/Cache_Growth_Test/Hello.h:
+                * tests/Client_Leaks/Process.h:
+                * tests/Client_Leaks/Process_Factory.h:
+                * tests/Collocated_Best/Collocated_Best_Direct/Hello.h:
+                * tests/Collocated_Best/Collocated_Best_NoColl/Hello.h:
+                * tests/Collocated_Best/Collocated_Best_ThuP/Hello.h:
+                * tests/Collocated_DerivedIF/Hello.h:
+                * tests/Collocated_NoColl/Hello.h:
+                * tests/Collocated_ThruP_Sp/Hello.h:
+                * tests/Collocated_ThruP_Sp_Gd/Hello.h:
+                * tests/Collocation_Exception_Test/Hello.h:
+                * tests/Collocation_Oneway_Tests/Hello.h:
+                * tests/Collocation_Tests/Hello.h:
+                * tests/Connect_Strategy_Test/Hello.h:
+                * tests/DII_Collocation_Tests/oneway/Hello.h:
+                * tests/DII_Collocation_Tests/twoway/Hello.h:
+                * tests/DSI_AMH/Roundtrip.h:
+                * tests/Hello/Hello.h:
+                * tests/IPV6/Hello.h:
+                * tests/LongDouble/LongDoubleTest.h:
+                * tests/MT_Timeout/Sleep_Service.h:
+                * tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h:
+                * tests/ORB_shutdown/Foo_Bar.h:
+                * tests/Ondemand_Write/Hello.h:
+                * tests/POA/Deactivate_Object/Hello.h:
+                * tests/POA/EndpointPolicy/Hello.h:
+                * tests/Parallel_Connect_Strategy/Test_i.h:
+                * tests/Portable_Interceptors/Bug_2133/Hello.h:
+                * tests/Reliable_Oneways/Oneway_Receiver.h:
+                * tests/Reliable_Oneways/Shutdown_Helper.h:
+                * tests/Servant_To_Reference_Test/Test_i.h:
+                * tests/Server_Leaks/Ping_Service.h:
+                * tests/Server_Port_Zero/Hello.h:
+                * tests/Skeleton_Inheritance/interface_3_i.h:
+                * tests/Two_Objects/First_i.h:
+                * tests/Two_Objects/Object_Factory_i.h:
+                * tests/Two_Objects/Second_i.h:
+                * tests/ZIOP/Hello.h:
+                  Fixed typo in comment
+
+        Wed Nov 16 07:14:48 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * tao/DynamicInterface/Dynamic_Implementation.h:
+                * tao/DynamicInterface/Dynamic_Implementation.cpp:
+                * tao/PortableServer/Servant_Base.cpp:
+                * tests/DSI_AMH/Roundtrip.h:
+                * tests/DSI_AMH/Roundtrip.cpp:
+                  Fixed compile problems due to change of signature of _dispatch
+
+        Tue Nov 15 09:36:35 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_interface.cpp:
+                * TAO_IDL/be/be_visitor_interface/amh_sh.cpp:
+                * TAO_IDL/be/be_visitor_interface/amh_si.cpp:
+                * TAO_IDL/be/be_visitor_interface/amh_ss.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_sh.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+                * TAO_IDL/be/be_visitor_operation/amh_sh.cpp:
+                * TAO_IDL/be/be_visitor_operation/amh_ss.cpp:
+                * TAO_IDL/be/be_visitor_operation/operation_sh.cpp:
+                * TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
+                * tao/Abstract_Servant_Base.h:
+                * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h:
+                * tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp:
+                * tao/CSD_Framework/CSD_Strategy_Base.inl:
+                * tao/CSD_Framework/CSD_Strategy_Proxy.inl:
+                * tao/CSD_ThreadPool/CSD_TP_Corba_Request.h:
+                * tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl:
+                * tao/Messaging/AMH_Skeletons.h:
+                * tao/Messaging/AMH_Skeletons.cpp:
+                * tao/PI_Server/ServerInterceptorAdapter.h:
+                * tao/PI_Server/ServerInterceptorAdapter.cpp:
+                * tao/PortableServer/Local_Servant_Base.h:
+                * tao/PortableServer/Local_Servant_Base.cpp:
+                * tao/PortableServer/Operation_Table.h:
+                * tao/PortableServer/PolicyS.h:
+                * tao/PortableServer/PolicyS.cpp:
+                * tao/PortableServer/Servant_Base.h:
+                * tao/PortableServer/Servant_Base.cpp:
+                * tao/PortableServer/Upcall_Wrapper.h:
+                * tao/PortableServer/Upcall_Wrapper.cpp:
+                * tao/ServerRequestInterceptor_Adapter.h:
+                  Changed the second argument of all skel methods from void* to
+                  TAO::Portable_Server::Servant_Upcall*. I found  CSD_TP_Corba_Request
+                  just passes 0 for this argument, reported bugzilla 3993 for this,
+                  when CSD passes always a valid pointer we could even use a reference
+                  instead of a pointer
+
+        Tue Nov 15 09:13:11 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_interface.cpp:
+                  _repository_id occured twice in the op table. Fixed this.
+
+        Mon Nov 14 13:24:54 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_interface.cpp:
+                  Added some more comments on the AMH detection.
+
+        Fri Nov 11 15:29:15 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * tests/Skeleton_Inheritance/skel_inheritance.mpc:
+                  Fixed linker errors on windows.
+
+        Fri Nov 11 14:33:22 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_interface.cpp:
+                * TAO_IDL/be/be_visitor_amh_pre_proc.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+                * TAO_IDL/be_include/be_interface.h:
+                  Changed the AMH is detected.
+
+        Fri Nov 11 13:56:31 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_codegen.cpp:
+                * TAO_IDL/be/be_interface.cpp:
+                * TAO_IDL/be/be_visitor_amh_pre_proc.cpp:
+                * TAO_IDL/be_include/be_interface.h:
+                  Invoking amh specific _*_skel methods in
+                  case AMH.
+
+                * tao/Messaging/AMH_Skeletons.h:
+                * tao/Messaging/AMH_Skeletons.cpp:
+                * tao/PortableServer/Servant_Base.h:
+                * tao/PortableServer/Servant_Base.cpp:
+                  Created a set of _*_skel methods for amh.
+                  Put these in Messaging since we don't want to
+                  bother the core with AMH stuff.
+
+        Fri Nov 11 09:52:26 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_interface.cpp:
+                * TAO_IDL/be/be_visitor_interface/amh_sh.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_sh.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+                * tao/PortableServer/SUpcall_commands.h:
+                * tao/PortableServer/SUpcall_commands.cpp:
+                * tao/PortableServer/Servant_Base.h:
+                * tao/PortableServer/Servant_Base.cpp:
+                  Moved the default _*_skel method to the core. This mean
+                  a lot less generated code.
+
+                * bin/tao_orb_tests.lst:
+                * tests/Skeleton_Inheritance:
+                * tests/Skeleton_Inheritance/client.cpp:
+                * tests/Skeleton_Inheritance/idl_1.idl:
+                * tests/Skeleton_Inheritance/idl_2.idl:
+                * tests/Skeleton_Inheritance/idl_3.idl:
+                * tests/Skeleton_Inheritance/interface_3_i.h:
+                * tests/Skeleton_Inheritance/interface_3_i.cpp:
+                * tests/Skeleton_Inheritance/run_test.pl:
+                * tests/Skeleton_Inheritance/server.cpp:
+                * tests/Skeleton_Inheritance/skel_inheritance.mpc:
+                  New test.
+
+        === end changelog ===
+
+Wed Nov 16 22:23:08 UTC 2011  Trevor Fields  <fields_t@ociweb.com>
+
+        * orbsvcs/tests/Security/MT_BiDir_SSL:
+        * orbsvcs/tests/Security/MT_BiDir_SSL/client.conf:
+        * orbsvcs/tests/Security/MT_BiDir_SSL/client.conf.xml:
+        * orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp:
+        * orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp:
+        * orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.h:
+        * orbsvcs/tests/Security/MT_BiDir_SSL/MT_BiDir_SSL.mpc:
+        * orbsvcs/tests/Security/MT_BiDir_SSL/README:
+        * orbsvcs/tests/Security/MT_BiDir_SSL/Receiver.idl:
+        * orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.cpp:
+        * orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.h:
+        * orbsvcs/tests/Security/MT_BiDir_SSL/run_test.pl:
+        * orbsvcs/tests/Security/MT_BiDir_SSL/Sender.idl:
+        * orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.cpp:
+        * orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.h:
+        * orbsvcs/tests/Security/MT_BiDir_SSL/server.conf:
+        * orbsvcs/tests/Security/MT_BiDir_SSL/server.conf.xml:
+        * orbsvcs/tests/Security/MT_BiDir_SSL/server.cpp:
+        * orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp:
+        * orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.h:
+        * orbsvcs/tests/Security/MT_BiDir_SSL/ssl:
+        * orbsvcs/tests/Security/MT_BiDir_SSL/ssl/ca.pem:
+        * orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-cert.pem:
+        * orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-key.pem:
+        * orbsvcs/tests/Security/MT_BiDir_SSL/ssl/make-client-keys:
+        * orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-cert.pem:
+        * orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-key.pem:
+
+          Test for SSLIOP creating connections to exceed the
+          ORBMuxedConnectionMax setting.
+
+Tue Nov 15 22:13:12 UTC 2011  Trevor Fields  <fields_t@ociweb.com>
+
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp:
+
+          Check whether creating a new connection exceeds the
+          ORBMuxedConnectionMax setting.
+
+Tue Nov 15 15:43:31 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * tests/Bug_3531b_Regression/server.cpp:
+          Fixed ST build compile error.
+
+        * tests/Mixed_Sync_ASync_Events/test_i.cpp:
+          Trying to silence strict aliasing warnings.
+
+Tue Nov 15 08:23:08 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * NEWS:
+        * docs/Options.html:
+
+          Updated for RW & EXCLUSIVE changes.
+
+Mon Nov 14 09:22:08 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * tests/Mixed_Sync_ASync_Events/MixedSyncASyncEvents.mpc:
+        * tests/Mixed_Sync_ASync_Events/main.cpp:
+        * tests/Mixed_Sync_ASync_Events/test.idl:
+        * tests/Mixed_Sync_ASync_Events/test_i.cpp:
+
+          Fuzz fixes.
+
+Mon Nov 14 06:39:28 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp:
+
+          Fixed unused arguments.
+
+Sun Nov 13 21:40:34 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp:
+
+          Fixed signature for virtual override.
+
+        * tests/Mixed_Sync_ASync_Events/main.cpp:
+
+          Fixed WChar build error.
+
+Sun Nov 13 12:00:36 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * tests/Mixed_Sync_ASync_Events/test_i.cpp:
+
+          Extended test.
+
+Sun Nov 13 11:31:21 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * tests/Mixed_Sync_ASync_Events/main.cpp:
+        * tests/Mixed_Sync_ASync_Events/test_i.h:
+        * tests/Mixed_Sync_ASync_Events/test_i.cpp:
+
+          Fixed more Win32 warnings and compile errors :-(
+
+Sun Nov 13 11:03:23 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * tests/Mixed_Sync_ASync_Events/main.cpp:
+        * tests/Mixed_Sync_ASync_Events/test.idl:
+        * tests/Mixed_Sync_ASync_Events/test_i.h:
+        * tests/Mixed_Sync_ASync_Events/test_i.cpp:
+
+          Fixed Win32 compiler errors.
+
+Sat Nov 12 10:41:33 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h:
+
+          Fixed compile errors because of core changes from branch merge.
+
+Fri Nov 11 11:22:13 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        Merged rw_block_strategy branch.
+
+        === start changelog ===
+
+        Thu Nov 10 08:04:29 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+                * TAO/tests/Bug_3531b_Regression/server.cpp:
+
+                  Fixed compiler error due to core changes.
+
+        Wed Nov  9 08:24:29 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+                * tests/Mixed_Sync_ASync_Events/MixedSyncASyncEvents.mpc:
+                * tests/Mixed_Sync_ASync_Events/main.cpp:
+                * tests/Mixed_Sync_ASync_Events/run_test.pl:
+                * tests/Mixed_Sync_ASync_Events/test.idl:
+                * tests/Mixed_Sync_ASync_Events/test_i.cpp:
+                * tests/Mixed_Sync_ASync_Events/test_i.h:
+
+                  Added new regression test mixing Synch requests with
+                  Asynch (AMI) and timer and notification events in a
+                  (semi) random order.
+
+                * tests/Mixed_Sync_ASync_Events/exclusive_rw.conf:
+                * tests/Mixed_Sync_ASync_Events/exclusive_rw.conf.xml:
+                * tests/Mixed_Sync_ASync_Events/run_exclusive_rw.pl:
+
+                  Config and script to run the new test in full blocking
+                  mode (RW, Exclusive TMS, blocking connect and flushing).
+
+                * bin/tao_orb_tests.lst:
+
+                  Added new regression tests.
+
+        Tue Nov  8 11:50:29 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+                * tests/AMI/client.cpp:
+                * tests/AMI/exclusive_rw.conf:
+                * tests/AMI/exclusive_rw.conf.xml:
+                * tests/AMI/run_exclusive_rw.pl:
+
+                  Adedd test variant for full blocking configuration
+                  (RW + EXCLUSIVE TMS + blocking connect and flushing)
+
+        Sun Nov  6 18:08:29 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+                * tao/CDR.cpp:
+                * tao/Exclusive_TMS.cpp:
+                * tao/GIOP_Message_Base.cpp:
+                * tao/IIOP_Transport.h:
+                * tao/LocateRequest_Invocation.cpp:
+                * tao/Message_Semantics.h:
+                * tao/Messaging/AMH_Response_Handler.cpp:
+                * tao/Messaging/Asynch_Invocation.cpp:
+                * tao/Strategies/COIOP_Transport.h:
+                * tao/Strategies/DIOP_Transport.h:
+                * tao/Strategies/SCIOP_Transport.h:
+                * tao/Strategies/SHMIOP_Transport.h:
+                * tao/Strategies/UIOP_Transport.h:
+                * tao/Synch_Invocation.cpp:
+                * tao/TAO_Server_Request.cpp:
+                * tao/Transport.cpp:
+                * tao/Transport.h:
+                * tao/Wait_On_Leader_Follower.cpp:
+                * tao/Wait_On_Leader_Follower.h:
+                * tao/Wait_On_Read.cpp:
+                * tao/Wait_On_Read.h:
+                * tao/Wait_Strategy.cpp:
+                * tao/Wait_Strategy.h:
+
+                  Changes to make the RW client wait strategy (in combination with
+                  the Exclusive transport muxing strategy) play nice with AMI.
+                  The essence of the problem of RW not working with AMI was that
+                  AMI requires transports to be registered with the reactor (so
+                  reply events can be handled) which is what RW prevented for all
+                  client transports.
+                  The changes provide a means for RW to recognize transports for
+                  Async client requests and register these with the reactor just
+                  before sending the request and removing them from the reactor
+                  again when the request has finished (reply received, timed out
+                  or disconnected).
+
+        Sun Nov  6 11:54:29 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+                * tests/AMI/simple_client.cpp:
+
+                  Extended test.
+
+        Sun Nov  6 11:42:29 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+                * tao/default_client.cpp:
+                * tao/default_resource.cpp:
+
+                  Add support for additional compiletime selection macros
+                  for Client Wait strategy, Client connect strategy,
+                  TMS strategy and flushing strategy.
+
+        Fri Nov  4 22:0:29 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+                * tao/Exclusive_TMS.cpp:
+                * tao/Messaging/Asynch_Invocation.cpp:
+                * tao/Messaging/Asynch_Reply_Dispatcher.cpp:
+
+                  Fixed to allow use of Exclusive TMS with AMI requests.
+
+        === end changelog ===
+
+Wed Nov  9 13:34:13 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * utils/logWalker/Log.cpp:
+
+          Fix compile-time warning.
+
+Wed Nov  9 10:25:09 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * tests/Bug_3768_Regression/TestCallback.cpp:
+        * tests/Bug_3768_Regression/server.cpp:
+
+          Cleaned up test to behave more properly to fix segfaults
+          and other failures.
+
+Tue Nov  8 19:11:46 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/ImplRepo_Service/ImR_Activator.idl:
+        * orbsvcs/ImplRepo_Service/ImR_Locator.idl:
+        * orbsvcs/ImplRepo_Service/ImR_Locator_i.h:
+        * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
+        * orbsvcs/ImplRepo_Service/Locator_Options.h:
+        * orbsvcs/ImplRepo_Service/Locator_Repository.h:
+        * orbsvcs/ImplRepo_Service/Locator_Repository.cpp:
+        * orbsvcs/ImplRepo_Service/Server_Info.cpp:
+        * orbsvcs/ImplRepo_Service/tao_imr_i.cpp:
+          Doxygen and unicode improvements
+
+Mon Nov  7 22:07:18 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * utils/logWalker/HostProcess.h:
+        * utils/logWalker/HostProcess.cpp:
+        * utils/logWalker/Invocation.cpp:
+        * utils/logWalker/Log.h:
+        * utils/logWalker/Log.cpp:
+        * utils/logWalker/PeerProcess.cpp:
+        * utils/logWalker/Session.h:
+        * utils/logWalker/Session.cpp:
+        * utils/logWalker/logWalker.cpp:
+
+          Added basic support for tracking SSLIOP connections. Fixed some
+          memory leak issues reported by valgrind. Added a new date format
+          selector to accommodate two different time/date formats used by
+          -ORBVerboseLogging 1.
+
+Mon Nov  07 10:31:14 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+        * docs/compilet.html:
+        Add option -oE and -oN .
+
+Mon Nov  07 10:10:14 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_produce.cpp:
+        * TAO_IDL/be/be_util.cpp:
+        * TAO_IDL/be_include/be_global.h:
+        * TAO_IDL/be_include/be_util.h:
+        Add option -oE: Output directory for the generated CIAO executor files
+        and option -oN for not overwrite CIAO executor files.
+
+Sat Nov 05 18:18:13 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * tests/Bug_3531b_Regression/server.cpp:
+          Fixed WChar build problems.
+
+Fri Nov  4 07:28:29 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * docs/Options.html:
+          Extended documentation for ORBWaitStrategy mt_noupcall
+
+Thu Nov 03 09:51:13 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+        Fixed error in previous commit
+
+Thu Nov 03 08:45:13 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * tests/Bug_3531b_Regression/server.cpp:
+          Fixed compile warning on Solaris10 build.
+
+Wed Nov 02 13:30:13 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+          Put narrow in var, use ACE_NEW  with CIAO_FACET
+
+
+Wed Nov 02 08:30:13 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        Merged changes from Remedy work branch.
+
+        === start changelog ===
+
+        Tue Nov  1 14:29:07 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/executor_exs.cpp:
+                  Fixed link issues on windows.
+
+        Tue Nov  1 12:52:03 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/component_ex_idl.cpp:
+                * TAO_IDL/be/be_visitor_component/component_exh.cpp:
+                * TAO_IDL/be/be_visitor_component/executor_exh.cpp:
+                * TAO_IDL/be/be_visitor_component/executor_exs.cpp:
+                  Reverted a few of my last changes. An derived executor
+                  is not directly derived from its base anymore (on
+                  executor IDL level as well as on implementation level).
+
+        Mon Oct 31 15:14:05 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_type.cpp:
+                  Fixed new line.
+
+        Fri Oct 28 11:22:03 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * tests/Bug_3768_Regression/TestCallback.cpp:
+                * tests/Bug_3768_Regression/TestServer.cpp:
+                * tests/Bug_3768_Regression/client.cpp:
+                * tests/Bug_3768_Regression/server.cpp:
+                  Fuzz.
+
+        Fri Oct 28 10:35:06 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+                * tests/Bug_3531b_Regression/server.cpp:
+
+                  Fix for Windoze runtime problem with TSS.
+
+        Fri Oct 28 10:22:48 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_array.cpp:
+                * TAO_IDL/be/be_codegen.cpp:
+                * TAO_IDL/be/be_component.cpp:
+                * TAO_IDL/be/be_interface.cpp:
+                * TAO_IDL/be/be_type.cpp:
+                * TAO_IDL/be/be_visitor_array/any_op_cs.cpp:
+                * TAO_IDL/be/be_visitor_array/array_ch.cpp:
+                * TAO_IDL/be/be_visitor_array/array_cs.cpp:
+                * TAO_IDL/be/be_visitor_component/servant_svh.cpp:
+                * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+                * TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp:
+                * TAO_IDL/be/be_visitor_exception/any_op_cs.cpp:
+                * TAO_IDL/be/be_visitor_exception/exception_ch.cpp:
+                * TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
+                * TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp:
+                * TAO_IDL/be/be_visitor_interface/amh_ss.cpp:
+                * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_ih.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+                * TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp:
+                * TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp:
+                * TAO_IDL/be/be_visitor_operation/amh_sh.cpp:
+                * TAO_IDL/be/be_visitor_operation/amh_ss.cpp:
+                * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp:
+                * TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp:
+                * TAO_IDL/be/be_visitor_operation/operation_ch.cpp:
+                * TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
+                * TAO_IDL/be/be_visitor_operation/tie_ss.cpp:
+                * TAO_IDL/be/be_visitor_root/root_ch.cpp:
+                * TAO_IDL/be/be_visitor_root/root_sth.cpp:
+                * TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp:
+                * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
+                * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp:
+                * TAO_IDL/be/be_visitor_structure/any_op_cs.cpp:
+                * TAO_IDL/be/be_visitor_structure/structure_cs.cpp:
+                * TAO_IDL/be/be_visitor_template_export.cpp:
+                * TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp:
+                * TAO_IDL/be/be_visitor_union/any_op_cs.cpp:
+                * TAO_IDL/be/be_visitor_union/discriminant_ci.cpp:
+                * TAO_IDL/be/be_visitor_union_branch/public_ci.cpp:
+                * TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp:
+                * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp:
+                * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp:
+                * TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp:
+                * TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp:
+                * TAO_IDL/be/be_visitor_valuetype/field_cs.cpp:
+                * TAO_IDL/be/be_visitor_valuetype/valuetype.cpp:
+                * TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp:
+                * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
+                * TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp:
+                * TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp:
+                  Reduced whitespaces in generated code.
+
+                * TAO_IDL/be/be_visitor_interface/tie_ss.cpp:
+                  Removed tabs from generated code.
+
+
+        Fri Oct 28 09:23:52 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+                * tests/Bug_3531b_Regression/server.cpp:
+
+                  Fix for Windoze compile problem.
+
+        Fri Oct 28 07:36:43 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/executor_exh.cpp:
+                * TAO_IDL/be/be_visitor_component/executor_exs.cpp:
+                * TAO_IDL/be/be_visitor_component/executor_private_exh.cpp:
+                * TAO_IDL/be/be_visitor_component/facet_exh.cpp:
+                * TAO_IDL/be/be_visitor_component/facet_exs.cpp:
+                  Fixed compile issues.
+
+        Thu Oct 27 08:05:28 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/executor_exh.cpp:
+                * TAO_IDL/be/be_visitor_component/executor_exs.cpp:
+                  Removed the overrides of _is_a, marshal and _repository_id since
+                  these methods are not needed anymore.
+
+        Wed Oct 26 13:38:02 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/component_ex_idl.cpp:
+                * TAO_IDL/be/be_visitor_component/component_exh.cpp:
+                * TAO_IDL/be/be_visitor_component/component_exs.cpp:
+                * TAO_IDL/be/be_visitor_component/executor_exh.cpp:
+                * TAO_IDL/be/be_visitor_component/executor_exs.cpp:
+                * TAO_IDL/be/be_visitor_component/executor_exs_attr_init.cpp:
+                * TAO_IDL/be/be_visitor_component/executor_private_exh.cpp:
+                * TAO_IDL/be/be_visitor_component/facet_exh.cpp:
+                * TAO_IDL/be/be_visitor_component/facet_exs.cpp:
+                  Fixed issues regarding derived components. Derived component
+                  were not derived from the base implementation. Instead of deriving
+                  from the base implementation, a whole new base executor was
+                  generated and still wasn't derived from this. Now there's
+                  one base implementation where the derived executor is derived from.
+
+                * TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp:
+                  Fixed compile issues when a derived interface supports
+                  another interface.
+
+        Mon Oct 24 11:50:33 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+                * tao/Connection_Handler.cpp:
+                * tao/Leader_Follower.h:
+                * tao/Leader_Follower.inl:
+                * tao/Leader_Follower.cpp:
+                * tao/Wait_On_LF_No_Upcall.h:
+                * tao/Wait_On_LF_No_Upcall.cpp:
+                * tao/Wait_On_Leader_Follower.h:
+                * tao/Wait_Strategy.h:
+                * tao/Wait_Strategy.cpp:
+
+                  Implemented a solution for two known problems:
+                  a) deadlocking possibility because of upcall handling
+                    in client leader threads without abdicating
+                    leadership
+                  b) inefficient handling of nested upcalls in
+                    client leader threads in case MT_NOUPCALL
+                    strategy
+                  This solution implements leadership abdication
+                  (as also proposed by Russell Mora in Bugzilla #3531
+                  and David Kinder in Bugzilla #3768) when a client
+                  leader thread receives an upcall (triggering a
+                  call to Leader_Follower::set_upcall_thread) so
+                  any waiting (regular) leader thread could now
+                  take over. Futhermore leader abdication for client
+                  leader threads is also implemented in case an event
+                  causes a client leader thread to wake up and it detects
+                  leader threads waiting which are capable to take over
+                  leadership.
+                  With this out of the way the solution for MT_NOUPCALL
+                  could now be optimized with a 'handle deferring'
+                  mechanism which allows a client leader thread to
+                  temporarily defer an upcall until the client leader
+                  thread has abdicated and leadership switches (which
+                  should happen almost immediately after the client
+                  leader thread deferred the upcall handle(r)).
+
+                * tao/Resume_Handle_Deferred.h:
+                * tao/Resume_Handle_Deferred.cpp:
+
+                  Removed these files. Part of previous, non-optimal,
+                  MT_NOUPCALL solution.
+
+                * tao/tao.mpc:
+
+                  Removed Resume_Handle_Deferred.{h,cpp}
+
+                * tests/Bug_3531b_Regression/Bug_3531b_Regression.mpc:
+                * tests/Bug_3531b_Regression/server.cpp:
+
+                  Fixed compile problems due to TAO version
+                  incompatibilities and removed dummy_label
+                  restriction.
+
+                * tests/Bug_3768_Regression:
+                * tests/Bug_3768_Regression/Bug_3768_Test.mpc:
+                * tests/Bug_3768_Regression/Test.idl:
+                * tests/Bug_3768_Regression/TestCallback.h:
+                * tests/Bug_3768_Regression/TestCallback.cpp:
+                * tests/Bug_3768_Regression/TestServer.h:
+                * tests/Bug_3768_Regression/TestServer.cpp:
+                * tests/Bug_3768_Regression/client.cpp:
+                * tests/Bug_3768_Regression/run_test.pl:
+                * tests/Bug_3768_Regression/server.cpp:
+
+                  Added new test for Bugzilla #3768.
+
+                * bin/tao_orb_tests.lst
+
+                  Added Bug_3531_Regression, Bug_3531b_Regression and
+                  Bug_3768_Regression to regular test runs.
+
+        === end changelog ===
+
+Tue Nov 01 14:34:13 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+        * On_Demand_Act_Direct_Coll/Collocated_Test.cpp:
+        * On_Demand_Act_Direct_Coll/test_i.cpp:
+        * On_Demand_Act_Direct_Coll/test_i.h:
+        * On_Demand_Act_Direct_Coll/Client_Task.cpp:
+        * On_Demand_Act_Direct_Coll/test.idl:
+        Clean up test.
+
+
+Tue Nov 01 10:54:13 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        Merged changes from Remedy SA work branch.
+
+        === start changelog ===
+
+        Mon Oct 31 13:14:04 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+                Add safe_servant_base in CIAO consumers servant
+
+
+        Fri Oct 28 11:37:40 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+                Changes for removing activators for CIAO consumers
+
+        Wed Oct 26 07:18:40 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+                * TAO_IDL/be/be_codegen.cpp:
+                Remove include files for ciao servant- and port_activator.
+
+                * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+                Changes for removing activators in CIAO
+
+        === end changelog ===
+
+Thu Oct 27 16:16:09 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * utils/logWalker/HostProcess.h:
+        * utils/logWalker/HostProcess.cpp:
+        * utils/logWalker/Log.cpp:
+
+          Clean up treatment of connection closure and reuse of handles.
+
+Thu Oct 27 12:13:40 UTC 2011  Simon Massey <sma at prismtech dot com>
+
+        * tao/PI_Server/PI_Server_include.pidl:
+        Was duplicating the tao/PortableServer/PortableServer_include.pidl
+        #define guard name.
+
+Tue Oct 25 08:10:00 UTC 2011  Marijke Hengstmengel <mhengstmengel@remedy.nl>
+
+        * tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp:
+        Solved error in destroying the orb.
+
+Fri Oct 21 14:44:28 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/IORManipulation/IORManipulation.mpc:
+        * tao/IORTable/IORTable.mpc:
+        * tao/ZIOP/ZIOP.mpc:
+          Generate export files as part of the build
+
+        * tao/IORManipulation/ior_manip_export.h:
+        * tao/IORTable/iortable_export.h:
+        * tao/ZIOP/ziop_export.h:
+          Removed these files.
+
+        * tao/ZIOP/ZIOP.h:
+          Doxygen fix
+
+Thu Oct 20 17:34:00 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/POA/On_Demand_Act_Direct_Coll/On_Demand_Act_D_Coll.mpc:
+          Don't build this test with minimum corba and CORBA/e
+
+Thu Oct 20 12:50:09 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be_include/be_interface.h:
+          Fixed gcc warning
+
+Tue Oct 20 09:30:13 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        Merged changes from Remedy work branch.
+
+        === start changelog ===
+
+        Thu Oct 20 08:42:33 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
+
+                * On_Demand_Act_Direct_Coll:
+                * On_Demand_Act_Direct_Coll/Collocated_Test.cpp:
+                * On_Demand_Act_Direct_Coll/Servant_Activator.cpp:
+                * On_Demand_Act_Direct_Coll/test_i.cpp:
+                * On_Demand_Act_Direct_Coll/Server_Task.h:
+                * On_Demand_Act_Direct_Coll/run_test.pl:
+                * On_Demand_Act_Direct_Coll/test_i.h:
+                * On_Demand_Act_Direct_Coll/Client_Task.cpp:
+                * On_Demand_Act_Direct_Coll/Server_Task.cpp:
+                * On_Demand_Act_Direct_Coll/Servant_Activator.h:
+                * On_Demand_Act_Direct_Coll/Client_Task.h:
+                * On_Demand_Act_Direct_Coll/On_Demand_Act_D_Coll.mpc:
+                * On_Demand_Act_Direct_Coll/test.idl:
+                Test with Servant Activator and thru_poa- and direct collocation.
+
+                * bin/tao_orb_tests.lst
+                Added On_Demand_Act_Direct_Coll test.
+
+
+        Wed Oct 19 14:15:57 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * docs/tutorials/Quoter/RTCORBA/Broker.cpp:
+                * docs/tutorials/Quoter/RTCORBA/docs/distributor.html:
+                  Fixed typos.
+
+                * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h:
+                  Fixed typo.
+
+                * orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp:
+                  ++x instead of x++;
+
+        Tue Oct 18 13:47:54 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/context_svh.cpp:
+                * TAO_IDL/be/be_visitor_component/context_svs.cpp:
+                  Reverted last changes. Need a more robust implementation to
+                  fix re-entrancy
+
+        Tue Oct 18 11:35:58 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_exception/any_op_cs.cpp:
+                * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp:
+                * TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp:
+                * TAO_IDL/be/be_visitor_structure/any_op_cs.cpp:
+                  Layout changes to the generated code
+
+        Tue Oct 18 10:51:21 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/context_svh.cpp:
+                * TAO_IDL/be/be_visitor_component/context_svs.cpp:
+                  Using recursive mutexes instead of normal mutexes.
+
+        Tue Oct 18 10:39:23 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/context_svs.cpp:
+                  Fixed a minor indentation issue.
+
+        Tue Oct 18 10:03:32 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+                  Using the container_ variable in a thread safe way.
+
+        Tue Oct 18 07:01:33 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
+                * tests/Collocated_DerivedIF/Collocated_DerivedIF.mpc:
+                Changes for duplicate project names.
+
+        Mon Oct 17 13:08:33 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
+                * tests/Collocated_DerivedIF:
+                * tests/Collocated_DerivedIF/Client_Task.h:
+                * tests/Collocated_DerivedIF/Client_Task.cpp:
+                * tests/Collocated_DerivedIF/Collocated_DerivedIF.mpc:
+                * tests/Collocated_DerivedIF/Collocated_Test.cpp:
+                * tests/Collocated_DerivedIF/Hello.h:
+                * tests/Collocated_DerivedIF/Hello.cpp:
+                * tests/Collocated_DerivedIF/Server_Task.h:
+                * tests/Collocated_DerivedIF/Server_Task.cpp:
+                * tests/Collocated_DerivedIF/Test.idl:
+                * tests/Collocated_DerivedIFl/run_test.pl:
+                * tests/Collocated_DerivedIFl/README:
+                Test for -ORBCollocationStrategy direct and interface inheritance
+
+                * tests/Collocated_Best/README:
+              Add ID
+
+        Mon Oct 17 12:33:33 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
+                * docs/Options.html
+                Added new define TAO_DEFAULT_COLLOCATION_STRATEGY .
+
+        Mon Oct 17 11:41:33 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
+                * docs/Options.html
+                Add new ORBCollocationStrategy best .
+
+        Thu Oct 13 12:57:25 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be_include/be_valuetype.h:
+                * TAO_IDL/be/be_valuetype.cpp:
+                  Removed gen_skel_helper from here, not used at all
+
+                * orbsvcs/tests/Notify/lib/Options_Parser.cpp:
+                  Fixed compile error with gcc 4.6
+
+        Thu Oct 13 12:14:00 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_interface.cpp:
+                * TAO_IDL/be/be_visitor_interface/amh_si.cpp:
+                  static_cast seems to be required, not sure why, reverting this part
+                  to get our branch build green again
+
+        Thu Oct 13 11:15:06 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * tao/AnyTypeCode/Any_Impl.cpp:
+                  Layout changes
+
+                * tao/LocalObject.cpp:
+                * tao/Object.cpp:
+                  Log an error before throwing a NO_IMPLEMENT system exception
+
+        Thu Oct 13 07:15:34 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_interface.cpp:
+                * TAO_IDL/be/be_visitor_interface/amh_si.cpp:
+                  Further reduction of code being generated in case of interface
+                  inheritance
+
+        Thu Oct 13 06:46:25 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_interface.cpp:
+                  Fixed problem with num_args that still was generated for arguments
+
+        Wed Oct 12 14:14:32 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_interface.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_si.cpp:
+                  Changed indentation and removed not needed static cast in the
+                  generated code
+
+        Wed Oct 12 12:06:33 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
+                * tests/Collocated_NoColl:
+                * tests/Collocated_NoColl/Client_Task.h:
+                * tests/Collocated_NoColl/Client_Task.cpp:
+                * tests/Collocated_NoColl/Collocated_NoColl.mpc:
+                * tests/Collocated_NoColl/Collocated_Test.cpp:
+                * tests/Collocated_NoColl/Hello.h:
+                * tests/Collocated_NoColl/Hello.cpp:
+                * tests/Collocated_NoColl/Server_Task.h:
+                * tests/Collocated_NoColl/Server_Task.cpp:
+                * tests/Collocated_NoColl/Test.idl:
+                * tests/Collocated_NoColl/run_test.pl:
+                Test for -ORBCollocation NO
+
+
+        Wed Oct 12 12:02:04 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * tao/Collocation_Strategy.h:
+                * tao/Invocation_Adapter.cpp:
+                  Print the collocation strategy that we have determined
+
+                * tests/Hello/run_test.pl:
+                  Added -cdebug that enables ORBDebugLevel 10 for the client
+
+        Wed Oct 12 10:09:25 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp:
+                * TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp:
+                * tao/Abstract_Servant_Base.h:
+                * tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp:
+                * tao/PortableServer/Operation_Table.h:
+                  Removed the num_args argument for the direct collocation skeleton
+                  functions because it was not used at all
+
+        Wed Oct 12 09:55:38 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_interface/amh_ss.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+                * tao/Object_T.h:
+                * tao/Object_T.cpp:
+                * tao/PolicyC.cpp:
+                * tao/Valuetype/AbstractBase_T.h:
+                * tao/Valuetype/AbstractBase_T.cpp:
+                  unchecked_narrow method was available with and without repository_id
+                  argument but that wasn't used at all. merged both methods into one
+                  and updated tao_idl code generation to not generate the repository_id
+                  anymore
+
+        Wed Oct 12 09:01:19 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_interface/amh_ss.cpp:
+                * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+                * tao/Object_T.h:
+                * tao/Object_T.cpp:
+                * tao/PolicyC.cpp:
+                * tao/PortableServer/PolicyS.cpp:
+                * tao/Valuetype/AbstractBase_T.h:
+                * tao/Valuetype/AbstractBase_T.cpp:
+                  Removed the collocation opportunity from the narrow calls, the
+                  boolean collocated only means whether the servant is collocated or
+                  not and shouldn't include the fact whether we have a collocation
+                  opportunity or not
+
+        Tue Oct 11 17:38:06 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp:
+                * tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.cpp:
+                * tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.cpp:
+                  Also check the string that returned
+
+        Tue Oct 11 10:53:17 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * tao/Object_T.cpp:
+                  Don't use collocation opportunity, just determine whether the
+                  object is collocated or not. If this doesn't break any tests, we
+                  need to do some more cleanup here
+
+        Tue Oct 11 10:41:02 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * tao/CORBANAME_Parser.cpp:
+                * tao/Remote_Object_Proxy_Broker.cpp:
+                  Enable through poa collocation by default
+
+        Tue Oct 11 07:17:47 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+                  Layout changes and just always generate the orb optimize flags
+
+        Mon Oct 10 17:43:50 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * tao/IIOP_Connector.cpp:
+                * tao/Invocation_Adapter.h:
+                * tao/Invocation_Adapter.cpp:
+                * tao/ORB_Core.h:
+                * tao/ORB_Core.cpp:
+                  Moved collocation_strategy from the orb core to the invocation adapter
+
+                * tests/Collocated_ThruP_Sp/Collocated_Test.cpp:
+                * tests/Collocated_ThruP_Sp/README:
+                * tests/Collocated_ThruP_Sp/Server_Task.cpp:
+                * tests/Collocated_ThruP_Sp/run_test.pl:
+                * tests/Collocated_ThruP_Sp_Gd/README:
+                * tests/Collocated_ThruP_Sp_Gd/run_test.pl:
+                  Add -debug to the script, layout changes, missing Id
+
+        Fri Oct  7 10:54:09 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * tao/ORB_Core.cpp:
+                  Tweaked collocation strategy a little bit more, for direct we need
+                  a servant, not for poa. If we are not collocated, we just go remote and
+                  not give an exception
+
+        Fri Oct  7 09:17:36 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+                  Layout change to generated code
+
+                * tao/Invocation_Adapter.cpp:
+                  Removed the check that servant != 0 before being able to invoke
+                  collocated, collocation opportunities test shows a case where this
+                  happens
+
+                * tao/ORB_Core.cpp:
+                  Added logging before we throw an exception related to collocation
+                  mis configuration. If we are collocated with best opportunity without
+                  any opportunity we default to remote instead of having an exception.
+                  Through poa seems possible without a servant pointer
+
+        Thu Oct  6 09:34:57 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+              * tao/DynamicInterface/DII_Invocation_Adapter.cpp:
+              Set collocation_opportunity to TAO_CO_THRU_POA_STRATEGY instead of 0.
+
+        Thu Oct  6 08:56:57 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc:
+                * orbsvcs/examples/RtEC/IIOPGateway/RtEC_IIOPGateway.mpc:
+                * tests/Oneway_Buffering/Oneway_Buffering.mpc:
+                * tests/Policies/Policies.mpc:
+                  requires for corba_messaging is already pulled in through the
+                  base projects
+
+        Wed Oct  5 18:49:30 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_interface.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+                * TAO_IDL/be/be_visitor_root/root_ch.cpp:
+                * TAO_IDL/be_include/be_global.h:
+                * TAO_IDL/be_include/be_interface.h:
+                * TAO_IDL/be_include/be_visitor_root/root_ch.h:
+                  Even more cleanup of old stuff
+
+        Wed Oct  5 18:42:43 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_home.cpp:
+                * TAO_IDL/be/be_interface.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+                * TAO_IDL/be_include/be_interface.h:
+                * TAO_IDL/be/be_visitor_operation/base_proxy_impl_ch.cpp:
+                * TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp:
+                  More cleanup
+
+                * TAO_IDL/be_include/be_visitor_operation/base_proxy_impl_ch.h:
+                * TAO_IDL/be_include/be_visitor_operation/remote_proxy_impl_cs.h:
+                  Removed these files.
+
+        Wed Oct  5 18:34:21 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_home.cpp:
+                * TAO_IDL/be/be_interface.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+                * TAO_IDL/be_include/be_interface.h:
+                  Cleanup of very old stuff
+
+                * TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
+                  Fixed cpb
+
+                * tao/Valuetype/AbstractBase_T.h:
+                * tao/Valuetype/AbstractBase_T.cpp:
+                  Updated for changes below
+
+                * tests/CSD_Collocation/svc.conf.csd:
+                  Removed deprecated arguments
+
+        Wed Oct  5 13:01:20 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
+
+                * tests/Collocated_Best/README
+                * tests/Collocated_ThruP_Sp/README
+                * tests/Collocated_ThruP_Sp_Gd/README
+                * tests/Bug_2241_Regression/README
+                Add README's
+
+                * bin/tao_orb_tests.lst
+                Added Collocated_ThruP_Sp_Gd test.
+
+        Wed Oct  5 12:41:20 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_interface/amh_ss.cpp:
+                * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+                * TAO_IDL/be/be_visitor_operation/operation.cpp:
+                * tao/PolicyC.cpp:
+                * tao/Collocation_Strategy.h:
+                * tao/PortableServer/PolicyS.cpp:
+                Change define TAO_CO_DIRECT_POA,remove POA
+
+                * tao/DynamicInterface/DII_Invocation_Adapter.h:
+                * tao/DynamicInterface/DII_Invocation_Adapter.cpp:
+                * tao/Messaging/Asynch_Invocation_Adapter.h:
+                * tao/Messaging/Asynch_Invocation_Adapter.cpp:
+                * tao/Valuetype/AbstractBase_Invocation_Adapter.h:
+                * tao/Valuetype/AbstractBase_Invocation_Adapter.cpp:
+                Change proxybroker for collocation opertunities
+
+                * tao/ORB_Core.cpp:
+                * tao/Invocation_Adapter.cpp:
+                Extended collocation_strategy with opertunities
+                Handling of BEST strategy and checking other strategies.
+
+                * tests/Collocated_Best/Collocated_Best_Direct/run_test.pl:
+
+
+
+        Wed Oct  5 08:35:20 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+                * TAO_IDL/be/be_codegen.cpp:
+                * TAO_IDL/be/be_component.cpp:
+                * TAO_IDL/be/be_interface.cpp:
+                * TAO_IDL/be/be_visitor_interface.cpp:
+                * TAO_IDL/be/be_visitor_interface/amh_ss.cpp:
+                * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_ci.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_sh.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+                * TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
+                * TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp:
+                * TAO_IDL/be/be_visitor_operation/operation.cpp:
+                * TAO_IDL/be/be_visitor_root/root_ch.cpp:
+                * TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp:
+                * TAO_IDL/be_include/be_component.h:
+                * TAO_IDL/be_include/be_interface.h:
+                * TAO_IDL/be_include/be_visitor_interface.h:
+                * tao/Abstract_Servant_Base.h:
+                * tao/Collocated_Invocation.h:
+                * tao/Collocated_Invocation.cpp:
+                * tao/Collocation_Strategy.h:
+                * tao/Invocation_Adapter.h:
+                * tao/Invocation_Adapter.inl:
+                * tao/Invocation_Adapter.cpp:
+                * tao/ORB_Core.h:
+                * tao/ORB_Core.cpp:
+                * tao/Object.h:
+                * tao/Object.cpp:
+                * tao/Object_T.h:
+                * tao/Object_T.cpp:
+                * tao/PolicyC.h:
+                * tao/PolicyC.inl:
+                * tao/PolicyC.cpp:
+                * tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h:
+                * tao/PortableServer/PolicyS.h:
+                * tao/PortableServer/PolicyS.cpp:
+                * tao/PortableServer/Servant_Base.h:
+                * tao/PortableServer/Servant_Base.cpp:
+                * tao/tao.mpc:
+                  Rough reimplementatin of handling of collocated call. A pre condition
+                  for using collocation is having a servant pointer. The core of TAO
+                  also couldn't detect whether through poa collocation is requested
+                  without having -Gp being enabled. The collocated proxy broker (cpb)
+                  was only used for direct collocation, but didn't contain any interface
+                  specific code. TAO_IDL now generated a collocation opportunity to
+                  indicate which support it did generate, when the core than has
+                  a servant pointer it can determine which opportunities it has an
+                  what is requested.
+
+                  As side effect we get smaller generated code, less complexity, and
+                  better performance
+
+                  This has to be finished but committing it right now.
+
+                * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp:
+                * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp:
+                * TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_sh.h:
+                * TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_ss.h:
+                * tao/Collocation_Proxy_Broker.h:
+                * tao/Collocation_Proxy_Broker.cpp:
+                  Removed these files.
+
+        Wed Oct  5 07:15:46 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
+
+                * tao/PortableServer/Collocated_Object_Proxy_Broker.cpp:
+                  Add prefix TAO_COLLOCATION_ to Collocated strategy Thru_POA
+
+        Tue Oct  4 16:36:46 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+                Clean up debug text
+
+                * tao/Invocation_Adapter.cpp:
+                * tao/ORB_Core.h:
+                * tao/ORB_Core.cpp:
+                Change Exception for collocated errors.
+                Add prefix TAO_COLLOCATION_ to Collocated strategies DIrect, Best and Thru_POA
+                Add TAO_DEFAULT_COLLOCATION_STRATEGY
+
+                * tao/orbconf.h:
+                Add TAO_DEFAULT_COLLOCATION_STRATEGY
+
+                * tests/Bug_2241_Regression/run_test.pl:
+                * tests/Collocated_Best/Collocated_Best_Direct/Collocated_Best_Direct.mpc:
+                * tests/Collocated_Best/Collocated_Best_NoColl/Hello.cpp:
+                * tests/Collocated_Best/Collocated_Best_ThuP/Collocated_Best_ThruP.mpc:
+
+                * tests/Collocated_ThruP_Sp_Gd:
+                * tests/Collocated_ThruP_Sp_Gd/Client_Task.h:
+                * tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp:
+                * tests/Collocated_ThruP_Sp_Gd/Collocated_Test.cpp:
+                * tests/Collocated_ThruP_Sp_Gd/Collocated_ThruP_Sp_Gd.mpc:
+                * tests/Collocated_ThruP_Sp_Gd/Hello.h:
+                * tests/Collocated_ThruP_Sp_Gd/Hello.cpp:
+                * tests/Collocated_ThruP_Sp_Gd/Server_Task.h:
+                * tests/Collocated_ThruP_Sp_Gd/Server_Task.cpp:
+                * tests/Collocated_ThruP_Sp_Gd/Test.idl:
+                * tests/Collocated_ThruP_Sp_Gd/run_test.pl:
+                New test for combination Sp and Gd
+
+        Mon Oct  3 15:33:35 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
+
+                * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+                Change dead to 0 for Collocation_Proxy_Broker
+
+                * tao/Collocation_Strategy.h:
+                * tao/Invocation_Adapter.cpp:
+                * tao/ORB_Core.h:
+                * tao/ORB_Core.cpp:
+                Add exceptions for situations if not used -Gp or used -Sp idl flags and
+                ORBCollocationStrategies Direct and Thru_Poa. Add strategie BEST.
+                To do: add prefix COLLOCATION_.
+
+                * tests/Bug_2241_Regression/Client_Task.cpp:
+                * tests/Bug_2241_Regression/Hello.cpp:
+                * tests/Bug_2241_Regression/run_test.pl:
+                Catch expected exceptions.
+
+                * tests/Collocated_Best:
+                * tests/Collocated_Best/Collocated_Best_Direct:
+                * tests/Collocated_Best/Collocated_Best_Direct/Client_Task.h:
+                * tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp:
+                * tests/Collocated_Best/Collocated_Best_Direct/Collocated_Best_Direct.mpc:
+                * tests/Collocated_Best/Collocated_Best_Direct/Collocated_Test.cpp:
+                * tests/Collocated_Best/Collocated_Best_Direct/Hello.h:
+                * tests/Collocated_Best/Collocated_Best_Direct/Hello.cpp:
+                * tests/Collocated_Best/Collocated_Best_Direct/Server_Task.h:
+                * tests/Collocated_Best/Collocated_Best_Direct/Server_Task.cpp:
+                * tests/Collocated_Best/Collocated_Best_Direct/Test.idl:
+                * tests/Collocated_Best/Collocated_Best_Direct/run_test.pl:
+
+                * tests/Collocated_Best/Collocated_Best_NoColl:
+
+                * tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.h:
+                * tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.cpp:
+                * tests/Collocated_Best/Collocated_Best_NoColl/Collocated_Best_NoColl.mpc:
+                * tests/Collocated_Best/Collocated_Best_NoColl/Collocated_Test.cpp:
+                * tests/Collocated_Best/Collocated_Best_NoColl/Hello.h:
+                * tests/Collocated_Best/Collocated_Best_NoColl/Hello.cpp:
+                * tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.h:
+                * tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.cpp:
+                * tests/Collocated_Best/Collocated_Best_NoColl/Test.idl:
+                * tests/Collocated_Best/Collocated_Best_NoColl/run_test.pl:
+
+                * tests/Collocated_Best/Collocated_Best_ThuP:
+
+                * tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.h:
+                * tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.cpp:
+                * tests/Collocated_Best/Collocated_Best_ThuP/Collocated_Best_ThruP.mpc:
+                * tests/Collocated_Best/Collocated_Best_ThuP/Collocated_Test.cpp:
+                * tests/Collocated_Best/Collocated_Best_ThuP/Hello.h:
+                * tests/Collocated_Best/Collocated_Best_ThuP/Hello.cpp:
+                * tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.h:
+                * tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.cpp:
+                * tests/Collocated_Best/Collocated_Best_ThuP/Test.idl:
+                * tests/Collocated_Best/Collocated_Best_ThuP/run_test.pl:
+
+                * tests/Collocated_ThruP_Sp:
+
+                * tests/Collocated_ThruP_Sp/Client_Task.h:
+                * tests/Collocated_ThruP_Sp/Client_Task.cpp:
+                * tests/Collocated_ThruP_Sp/Collocated_Test.cpp:
+                * tests/Collocated_ThruP_Sp/Collocated_ThruP_Sp.mpc:
+                * tests/Collocated_ThruP_Sp/Hello.h:
+                * tests/Collocated_ThruP_Sp/Hello.cpp:
+                * tests/Collocated_ThruP_Sp/Server_Task.h:
+                * tests/Collocated_ThruP_Sp/Server_Task.cpp:
+                * tests/Collocated_ThruP_Sp/Test.idl:
+                * tests/Collocated_ThruP_Sp/run_test.pl:
+                tests for COLLOCATION_DIRECT. To do: add readme
+
+        === end changelog ===
+
+Mon Oct 10 08:48:51 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO version 2.0.5 released.
+
+Fri Oct  7 10:45:41 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * docs/tutorials/Quoter/Event_Service/stock_list.txt:
+        * docs/tutorials/Quoter/Event_Service/stock_list1.txt:
+        * docs/tutorials/Quoter/Event_Service/stock_list2.txt:
+
+        * docs/tutorials/Quoter/Simple/ImprovedServer/stock_list.txt:
+
+        * orbsvcs/examples/Notify/MC/TkMonitor/modules/GeometryStore.pm:
+        * orbsvcs/examples/Notify/MC/TkMonitor/modules/MonitorControl.pm:
+
+        * performance-tests/Protocols/set_lksctp_params.sh:
+        * performance-tests/Protocols/set_sctp_params.sh:
+        * performance-tests/Protocols/show_lksctp_params.sh:
+        * performance-tests/Protocols/show_sctp_params.sh:
+          Fuzz
+
+Fri Oct  7 09:45:58 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * docs/PP_Memory_Management.txt:
+        * orbsvcs/tests/FT_App/replica.cmd:
+        * orbsvcs/tests/InterfaceRepo/Union_Forward_Test/README.txt:
+        * orbsvcs/tests/Log/README:
+        * orbsvcs/tests/Time/README:
+          Fuzz.
+
+Fri Oct  7 09:12:23 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * DevGuideExamples/AMH/README:
+        * DevGuideExamples/AMH_AMI/README:
+        * DevGuideExamples/BiDirectionalGIOP/README:
+        * DevGuideExamples/GettingStarted/README:
+        * DevGuideExamples/Messaging/AMIcallback/README:
+        * DevGuideExamples/Messaging/RelativeRoundtripTimeout/README:
+        * DevGuideExamples/Multithreading/GracefulShutdown/README:
+        * DevGuideExamples/Multithreading/README:
+        * DevGuideExamples/Multithreading/Reactive/README:
+        * DevGuideExamples/Multithreading/ThreadPerConnection/README:
+        * DevGuideExamples/Multithreading/ThreadPool/README:
+        * DevGuideExamples/PortableInterceptors/Auth/README:
+        * DevGuideExamples/PortableInterceptors/IOR/README:
+        * DevGuideExamples/PortableInterceptors/PICurrent/README:
+        * DevGuideExamples/PortableInterceptors/SimpleCodec/README:
+        * DevGuideExamples/RTCORBA/README:
+        * DevGuideExamples/SmartProxies/README:
+        * DevGuideExamples/ValueTypes/Bank/README:
+        * DevGuideExamples/ValueTypes/Messenger/README:
+        * DevGuideExamples/readme.txt:
+        * README:
+        * examples/AMI/FL_Callback/README:
+        * examples/Buffered_AMI/README:
+        * examples/Buffered_Oneways/README:
+        * examples/CSD_Strategy/ThreadPool/README:
+        * examples/CSD_Strategy/ThreadPool2/README:
+        * examples/CSD_Strategy/ThreadPool3/README:
+        * examples/CSD_Strategy/ThreadPool4/README:
+        * examples/CSD_Strategy/ThreadPool6/README:
+        * examples/Load_Balancing/README:
+        * examples/OBV/Typed_Events/README:
+        * examples/RTCORBA/Activity/README:
+        * interop-tests/wchar/README:
+        * orbsvcs/DevGuideExamples/EventServices/OMG_Basic/README:
+        * orbsvcs/DevGuideExamples/EventServices/OMG_SupplierSideEC/README:
+        * orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/README:
+        * orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/README:
+        * orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/README:
+        * orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/README:
+        * orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/README:
+        * orbsvcs/DevGuideExamples/ImplRepo/README:
+        * orbsvcs/DevGuideExamples/NamingService/Messenger/README:
+        * orbsvcs/DevGuideExamples/NamingService/Naming_Client/README:
+        * orbsvcs/DevGuideExamples/NamingService/Naming_Context_Ext/README:
+        * orbsvcs/DevGuideExamples/NamingService/Naming_Server/README:
+        * orbsvcs/DevGuideExamples/NamingService/corbaloc_Messenger/README:
+        * orbsvcs/DevGuideExamples/NotifyService/EventSequence/README:
+        * orbsvcs/DevGuideExamples/NotifyService/Filtering/README:
+        * orbsvcs/DevGuideExamples/NotifyService/Messenger/README:
+        * orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/README:
+        * orbsvcs/DevGuideExamples/NotifyService/QoSProperties/README:
+        * orbsvcs/DevGuideExamples/NotifyService/RTNotify/README:
+        * orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/README:
+        * orbsvcs/DevGuideExamples/PortableInterceptors/PICurrent_NameService/README:
+        * orbsvcs/DevGuideExamples/Security/PolicyControllingApp/README:
+        * orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/README:
+        * orbsvcs/DevGuideExamples/ValueTypes/Notify/readme.txt:
+        * orbsvcs/FT_ReplicationManager/README:
+        * orbsvcs/ImplRepo_Service/README.txt:
+        * orbsvcs/LoadBalancer/README:
+        * orbsvcs/TAO_Service/README:
+        * orbsvcs/examples/CosEC/Factory/README:
+        * orbsvcs/examples/CosEC/RtEC_Based/README:
+        * orbsvcs/examples/CosEC/RtEC_Based/bin/README:
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/README:
+        * orbsvcs/examples/CosEC/Simple/README:
+        * orbsvcs/examples/Log/Basic/README:
+        * orbsvcs/examples/Log/Event/README:
+        * orbsvcs/examples/Log/Notify/README:
+        * orbsvcs/examples/Log/README:
+        * orbsvcs/examples/Log/RTEvent/README:
+        * orbsvcs/examples/Notify/Federation/Agent/README:
+        * orbsvcs/examples/Notify/Federation/SpaceCraft/README:
+        * orbsvcs/examples/Notify/Filter/README:
+        * orbsvcs/examples/Notify/Lanes/README:
+        * orbsvcs/examples/Notify/MC/TkMonitor/README:
+        * orbsvcs/examples/Notify/README:
+        * orbsvcs/examples/Notify/Subscribe/README:
+        * orbsvcs/examples/Notify/ThreadPool/README:
+        * orbsvcs/examples/RtEC/IIOPGateway/README:
+        * orbsvcs/examples/RtEC/MCast/README:
+        * orbsvcs/examples/RtEC/Schedule/README:
+        * orbsvcs/examples/RtEC/Simple/README:
+        * orbsvcs/examples/Security/README:
+        * orbsvcs/examples/Security/SecurityLevel1/README:
+        * orbsvcs/orbsvcs/HTIOP/README.txt:
+        * orbsvcs/orbsvcs/Naming/README:
+        * orbsvcs/tests/AVStreams/Component_Switching/README:
+        * orbsvcs/tests/AVStreams/Latency/README:
+        * orbsvcs/tests/AVStreams/Multicast/README:
+        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/README:
+        * orbsvcs/tests/AVStreams/README:
+        * orbsvcs/tests/AVStreams/Simple_Three_Stage/README:
+        * orbsvcs/tests/AVStreams/mpeg/README.uav:
+        * orbsvcs/tests/Bug_1334_Regression/README:
+        * orbsvcs/tests/Bug_1393_Regression/README:
+        * orbsvcs/tests/Bug_1395_Regression/README:
+        * orbsvcs/tests/Bug_1436_Regression/README:
+        * orbsvcs/tests/Bug_1437_Regression/README:
+        * orbsvcs/tests/Bug_2137_Regression/README:
+        * orbsvcs/tests/Bug_2247_Regression/README:
+        * orbsvcs/tests/Bug_2248_Regression/README:
+        * orbsvcs/tests/Bug_2285_Regression/README:
+        * orbsvcs/tests/Bug_2287_Regression/README:
+        * orbsvcs/tests/Bug_2615_Regression/README:
+        * orbsvcs/tests/Bug_2709_Regression/README:
+        * orbsvcs/tests/Bug_2777_Regression/README:
+        * orbsvcs/tests/Bug_3215_Regression/README:
+        * orbsvcs/tests/Bug_3216_Regression/README:
+        * orbsvcs/tests/CosEvent/Timeout/README:
+        * orbsvcs/tests/EC_Custom_Marshal/README:
+        * orbsvcs/tests/EC_MT_Mcast/README:
+        * orbsvcs/tests/EC_Mcast/README:
+        * orbsvcs/tests/EC_Multiple/README:
+        * orbsvcs/tests/EC_Throughput/README:
+        * orbsvcs/tests/Event/Mcast/AddrServer/README:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/README:
+        * orbsvcs/tests/Event/Mcast/Two_Way/README:
+        * orbsvcs/tests/Event/Performance/README:
+        * orbsvcs/tests/Event/lib/README:
+        * orbsvcs/tests/FaultTolerance/IOGR/README:
+        * orbsvcs/tests/ImplRepo/Bug_2604_Regression/README:
+        * orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/ReadMe.txt:
+        * orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/ReadMe.txt:
+        * orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/ReadMe.txt:
+        * orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/README:
+        * orbsvcs/tests/InterfaceRepo/Union_Forward_Test/README.txt:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/README:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/README:
+        * orbsvcs/tests/Log/Basic_Log_Test/README:
+        * orbsvcs/tests/Notify/lib/README:
+        * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/README:
+        * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/README:
+        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/README:
+        * orbsvcs/tests/Redundant_Naming/README:
+        * orbsvcs/tests/Security/Big_Request/README:
+        * orbsvcs/tests/Security/Bug_1107_Regression/README:
+        * orbsvcs/tests/Security/Bug_2908_Regression/README:
+        * orbsvcs/tests/Security/Callback/README:
+        * orbsvcs/tests/Security/Secure_Invocation/README:
+        * orbsvcs/tests/Security/cert/README:
+        * orbsvcs/tests/Security/ssliop_CSD/README:
+        * orbsvcs/tests/Simple_Naming/README:
+        * orbsvcs/tests/unit/Notify/MC/MonitorControlExt/README:
+        * performance-tests/Cubit/README:
+        * performance-tests/Latency/README:
+        * performance-tests/README:
+        * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/README:
+        * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/README:
+        * performance-tests/Sequence_Latency/Sequence_Operations_Time/README.txt:
+        * tests/Any/Recursive/README:
+        * tests/BiDirectional_DelayedUpcall/README:
+        * tests/Big_AMI/README:
+        * tests/Bug_1330_Regression/README:
+        * tests/Bug_1551_Regression/README:
+        * tests/Bug_1627_Regression/README:
+        * tests/Bug_2119_Regression/README:
+        * tests/Bug_2122_Regression/README:
+        * tests/Bug_2124_Regression/README:
+        * tests/Bug_2126_Regression/README:
+        * tests/Bug_2134_Regression/README:
+        * tests/Bug_2183_Regression/README:
+        * tests/Bug_2186_Regression/README:
+        * tests/Bug_2289_Regression/README:
+        * tests/Bug_2375_Regression/README:
+        * tests/Bug_2399_Regression/README:
+        * tests/Bug_2419_Regression/README:
+        * tests/Bug_2424_Regression/README:
+        * tests/Bug_2429_Regression/README:
+        * tests/Bug_2549_Regression/README:
+        * tests/Bug_2669_Regression/README:
+        * tests/Bug_2791_Regression/README:
+        * tests/Bug_2805_Regression/README.txt:
+        * tests/Bug_2935_Regression/README.txt:
+        * tests/Bug_3068_Regression/README:
+        * tests/Bug_3276_Regression/README:
+        * tests/Bug_3299_Regression/README:
+        * tests/Bug_3311_Regression/README:
+        * tests/Bug_3513_Regression/README:
+        * tests/Bug_3524_Regression/README:
+        * tests/Bug_3574_Regression/README:
+        * tests/Bug_3575_Regression/README:
+        * tests/Bug_3632_Regression/README:
+        * tests/Bug_3676_Regression/README:
+        * tests/Bug_3743_Regression/README:
+        * tests/Bug_3748_Regression/README:
+        * tests/Bug_3755_Ext_Regression/README:
+        * tests/Bug_3790_Regression/README:
+        * tests/Bug_3821_Regression/README:
+        * tests/Bug_3827_Regression/README:
+        * tests/Bug_3837_Regression/README:
+        * tests/Bug_3926_Regression/README:
+        * tests/Bug_3941_Regression/README:
+        * tests/CSD_Strategy_Tests/TP_Test_4/README:
+        * tests/CodeSets/simple/README:
+        * tests/Collocation_Opportunities/README:
+        * tests/DIOP/README:
+        * tests/DSI_Gateway/README:
+        * tests/FL_Cube/README:
+        * tests/Faults/README:
+        * tests/HandleExhaustion/README:
+        * tests/Hello/README:
+        * tests/ICMG_Any_Bug/README:
+        * tests/IPV6/README:
+        * tests/Leader_Followers/README:
+        * tests/LongUpcalls/README:
+        * tests/MProfile/README:
+        * tests/MProfile_Connection_Timeout/README:
+        * tests/MT_BiDir/README:
+        * tests/MT_Client/README:
+        * tests/MT_Server/README:
+        * tests/MT_Timeout/README:
+        * tests/Multiple/README:
+        * tests/Multiple_Inheritance/README:
+        * tests/Muxed_GIOP_Versions/README:
+        * tests/Muxing/README:
+        * tests/Native_Exceptions/README:
+        * tests/Nested_Event_Loop/README:
+        * tests/No_Server_MT_Connect_Test/README:
+        * tests/OBV/Any/README:
+        * tests/OBV/Supports/README:
+        * tests/ORB_Local_Config/Bug_1459/README:
+        * tests/ORB_Local_Config/Bug_3049/README:
+        * tests/ORB_Local_Config/README:
+        * tests/ORB_Local_Config/Two_DLL_ORB/README:
+        * tests/ORB_destroy/README:
+        * tests/Object_Loader/README:
+        * tests/Objref_Sequence_Test/README:
+        * tests/OctetSeq/README:
+        * tests/POA/Adapter_Activator/README:
+        * tests/POA/Bug_1592_Regression/README:
+        * tests/POA/DSI/README:
+        * tests/POA/Explicit_Activation/Alt_Resources/README:
+        * tests/POA/Explicit_Activation/README:
+        * tests/POA/FindPOA/README:
+        * tests/POA/README:
+        * tests/POA/Reference_Counted_Servant/README:
+        * tests/POA/RootPOA/README:
+        * tests/Policies/README:
+        * tests/Portable_Interceptors/Benchmark/README:
+        * tests/Portable_Interceptors/Dynamic/README:
+        * tests/Portable_Interceptors/ForwardRequest/README:
+        * tests/Portable_Interceptors/IORInterceptor/README:
+        * tests/Portable_Interceptors/ORB_Shutdown/README:
+        * tests/Portable_Interceptors/PICurrent/README:
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/README:
+        * tests/RTScheduling/Current/README:
+        * tests/RTScheduling/DT_Spawn/README:
+        * tests/RTScheduling/Thread_Cancel/README:
+        * tests/RTScheduling/VoidData/README:
+        * tests/Smart_Proxies/Collocation/README:
+        * tests/Timed_Buffered_Oneways/README:
+        * tests/Timeout/README:
+        * tests/TransportCurrent/Framework/README:
+        * tests/Xt_Stopwatch/README:
+          Fuzz: Missing Id-tags.
+
+Fri Oct  7 07:55:46 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * examples/PluggableUDP/tests/Performance/svc.conf.xml:
+        * examples/PluggableUDP/tests/SimplePerformance/svc.conf.xml:
+        * examples/Simple/time-date/client.conf.xml:
+        * examples/Simple/time-date/svc.conf.xml:
+        * interop-tests/wchar/build.xml:
+        * orbsvcs/Concurrency_Service/svc.conf.xml:
+        * orbsvcs/ImplRepo_Service/repository.xml:
+        * orbsvcs/Notify_Service/svc.conf.xml:
+        * orbsvcs/TAO_Service/svc.conf.xml:
+        * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf.xml:
+        * orbsvcs/tests/CosEvent/Basic/svc.pull.conf.xml:
+        * orbsvcs/tests/Event/Basic/control.conf.xml:
+        * orbsvcs/tests/Event/UDP/svc.conf.xml:
+        * orbsvcs/tests/FaultTolerance/IOGR/svc.conf.xml:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf.xml:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf.xml:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf.xml:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf.xml:
+        * orbsvcs/tests/Miop/McastHello/client.conf.xml:
+        * orbsvcs/tests/Miop/McastHello/server.conf.xml:
+        * orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf.xml:
+        * orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf.xml:
+        * orbsvcs/tests/Notify/performance-tests/RedGreen/reactive.conf.xml:
+        * orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf.xml:
+        * orbsvcs/tests/Security/MT_IIOP_SSL/client.conf.xml:
+        * orbsvcs/tests/Security/MT_IIOP_SSL/server.conf.xml:
+        * orbsvcs/tests/Security/MT_SSLIOP/client.conf.xml:
+        * orbsvcs/tests/Security/MT_SSLIOP/server.conf.xml:
+        * orbsvcs/tests/Security/ssliop_corbaloc/client.conf.xml:
+        * orbsvcs/tests/Security/ssliop_corbaloc/server.conf.xml:
+        * orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf.xml:
+        * performance-tests/RTCorba/Thread_Pool/native-svc.conf.xml:
+        * performance-tests/RTCorba/Thread_Pool/svc.conf.xml:
+        * performance-tests/Throughput/svc.conf.xml:
+        * tests/AMI/exclusive.conf.xml:
+        * tests/AMI/muxed.conf.xml:
+        * tests/AMI/server.conf.xml:
+        * tests/AMI_Timeouts/svc.conf.xml:
+        * tests/Bug_3251_Regression/Bug_3251.conf.xml:
+        * tests/Bug_3801_Regression/exclusive.conf.xml:
+        * tests/Bug_3801_Regression/muxed.conf.xml:
+        * tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf.xml:
+        * tests/POA/Explicit_Activation/alternate.conf.xml:
+        * tests/RTCORBA/Banded_Connections/svc.conf.xml:
+        * tests/RTCORBA/Client_Propagated/svc.conf.xml:
+        * tests/RTCORBA/Client_Protocol/svc.conf.xml:
+        * tests/RTCORBA/Collocation/continuous.conf.xml:
+        * tests/RTCORBA/Collocation/svc.conf.xml:
+        * tests/RTCORBA/Destroy_Thread_Pool/continuous.conf.xml:
+        * tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml:
+        * tests/RTCORBA/Dynamic_Thread_Pool/svc.conf.xml:
+        * tests/RTCORBA/Explicit_Binding/svc.conf.xml:
+        * tests/RTCORBA/Linear_Priority/svc.conf.xml:
+        * tests/RTCORBA/MT_Client_Protocol_Priority/svc.conf.xml:
+        * tests/RTCORBA/Persistent_IOR/continuous.conf.xml:
+        * tests/RTCORBA/Policy_Combinations/svc.conf.xml:
+        * tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf.xml:
+        * tests/RTCORBA/Priority_Inversion_With_Bands/svc.conf.xml:
+        * tests/RTCORBA/Server_Declared/continuous.conf.xml:
+        * tests/RTCORBA/Server_Declared/svc.conf.xml:
+        * tests/RTCORBA/Server_Protocol/server_iiop.conf.xml:
+        * tests/RTCORBA/Server_Protocol/server_reverse.conf.xml:
+        * tests/RTCORBA/Server_Protocol/server_reverse_nt.conf.xml:
+        * tests/RTCORBA/Server_Protocol/server_shmiop.conf.xml:
+        * tests/RTCORBA/Server_Protocol/server_uiop.conf.xml:
+        * tests/RTCORBA/Thread_Pool/continuous.conf.xml:
+        * tests/RTCORBA/Thread_Pool/svc.conf.xml:
+          Fuzz: No Id-tags.
+
+Wed Sep 28 12:46:14 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/BiDir_GIOP/BiDir_GIOP.mpc:
+        * tao/CodecFactory/CodecFactory.mpc:
+          Added the generated export files so that they get installed
+
+Wed Sep 28 12:42:14 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Generic_Sequence_T.h:
+        * tao/Valuetype/AbstractBase.h:
+        * tao/Valuetype/Valuetype_Adapter_Impl.h:
+          Doxygen changes
+
+        * tao/Object.cpp:
+        * tao/PortableServer/Basic_SArgument_T.h:
+        * tao/DynamicAny/DynAny_i.h:
+          Layout changes
+
+Wed Sep 28 12:39:12 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/AV/AVStreams_i.h:
+        * orbsvcs/tests/Notify/lib/Peer_T.cpp:
+          Layout changes and cleanup
+
+Wed Sep 28 12:37:05 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Persistent_Grid/Grid_i.h:
+        * examples/Simple/bank/AccountManager_i.h:
+        * examples/Simple/echo/Echo_i.h:
+        * examples/Simple/grid/Grid_i.h:
+        * examples/Simple/time/Time_i.h:
+          Layout changes, remove workarounds
+
+Wed Sep 28 12:35:58 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp:
+          Layout changes to the generated code
+
+Wed Sep 28 12:34:31 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_3683_Regression/Echo_i.h:
+          Remove workaround
+
+        * tests/IDL_Test/typedef.idl:
+        * tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h:
+          Layout changes
+
+Wed Sep 28 12:31:44 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/HandleExhaustion/run_test.pl:
+          Added missing GetFile
+
+Wed Sep 28 11:39:31 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+        * tests/Bug_2241_Regression:
+        * tests/Bug_2241_Regression/Bug_2241_Regression.mpc:
+        * tests/Bug_2241_Regression/Client_Task.h:
+        * tests/Bug_2241_Regression/Client_Task.cpp:
+        * tests/Bug_2241_Regression/Collocated_Test.cpp:
+        * tests/Bug_2241_Regression/Hello.h:
+        * tests/Bug_2241_Regression/Hello.cpp:
+        * tests/Bug_2241_Regression/Server_Task.h:
+        * tests/Bug_2241_Regression/Server_Task.cpp:
+        * tests/Bug_2241_Regression/Test.idl:
+        * tests/Bug_2241_Regression/run_test.pl:
+        * bin/tao_orb_tests.lst:
+        New test for '-ORBCollocationStrategy direct'
+
+Sun Sep 25 17:02:27 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * tests/Parallel_Connect_Strategy/run_test.pl:
+          Copy only those configuration files that are needed by the targets.
+          We don't want to solve this in the test framework; the script knows
+          which configuration files should be copied.
+
+Wed Sep 21 13:40:30 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/MT_Client/run_test.pl:
+          Removed conf files that are not in the repo at all
+
+Tue Sep 20 06:43:33 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * tests/AMI/run_mt_noupcall.pl:
+        * tests/MT_Client/run_test.pl:
+          Copy only those configuration files that are needed by the targets.
+          We don't want to solve this in the test framework; the script knows
+          which configuration files should be copied.
+
+Tue Sep 20 06:27:42 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * tests/Oneway_Send_Timeouts/run_test.pl:
+          Fixed runtime issues
+
+Fri Sep 16 12:01:35 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * DevGuideExamples/Multithreading/ThreadPerConnection/run_test.pl:
+        * tests/CSD_Collocation/run_test.pl:
+        * tests/Connection_Purging/run_test.pl:
+        * tests/Hang_Shutdown/run_test.pl:
+        * tests/LongUpcalls/run_test.pl:
+          Copy only those configuration files that are needed by the targets.
+          We don't want to solve this in the test framework; the script knows
+          which configuration files should be copied.
+
+Fri Sep 16 07:55:50 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * tests/Faults/run_test.pl:
+        * tests/Faults/run_test_pp.pl:
+        * tests/MT_NoUpcall_Client_Leader/run_test.pl:
+        * tests/POA/EndpointPolicy/run_test_dh.pl:
+          Copy only those configuration files that are needed by the targets.
+          We don't want to solve this in the test framework; the script knows
+          which configuration files should be copied.
+
+Fri Sep 16 07:37:12 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * tests/Connect_Strategy_Test/run_test.pl:
+        * tests/MT_BiDir/run_test.pl:
+        * tests/MT_Server/run_test.pl:
+        * tests/No_Server_MT_Connect_Test/run_test.pl:
+        * tests/RTCORBA/Server_Protocol/run_test.pl:
+          Copy only those configuration files that are needed by the targets.
+          We don't want to solve this in the test framework; the script knows
+          which configuration files should be copied.
+
+Fri Sep 16 07:02:26 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * tests/Bug_3163_Regression/run_test.pl:
+        * tests/Bug_3630_Regression/run_test.pl:
+        * tests/Bug_3683_Regression/run_test.pl:
+          Copy only those configuration files that are needed by the targets.
+          We don't want to solve this in the test framework; the script knows
+          which configuration files should be copied.
+
+        * tests/Bug_3630_Regression/server.cpp:
+          Added \n
+
+Thu Sep 15 07:42:01 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * tests/AMI/run_test.pl:
+        * tests/Bug_2183_Regression/run_test.pl:
+        * tests/Bug_2186_Regression/run_test.pl:
+        * tests/Bug_2935_Regression/run_test.pl:
+        * tests/Bug_3068_Regression/run_test.pl:
+        * tests/Leader_Followers/run_test.pl:
+        * tests/Oneway_Send_Timeouts/run_test.pl:
+          Copy only those configuration files that are needed by the targets.
+          We don't want to solve this in the test framework; the script knows
+          which configuration files should be copied.
+
+Wed Sep 14 07:34:56 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/TAO_Internal.cpp:
+          When we can't find the service config file output a message that
+          has error in it, so that the scoreboard parser also detects those
+          errors
+
+Wed Sep  7 18:07:24 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/CodecFactory/CodecFactory.h:
+        * tao/CodecFactory/CodecFactory.cpp:
+        * tao/CodecFactory/CodecFactory.mpc:
+          export file is now generated by tao_idl
+
+        * tao/CodecFactory/codecfactory_export.h:
+          Removed this file.
+
+Wed Sep  7 17:31:31 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/BiDir_GIOP/BiDirGIOP.h:
+        * tao/BiDir_GIOP/BiDirGIOP.cpp:
+        * tao/BiDir_GIOP/BiDirPolicy_Validator.h:
+        * tao/BiDir_GIOP/BiDir_GIOP.mpc:
+          export file is now generated by tao_idl
+
+        * tao/BiDir_GIOP/bidirgiop_export.h:
+          Removed this file.
+
+Wed Sep  7 17:27:01 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/modules/IDLHelper.pm:
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_util.cpp:
+        * TAO_IDL/be_include/be_global.h:
+          Added skel_export_file and stub_export_file to define an explicit
+          filename for these export files that are different than the stub/skel
+          export_include which could be a full path. This fixes bugzilla 3980
+
+Tue Sep  6 11:45:16 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Servant_Base.h:
+          Fixed problem with versioned namespace support
+
+Tue Sep  6 08:14:42 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/Any.h:
+        * tao/AnyTypeCode/Any.cpp:
+          Added support for std::wstring
+
+Tue Sep  6 08:06:46 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Basic_SArguments.h:
+          Added support for std::wstring
+
+Thu Sep  1 09:59:22 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h:
+        * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp:
+        * tao/AnyTypeCode_Adapter.h:
+        * tao/Basic_Arguments.h:
+          Added support for std::wstring
+
+Thu Sep  1 06:31:53 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/BD_String_SArgument_T.cpp:
+        * tao/PortableServer/Basic_SArgument_T.cpp:
+        * tao/PortableServer/Fixed_Array_SArgument_T.cpp:
+        * tao/PortableServer/Fixed_Size_SArgument_T.cpp:
+        * tao/PortableServer/Object_SArgument_T.cpp:
+        * tao/PortableServer/Special_Basic_SArgument_T.cpp:
+        * tao/PortableServer/UB_String_SArgument_T.cpp:
+        * tao/PortableServer/Var_Array_SArgument_T.cpp:
+        * tao/PortableServer/Var_Size_SArgument_T.cpp:
+        * tao/PortableServer/Vector_SArgument_T.cpp:
+          Fixed coverity issues
+
+Mon Aug 29 07:20:29 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp:
+          Fixed runtime issues in orbsvcs.
+
+        * tests/OBV/ValueBox/client.cpp:
+          Fixed runtime issues.
+
+Fri Aug 26 11:09:12 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * DevGuideExamples/ValueTypes/Bank/client.cpp:
+        * examples/AMH/Sink_Server/client.cpp:
+        * examples/Event_Comm/supplier.cpp:
+        * examples/Simple/bank/server.cpp:
+        * examples/Simple/echo/server.cpp:
+        * examples/Simple/grid/server.cpp:
+        * examples/Simple/time/server.cpp:
+        * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp:
+        * orbsvcs/tests/Bug_2112_Regression/client.cpp:
+        * orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp:
+        * orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp:
+        * orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp:
+        * orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp:
+        * performance-tests/Sequence_Latency/Sequence_Operations_Time/test.cpp:
+        * tests/Bug_1383_Regression/SimpleClient.cpp:
+        * tests/Bug_3506_Regression/client.cpp:
+        * tests/Bug_3548_Regression/client.cpp:
+        * tests/CDR/allocator.cpp:
+        * tests/Connection_Failure/client.cpp:
+        * tests/DII_AMI_Forward/client.cpp:
+        * tests/DynAny_Test/driver.cpp:
+        * tests/OBV/ValueBox/client.cpp:
+        * tests/POA/EndpointPolicy/server.cpp:
+        * tests/POA/Loader/server.cpp:
+        * tests/Param_Test/driver.cpp:
+        * tests/Portable_Interceptors/AdvSlot/client.cpp:
+        * tests/Portable_Interceptors/AdvSlot/server.cpp:
+        * tests/Portable_Interceptors/AdvSlotDblCpy/client.cpp:
+        * tests/Portable_Interceptors/AdvSlotExt/client.cpp:
+        * tests/RTScheduling/Scheduling_Interceptor/test_client.cpp:
+        * tests/RTScheduling/VoidData/test_client.cpp:
+        * tests/Sequence_Unit_Tests/bounded_object_reference_sequence_ut.cpp:
+        * tests/Sequence_Unit_Tests/bounded_sequence_cdr_ut.cpp:
+        * tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp:
+        * tests/Sequence_Unit_Tests/bounded_value_sequence_ut.cpp:
+        * tests/Sequence_Unit_Tests/object_reference_sequence_element_ut.cpp:
+        * tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp:
+        * tests/Sequence_Unit_Tests/testing_allocation_traits_ut.cpp:
+        * tests/Sequence_Unit_Tests/unbounded_object_reference_sequence_ut.cpp:
+        * tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp:
+        * tests/Sequence_Unit_Tests/unbounded_octet_sequence_ut.cpp:
+        * tests/Sequence_Unit_Tests/unbounded_sequence_cdr_ut.cpp:
+        * tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp:
+        * tests/Sequence_Unit_Tests/unbounded_value_sequence_ut.cpp:
+        * utils/nslist/nsadd.cpp:
+        * utils/nslist/nsdel.cpp:
+        * utils/nslist/nslist.cpp:
+          Fixed issues regarding exceptions which are not caught.
+
+Tue Aug 23 18:19:01 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * NEWS:
+          Prepared for next release
+
+Tue Aug 23 19:01:44 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO version 2.0.4 released.
+
+Mon Aug 22 15:39:52 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * orbsvcs/tests/Security/BiDirectional/ssl/ca.pem:
+        * orbsvcs/tests/Security/BiDirectional/ssl/client-cert.pem:
+        * orbsvcs/tests/Security/BiDirectional/ssl/client-key.pem:
+        * orbsvcs/tests/Security/BiDirectional/ssl/server-cert.pem:
+        * orbsvcs/tests/Security/BiDirectional/ssl/server-key.pem:
+
+          Regenerated these certs so the test works.
+
+Thu Aug 11 18:55:10 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * NEWS:
+
+          Edited existing entry about generation of argument traits.
+
+Mon Aug  8 14:26:30 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+          Don't generate arg traits if they are disabled
+
+Mon Aug  8 09:01:55 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_util.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+        * TAO_IDL/be/be_visitor_root/root_ch.cpp:
+        * TAO_IDL/be/be_visitor_root/root_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_structure/structure_cs.cpp:
+        * TAO_IDL/be/be_visitor_traits.cpp:
+        * TAO_IDL/be_include/be_global.h:
+          Added support for -Scdr which suppresses the CDR streaming operations.
+          This safes footprint when we are using IDL defined types, but these
+          are not intended to be send through remote CORBA interfaces
+
+Thu Aug  4 15:47:33 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * TAO-INSTALL.html:
+
+          Added note about building for Android.
+
+        * tests/Sequence_Unit_Tests/string_sequence_tester.hpp:
+
+          Additional compiler macro added to build on Android.
+
+          Thanks to Trevor Fields of OCI for doing the heavy lifting
+          for porting TAO to Android.
+
+Sat Jul 23 22:40:39 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * TAO_IDL/be/be_visitor_arg_traits.cpp:
+
+          Fuzz fix.
+
+Sat Jul 23 14:55:15 UTC 2011  Phil Mesnier <mesnier_p@ociweb.com>
+
+        * TAO/tao/IFR_Client/IFR_Client.mpc
+
+          Fixed dependencies on new IFR_Client_Skel project so it
+          builds on windows.
+
+Wed Jul 20 18:53:29 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/ast/ast_interface:
+
+          Removed an unnecessary 'seen' flag for arg traits, it was
+          not only unneeded, but also pulling in #includes in the
+          *S.h file that wouldn't compile if the IDL contains
+          valuetypes and no non-local interfaces.
+
+Tue Jul 19 13:25:22 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_arg_traits.cpp:
+
+          Added global scope double colons to code generation of
+          arg traits template plate arg names. Some builds had
+          confusion, thinking that the name was scoped inside the
+          TAO namespace.
+
+        * TAO_IDL/be/be_codegen.cpp:
+
+          Added #include generation check for valuetypes/valueboxes
+          when generating the proper arg traits base class
+          includes.
+
+Mon Jul 18 20:02:59 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_arg_traits.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be_include/be_global.h:
+
+          Added new option to IDL compiler -Gata, which
+          generates arg traits instantiations using the
+          AnyTypeCode_Adapter version of the last template
+          parameter (if Any support is not suppressed). The
+          option is used when processing IDL for the
+          sequences of basic types, so their arg traits
+          may be included by application whether or not
+          the application is suppressing Any support.
+
+        * tao/tao.mpc:
+
+          Added the new option to the basic sequence PIDL files.
+
+        * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h:
+        * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp:
+        * tao/AnyTypeCode_Adapter.h:
+
+          Added new overloads to the AnyTypeCode_Adapter and
+          AnyTypeCode_Adapter_Impl classes, with the basic
+          type sequences as the second argument.
+
+        * docs/compiler.html:
+
+          Documented the new IDL compiler option.
+
+Mon Jul 18 19:01:17 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * MPC/config/ifr_client_skel.mpb:
+
+          Fix suggested by Johnny to get build order correct on windows.
+
+Mon Jul 18 18:22:55 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * orbsvcs/IFR_Service/IFR_Service.cpp:
+
+          Fixed the include path for IFR_ComponentS.h
+
+Mon Jul 18 06:37:53 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+          Changed server header start and end generation in case of
+          skeleton file suppression (-SS) to fix versioning bracketing
+          problems as a result of changed arg traits generation.
+
+Fri Jul 15 12:46:14 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_root/root_sh.cpp:
+        * TAO_IDL/be/be_visitor_root/root_ch.cpp:
+
+          Added missing check for suppress option before generating
+          skeleton arg traits, and made layout changes to both stub
+          and skeleton root visitors.
+
+Fri Jul 15 11:59:37 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Monitor/Monitor.h:
+          Fixed compile error
+
+Fri Jul 15 09:00:55 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_util.cpp:
+          Fixed layout of one of the help messages
+
+Fri Jul 15 08:33:20 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/ifr_client_skel.mpb:
+        * MPC/config/ifrservice.mpb:
+        * orbsvcs/IFR_Service/IFR_Service.mpc:
+        * orbsvcs/orbsvcs/IFRService.mpc:
+        * orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h:
+        * orbsvcs/orbsvcs/IFRService/ComponentDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/EventPortDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/HomeDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp:
+        * orbsvcs/orbsvcs/IFRService/IRObject_i.h:
+        * orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp:
+        * tao/IFR_Client/IFR_Client.mpc:
+        * tao/IFR_Client/ifr_client_skel_export.h:
+          Generate a new IFR_Client_skel library that contains all
+          skeletons for the IFR_Client. This is generated under TAO/tao/IFR_Client
+          and than used by the IFRService
+
+        * orbsvcs/orbsvcs/IFRService/IFR_BaseS.h:
+        * orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl:
+        * orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp:
+        * orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h:
+        * orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl:
+        * orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp:
+        * orbsvcs/orbsvcs/IFRService/IFR_BasicS.h:
+        * orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl:
+        * orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp:
+        * orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h:
+        * orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl:
+        * orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp:
+        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h:
+        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl:
+        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp:
+        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h:
+        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl:
+        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp:
+        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h:
+        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl:
+        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp:
+        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h:
+        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl:
+        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp:
+          Removed these files, it are generated files that shouldn't be in
+          the repository
+
+Fri Jul 15 07:29:03 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/IFRService/AliasDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ArrayDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.h:
+        * orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ModuleDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/NativeDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/OperationDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/PublishesDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/Repository_i.h:
+        * orbsvcs/orbsvcs/IFRService/SequenceDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/StringDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/StructDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/TypedefDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h:
+        * orbsvcs/orbsvcs/IFRService/WstringDef_i.h:
+          Layout changes
+
+Fri Jul 15 07:11:02 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/IFR_Client/IFR_Client_Adapter_Impl.h:
+        * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp:
+          Layout changes, removed hardcrafted arg_trait
+
+Thu Jul 14 19:49:02 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/PolicyC.cpp:
+        * tao/PortableServer/PolicyS.cpp:
+
+          Removed arg traits instantiations and #includes from these
+          hand_crafted files.
+
+        * tao/tao.mpc:
+
+          - Added IDL compiler option to suppress Any operator
+            generation for Policy_Forward.pidl.
+
+          - Added new IDL compiler option (see below) to
+            suppress arg traits generation for ParameterMode.pidl.
+
+        * tests/Param_Test/Param_Test.mpc:
+
+          Added header and inline file lists.
+
+        * TAO_IDL/include/idl_global.h:
+        * TAO_IDL/be/be_attribute.cpp:
+        * TAO_IDL/be/be_visitor_arg_traits.cpp:
+        * TAO_IDL/be/be_valuetype.cpp:
+        * TAO_IDL/be/be_visitor_operation/arglist.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation_cs.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation.cpp:
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_visitor_valuebox.cpp:
+        * TAO_IDL/be/be_visitor_union.cpp:
+        * TAO_IDL/be/be_visitor_structure.cpp:
+        * TAO_IDL/be/be_visitor_root/root_cs.cpp:
+        * TAO_IDL/be/be_visitor_root/root_sh.cpp:
+        * TAO_IDL/be/be_visitor_root/root_ss.cpp:
+        * TAO_IDL/be/be_visitor_root/root_ch.cpp:
+        * TAO_IDL/be/be_type.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
+        * TAO_IDL/be/be_valuebox.cpp:
+        * TAO_IDL/be/be_decl.cpp:
+        * TAO_IDL/be/be_util.cpp:
+        * TAO_IDL/be/be_visitor_sequence.cpp:
+        * TAO_IDL/be/be_visitor_array/array_ch.cpp:
+        * TAO_IDL/be/be_argument.cpp:
+        * TAO_IDL/be/be_visitor_valuetype.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_visitor_enum/enum_ch.cpp:
+        * TAO_IDL/be/be_sequence.cpp:
+        * TAO_IDL/be/be_operation.cpp:
+        * TAO_IDL/be/be_enum.cpp:
+        * TAO_IDL/be/be_string.cpp:
+        * TAO_IDL/ast/ast_interface.cpp:
+        * TAO_IDL/ast/ast_interface_fwd.cpp:
+        * TAO_IDL/be_include/be_visitor_root/root_ch.h:
+        * TAO_IDL/be_include/be_visitor_root/root_cs.h:
+        * TAO_IDL/be_include/be_visitor_root/root_sh.h:
+        * TAO_IDL/be_include/be_visitor_root/root_ss.h:
+        * TAO_IDL/be_include/be_codegen.h:
+        * TAO_IDL/be_include/be_util.h:
+        * TAO_IDL/be_include/be_decl.h:
+        * TAO_IDL/be_include/be_global.h:
+        * TAO_IDL/util/utl_global.cpp:
+
+          - Moved arg traits generation targets from the stub
+            and skeleton source files to the corresponding
+            header files. This checking addresses [BUGID:3969].
+
+          - Many changes to #include file generation logic,
+            since arg traits generation is now triggered from the IDL
+            declaration and not from its use as an operation argument.
+
+          - Added a new command line option -Sat to suppress
+            the generation of arg tratis altogether.
+
+        * tao/docs/compiler.html:
+
+          Added the new IDL compiler command line option to the table.
+
+Tue Jul 12 13:15:24 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_codegen.cpp:
+
+          Added code generation of a preprocessor version check that
+          will output an error message if the generated file's version
+          doesn't match the IDL compiler's (TAO's) version. This fix
+          closes [BUGID:3979].
+
+Mon Jul 11 14:55:57 UTC 2011  Adam Mitz  <mitza@ociweb.com>
+
+        * TAO_IDL/be/be_util.cpp:
+
+          Removed usage text for command line options that were
+          removed a long time ago.
+
+Fri Jul  8 14:57:31 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_arg_traits.cpp:
+
+          Relocated the spot where a typedef node is marked as having
+          its arg traits instantiation generated. There is a use case
+          where the old location gave rise to infinite recursion and
+          a stack overflow. Thanks to Johnny Willemsen
+          <jwillemsen@remedy.nl> for uncovering the bug and submitting
+          example IDL. This fix closes [BUGID:3978].
+
+        * tests/IDL_Test/interface.cpp:
+
+          Added the example IDL above to the test.
+
+Fri Jul  8 06:39:27 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Servant_Base.h:
+          Added some typedefs useful for template meta programming
+
+Mon Jul  4 11:02:28 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/ImplRepo_Service/ImR_Locator_i.h:
+        * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
+          Fixed Coverity error
+
+        * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp:
+          Fixed mismatched delete as reported by Coverity
+
+Wed Jun 29 12:44:21 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Advanced/TO-DO:
+        * examples/Advanced/ch_21/client.cpp:
+        * examples/Quoter/Quoter_i.cpp:
+        * examples/Simple/bank/README:
+          Cleanup
+
+Wed Jun 29 11:27:19 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/OBV/Simple/Client_i.h:
+        * tests/OBV/Simple/OBV_impl.h:
+        * tests/OBV/Simple/Server_i.h:
+        * tests/OBV/Simple/Server_i.cpp:
+        * tests/OBV/Simple/server.cpp:
+          Cleanup
+
+Wed Jun 29 11:13:02 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/TypeCode_Case_T.h:
+        * tao/Basic_Argument_T.h:
+        * tao/Invocation_Adapter.h:
+        * tao/Bounded_Basic_String_Sequence_T.h:
+        * tao/Generic_Sequence_T.h:
+          Layout changes
+
+        * tao/Object.cpp:
+          Fixed coverity errors
+
+        * tao/Incoming_Message_Stack.h:
+          Removed borland workaround
+
+Wed Jun 29 10:47:05 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ORB_Core.cpp:
+          Fixed coverity errors
+
+Mon Jun 27 10:28:15 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+        * tao/CDR.h:
+        * tao/CDR.inl:
+          Added CDR streaming ops for std::wstring and helper classes
+          and streaming ops to extract bounded strings into std strings.
+
+Thu Jun 23 12:39:08 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * etc/*.doxygen:
+          Disable html help, seems doxygen now disables the search option
+          when html help is enabled
+
+Thu Jun 23 13:46:08 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO version 2.0.3 released.
+
+Wed Jun 22 18:25:21 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/AnyTypeCode/Any_Basic_Impl.cpp:
+        * tao/AnyTypeCode/Any_Basic_Impl.h:
+        * tests/LongDouble/client.cpp:
+        * tests/IDL_Test/constants.idl:
+        * tests/IDL_Test/union.idl:
+        * TAO_IDL/include/ast_expression.h:
+        * TAO_IDL/be/be_helper.cpp:
+        * TAO_IDL/be/be_visitor_constant/constant_cs.cpp:
+        * TAO_IDL/be/be_visitor_constant/constant_ch.cpp:
+        * TAO_IDL/ast/ast_constant.cpp:
+        * TAO_IDL/ast/ast_expression.cpp:
+        * NEWS:
+
+          Reverted all changes related to support for long double
+          constants in IDL.
+
+Wed Jun 22 15:15:05 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * orbsvcs/orbsvcs/Naming/Naming_Server.cpp:
+
+          Ensure the naming service can use the CSD_TP strategy if necessary.
+          Since the naming service is single threaded, it can become a
+          bottleneck when there is very heavy use.
+
+          The need for this change may also indicate a problem with the
+          CSD strategy implementation. It appears that the thread pool at
+          least is only initialized when the POA Manager is activated. If
+          A POA is created with using a POA Manager already in the active
+          state, the TP is not initialized. Alternatively this might be a
+          problem with the POA creation, that create_POA can be supplied a
+          POA Manager that is already been activated, and the new POA is
+          itself instantly active.
+
+Wed Jun 22 14:49:09 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Security/BiDirectional/run_test.pl:
+        * orbsvcs/tests/Security/Big_Request/run_test.pl:
+          Added -clog and -slog to write a separate client and server log file
+          to disk
+
+Tue Jun 21 13:07:15 UTC 2011  Olli Savia  <ops@iki.fi>
+
+        * TAO_IDL/util/utl_err.cpp:
+          Fixed typo.
+
+Thu Jun 16 15:30:23 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/IDL_Test/constants.idl:
+
+          Guarded out the long double constant set to the double max
+          value, for MinGW, which outputs a floating point error
+          for this value.
+
+Thu Jun 16 14:00:53 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/LongDouble/client.cpp:
+
+          Replaced '==' with equivalent '<' and '>' expressions for
+          a long double, some platoforms warn that '==' shouldn't
+          be used with floating point types.
+
+Thu Jun 16 07:56:54 UTC 2011  Simon Massey  <sma at prismtech dot com>
+
+        * orbsvcs/tests/Security/Big_Request/cacert.pem:
+        * orbsvcs/tests/Security/Big_Request/client_cert.pem:
+        * orbsvcs/tests/Security/Big_Request/client_key.pem:
+        * orbsvcs/tests/Security/Big_Request/server_cert.pem:
+        * orbsvcs/tests/Security/Big_Request/server_key.pem:
+
+          Updated certificates - Missed one.
+
+Wed Jun 15 14:36:54 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * orbsvcs/tests/Security/Bug_1107_Regression/cacert.pem:
+        * orbsvcs/tests/Security/Bug_1107_Regression/client_cert.pem:
+        * orbsvcs/tests/Security/Bug_1107_Regression/client_key.pem:
+        * orbsvcs/tests/Security/Bug_1107_Regression/server_cert.pem:
+        * orbsvcs/tests/Security/Bug_1107_Regression/server_key.pem:
+        * orbsvcs/tests/Security/Callback/cacert.pem:
+        * orbsvcs/tests/Security/Callback/client_cert.pem:
+        * orbsvcs/tests/Security/Callback/client_key.pem:
+        * orbsvcs/tests/Security/Callback/server_cert.pem:
+        * orbsvcs/tests/Security/Callback/server_key.pem:
+        * orbsvcs/tests/Security/Crash_Test/cacert.pem:
+        * orbsvcs/tests/Security/Crash_Test/client_cert.pem:
+        * orbsvcs/tests/Security/Crash_Test/client_key.pem:
+        * orbsvcs/tests/Security/Crash_Test/server_cert.pem:
+        * orbsvcs/tests/Security/Crash_Test/server_key.pem:
+        * orbsvcs/tests/Security/Null_Cipher/cacert.pem:
+        * orbsvcs/tests/Security/Null_Cipher/client_cert.pem:
+        * orbsvcs/tests/Security/Null_Cipher/client_key.pem:
+        * orbsvcs/tests/Security/Null_Cipher/server_cert.pem:
+        * orbsvcs/tests/Security/Null_Cipher/server_key.pem:
+        * orbsvcs/tests/Security/Secure_Invocation/cacert.pem:
+        * orbsvcs/tests/Security/Secure_Invocation/client_cert.pem:
+        * orbsvcs/tests/Security/Secure_Invocation/client_key.pem:
+        * orbsvcs/tests/Security/Secure_Invocation/server_cert.pem:
+        * orbsvcs/tests/Security/Secure_Invocation/server_key.pem:
+        * orbsvcs/tests/Security/mixed_security_test/cacert.pem:
+        * orbsvcs/tests/Security/mixed_security_test/client_cert.pem:
+        * orbsvcs/tests/Security/mixed_security_test/client_key.pem:
+        * orbsvcs/tests/Security/mixed_security_test/server_cert.pem:
+        * orbsvcs/tests/Security/mixed_security_test/server_key.pem:
+
+          Updated certificates.
+
+        * orbsvcs/tests/Security/cert:
+        * orbsvcs/tests/Security/cert/DOCCA:
+        * orbsvcs/tests/Security/cert/DOCCA/cacert.pem:
+        * orbsvcs/tests/Security/cert/DOCCA/certs:
+        * orbsvcs/tests/Security/cert/DOCCA/index.txt:
+        * orbsvcs/tests/Security/cert/DOCCA/index.txt.attr:
+        * orbsvcs/tests/Security/cert/DOCCA/index.txt.attr.old:
+        * orbsvcs/tests/Security/cert/DOCCA/index.txt.old:
+        * orbsvcs/tests/Security/cert/DOCCA/newcerts:
+        * orbsvcs/tests/Security/cert/DOCCA/newcerts/1000.pem:
+        * orbsvcs/tests/Security/cert/DOCCA/newcerts/1001.pem:
+        * orbsvcs/tests/Security/cert/DOCCA/private:
+        * orbsvcs/tests/Security/cert/DOCCA/private/cakey.pem:
+        * orbsvcs/tests/Security/cert/DOCCA/serial:
+        * orbsvcs/tests/Security/cert/DOCCA/serial.old:
+        * orbsvcs/tests/Security/cert/README:
+        * orbsvcs/tests/Security/cert/cacert.pem:
+        * orbsvcs/tests/Security/cert/client_cert.pem:
+        * orbsvcs/tests/Security/cert/client_key.pem:
+        * orbsvcs/tests/Security/cert/openssl.cnf:
+        * orbsvcs/tests/Security/cert/server_cert.pem:
+        * orbsvcs/tests/Security/cert/server_key.pem:
+
+          Added the full CA information used to sign the above certs.  These certs
+          are good for the next 20 years.
+
+        * orbsvcs/tests/Security/Secure_Invocation/client_key_nopasswd.pem:
+        * orbsvcs/tests/Security/Secure_Invocation/server_key_nopasswd.pem:
+        * orbsvcs/tests/Security/mixed_security_test/client_key_nopasswd.pem:
+        * orbsvcs/tests/Security/mixed_security_test/server_key_nopasswd.pem:
+
+          Removed these files.
+
+Wed Jun 15 08:54:50 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_operation/operation_ch.cpp:
+          Reverted 3971 change, broke some CCM tests
+
+Tue Jun 14 13:12:05 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_valuetype.cpp:
+        * TAO_IDL/be/be_valuetype.h:
+        * TAO_IDL/be/be_visitor_amh_pre_proc.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp:
+
+          Added code generation for AMH exception holder's default
+          constructor to initialize the CORBA::Exception* member
+          to 0. This fix closes [BUGID:3970].
+
+Tue Jun 14 12:18:00 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_operation/operation_ch.cpp:
+          Only the methods for operations in local interfaces need to be
+          virtual. This reduces footprint and improves performance, this
+          fixes bugzilla 3971
+
+Fri Jun 10 19:08:19 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_helper.cpp:
+
+          Used the recently added ACE_LONG_DOUBLE_FORMAT_SPECIFIER_ASCII
+          to generate long double literals portably.
+
+Fri Jun 10 12:41:00 UTC 2011  Simon Massey <sma at prismtech dot com>
+
+        * tests/MT_NoUpcall_Client_Leader/run_test.pl:
+
+          This test wasn't capable of exiting with an error, it was
+          always successful even if the test failed.
+
+        * tests/MT_NoUpcall_Client_Leader/client.cpp:
+        * tests/MT_NoUpcall_Client_Leader/server.cpp:
+
+          The mutex needed to be locked prior to worker thread creation
+          and the stop_condition.wait condition, then released after,
+          otherwise worker threads can signal prior to the server/client
+          being ready to deal with the event. Client needed to
+          pause before the issuing the shutdown request to the server
+          so as to allow it to finish its own worker thread.
+
+        * tests/MT_NoUpcall_Client_Leader/police.cpp:
+
+          The stat test in the loop was occationally detecting the creation
+          of the ior file before the contents had been written. Moving
+          the sleep after the stat and before the test allows the contents to
+          be output before allowing the client/server to use the ior it
+          has just detected.
+
+        * tests/MT_NoUpcall_Client_Leader/chatter.cpp:
+        * tests/MT_NoUpcall_Client_Leader/chatter.h:
+
+          Need to mutex control access to the two nrequests_ and nreplies_
+          counts, as the client has two concurrent worker threads competing
+          to update them, these counts also need to be volitile.
+
+Thu Jun  9 19:38:48 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_helper.cpp:
+
+          Changed print format of long double literal to be conditional,
+          based on the existence of a native 16-byte long double, in
+          order to eliminate warnings of rhs and lhs type mismatch.
+
+Thu Jun  9 17:28:25 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_constant/constant_ch.cpp:
+        * TAO_IDL/be/be_visitor_constant/constant_cs.cpp:
+
+          Changed generated code to always use a constructor with an
+          ACE_CDR::LongDoubleAssign argument for long double constants.
+
+Thu Jun  9 07:05:59 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp:
+        * orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp:
+          Fixed gcc 4.6 warnings
+
+Thu Jun  9 01:09:40 UTC 2011  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp (TAO_Notify_ThreadPool_Task::execute):
+          Fixed a memory leak that occurred when the enqueue() failed.
+          Thanks to Jochen Meier <gesammeltimusenet2009 at arcor dot de> for
+          reporting this and suggesting a fix.
+
+Mon Jun  6 19:53:54 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/AnyTypeCode/Any_Basic_Impl.cpp:
+        * tao/AnyTypeCode/Any_Basic_Impl.h:
+
+          Restored the long double member back to the member union of
+          Any_Basic_Impl. A change suggested by Adam Mitz <mitza at
+          ociweb dot com> enabled the use of the LongDouble emulator
+          struct without constructors or assignment operators.
+
+        * TAO_IDL/be/be_visitor_constant/constant_ch.cpp:
+        * TAO_IDL/be/be_visitor_constant/constant_cs.cpp:
+
+          Changed code generation for long double constant initialization,
+          when 16-byte native long double does not exist, to use the
+          new LongDoubleAssign struct in ACE_CDR.
+
+        * tests/IDL_Test/union.idl:
+
+          Added a test case of a union containing a long double, to
+          test that the generated union doesn't contain a member
+          with a constructor.
+
+Mon Jun  6 18:59:41 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_helper.cpp:
+
+          Restored minimum significant digit suggestions for the format
+          string for double, and added them to the format string for
+          long double.
+
+Mon Jun  6 17:28:05 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/AnyTypeCode/Any_Basic_Impl.cpp:
+        * tao/AnyTypeCode/Any_Basic_Impl.h:
+
+          Added a separate member for long doubles, rather than have
+          support for long doubles on all platforms disabled because
+          the struct that is now used for some long double representations
+          has a constructor.
+
+        * tests/DynAny_Test/test_dynany.cpp:
+
+          Reverted the change in
+
+          Fri Jun  3 18:54:59 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+          since that part of the test will work again.
+
+Mon Jun  6 15:06:42 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+        * TAO_IDL/be_include/be_global.h:
+        * TAO_IDL/fe/lex.yy.cpp:
+        * TAO_IDL/include/idl_global.h:
+        * TAO_IDL/util/utl_global.cpp:
+          Extended DDS support
+
+Fri Jun  3 18:54:59 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/AnyTypeCode/Any_Basic_Impl.cpp:
+        * tao/AnyTypeCode/Any_Basic_Impl.h:
+
+          On platforms where native long doubles aren't 16 bytes,
+          eliminated case where an Any contains a CORBA::LongDouble.
+          The class contains a C++ union, which can't contain a
+          non-native LongDouble ( a struct) since it now has a constructor.
+          A fair tradeoff since in return for the recent changes to
+          ACE_CDR::LongDouble, we now have support for IDL constants
+          of type CORBA::LongDouble on all platforms.
+
+        * tests/DynAny_Test/test_dynany.cpp:
+
+          Similarly to the above item, eliminated the test for long
+          double on platforms where a non-native struct alternative
+          is used.
+
+Thu Jun  2 12:24:59 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_helper.cpp:
+
+          - Fixed print format for long double, eliminated warnings.
+          - Added '#' flag to all floating point print formats, forces
+            printing of decimal point even if not present in IDL.
+
+Wed Jun  1 19:39:08 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/include/AST_Expression.h:
+        * TAO_IDL/ast/AST_Expression.cpp
+        * TAO_IDL/ast/AST_Constant.cpp
+        * TAO_IDL/be/be_helper.cpp:
+        * TAO_IDL/be/be_visitor_constant/constant_ch.cpp:
+        * TAO_IDL/be/be_visitor_constant/constant_cs.cpp:
+
+          Added support for long double constants in IDL.
+
+        * tests/IDL_Test/constants.idl:
+
+          Added test cases for long double constants.
+
+        * NEWS:
+
+          Added item about long double constant support.
+
+Wed Jun  1 09:46:54 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp:
+        * orbsvcs/tests/Log/Basic_Log_Test/client.cpp:
+        * tests/ORB_Local_Config/Two_DLL_ORB/client.cpp:
+        * tests/ORB_Local_Config/Two_DLL_ORB/server.cpp:
+          Fixed Coverity warnings regarding uncaught exceptions.
+
+Tue May 31 05:47:19 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * tests/Sequence_Unit_Tests/string_sequence_tester.hpp:
+          Fixed gcc 4.6 warnings: variable was set but not used.
+
+Mon May 30 10:21:08 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * examples/Logging/Logger_i.cpp:
+          Resolved gcc 4.6 warning: variable may be used uninitialized
+          in this function
+
+Mon May 30 10:00:33 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * orbsvcs/LoadBalancer/LoadMonitor.cpp:
+          Fixed compiler error on Windows.
+
+Mon May 30 06:39:12 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * tests/Sequence_Unit_Tests/string_sequence_tester.hpp:
+        * tests/Smart_Proxies/Benchmark/client.cpp:
+          Resolved gcc 4.6 warnings: variable was set but not used.
+
+Fri May 27 14:35:57 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * tests/Bug_2936_Regression/bug2936.cpp:
+        * tests/Bug_3926_Regression/Client_Request_Interceptor.cpp:
+        * tests/Exposed_Policies/RT_Properties.cpp:
+        * tests/IOR_Endpoint_Hostnames/list_interfaces.cpp:
+          Resolved gcc 4.6 warnings: variable was set but not used.
+
+        * tests/POA/Bug_2511_Regression/server.cpp:
+          Resolved gcc 4.6 warnings: variable was set but not used.
+          Code alignment.
+
+Fri May 27 14:13:08 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * performance-tests/POA/Demux/demux_test_server.cpp:
+        * tests/Bug_2677_Regression/DllORB.cpp:
+        * tests/Bug_2683_Regression/server.cpp:
+          Resolved gcc 4.6 warnings: variable was set but not used.
+
+Fri May 27 13:52:37 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_union/union_ch.cpp:
+          Removed generation of holder_ member of an union, it is not used
+          at all
+
+Fri May 27 10:09:25 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * orbsvcs/examples/ImR/Advanced/TestClient.cpp:
+        * orbsvcs/tests/IOR_MCast/client.cpp:
+        * orbsvcs/tests/Security/Bug_1107_Regression/client.cpp:
+          Statisfy Coverity and the GNU 4.6 gcc compiler. Using a
+          returned value either by using ACE_UNUSED_ARG or to print
+          in a log message.
+
+        * tests/Sequence_Unit_Tests/value_sequence_tester.hpp:
+          Fuzz.
+
+Fri May 27 09:14:29 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * orbsvcs/LoadBalancer/LoadMonitor.cpp:
+        * orbsvcs/examples/ImR/Advanced/TestClient.cpp:
+        * orbsvcs/tests/Bug_3486_Regression/server.cpp:
+        * orbsvcs/tests/IOR_MCast/client.cpp:
+        * orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp:
+        * orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp:
+        * orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp:
+        * orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp:
+        * orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp:
+        * orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp:
+        * orbsvcs/tests/Security/Bug_1107_Regression/client.cpp:
+          Resolved gcc 4.6 warnings: variable was set but not used.
+
+Thu May 26 15:25:36 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * TAO_IDL/fe/fe_utils.cpp:
+          tmp variable wasn't necessary. Removed it.
+
+Thu May 26 14:13:05 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp:
+        * TAO_IDL/fe/fe_utils.cpp:
+        * tao/Strategies/COIOP_Acceptor.cpp:
+          Resolved gcc 4.6 warnings: variable was set but not used.
+
+Thu May 26 13:48:29 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp:
+        * tests/Sequence_Unit_Tests/Bounded_String.cpp:
+        * tests/Sequence_Unit_Tests/Unbounded_Octet.cpp:
+        * tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp:
+        * tests/Sequence_Unit_Tests/Unbounded_String.cpp:
+          Catch uncaught exceptions in main.
+
+Thu May 26 13:11:19 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * tao/Generic_Sequence_T.h:
+          Added file name to doxygen documentation
+
+        * tests/Sequence_Unit_Tests/value_sequence_tester.hpp:
+          Resolved Coverity warning: catching a uncaught BAD_PARAM exception.
+
+Fri May 20 22:07:56 UTC 2011  Adam Mitz  <mitza@ociweb.com>
+
+        * tao/AnyTypeCode/TAO_AnyTypeCode.rc:
+        * tao/Codeset/TAO_Codeset.rc:
+        * tao/PI/TAO_PI.rc:
+        * tao/PI_Server/TAO_PI_Server.rc:
+        * tao/Utils/TAO_Utils.rc:
+        * tao/ZIOP/TAO_ZIOP.rc:
+
+          Add resource files to get TAO version number on DLLs.
+
+Fri May 20 14:20:53 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Oneway_Timeouts/test.mpc:
+          Added explicit idl project to get correct build order on VMS
+
+Thu May 19 14:53:55 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+        * tests/QtTests/client.cpp:
+        * tests/QtTests/client.h:
+        * tests/QtTests/QtTests.mpc:
+        * tests/QtTests/server.cpp:
+        * tests/QtTests/test_i.h:
+        Adapted to qt4.
+
+Tue May 17 19:20:55 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/OBV/Indirection/MessengerServer.cpp:
+        * tests/Portable_Interceptors/Slot/driver.cpp:
+          Catch exceptions in main
+
+Tue May 17 11:32:18 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+        * TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp:
+          Layout changes to the generated code
+
+Fri May 13 08:04:48 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * tao/Bounded_Basic_String_Sequence_T.h:
+        * tao/Bounded_Object_Reference_Sequence_T.h:
+        * tao/Bounded_Value_Sequence_T.h:
+        * tao/Unbounded_Basic_String_Sequence_T.h:
+        * tao/Unbounded_Object_Reference_Sequence_T.h:
+          Doxygen changes.
+
+Wed May 11 18:43:15 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ObjectKey_Table.h:
+        * tao/orbconf.h:
+        * tao/params.h:
+          Doxygen changes
+
+Wed May 11 13:35:28 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+
+        * tao/QtResource/QtResource_Loader.h:
+        Changed for QT4 deprecated include QT/..
+
+Tue May 10 18:15:28 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ImR_Client/ImR_Client.cpp:
+          changed variable name to not match method argument
+
+        * utils/catior/catior.cpp:
+        * utils/nslist/nsadd.cpp:
+        * utils/nslist/nsdel.cpp:
+        * utils/nslist/nslist.cpp:
+          Fixed coverity errors, not leak exceptions
+
+Tue May 10 06:15:43 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * tao/IORManipulation/IORManip_IIOP_Filter.cpp:
+          Fixed compile error.
+
+Mon May  9 19:10:54 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_interface.cpp:
+        * tao/CSD_ThreadPool/CSD_TP_Task.cpp:
+        * tao/IORManipulation/IORManip_IIOP_Filter.cpp:
+          Fixed coverity errors
+
+Wed Apr 27 13:35:10 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO.mwc:
+          Exclude DAnCE, thanks to Remko Duppen <remko dot duppen at syntel dot nl>
+          for reporting this
+
+Tue Apr 26 13:12:03 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp:
+          Layout changes generated code
+
+Tue Apr 26 13:04:11 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Collocation_Resolver.h:
+        * tao/Connect_Strategy.h:
+        * tao/Endpoint_Selector_Factory.h:
+        * tao/GIOP_Message_Base.h:
+        * tao/GIOP_Message_Generator_Parser.h:
+        * tao/GIOP_Message_Generator_Parser_10.h:
+        * tao/GIOP_Message_Generator_Parser_11.h:
+        * tao/GIOP_Message_Generator_Parser_Impl.h:
+        * tao/GIOP_Message_State.h:
+        * tao/GIOP_Utils.h:
+        * tao/GUIResource_Factory.h:
+        * tao/LF_Connect_Strategy.h:
+        * tao/LF_Follower.cpp:
+          Doxygen changes
+
+Tue Apr 26 12:50:24 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ORB_Core.cpp:
+        * tao/Thread_Lane_Resources.h:
+        * tao/Thread_Lane_Resources_Manager.h:
+        * tao/Thread_Per_Connection_Handler.h:
+        * tao/Transport.h:
+        * tao/Transport_Connector.h:
+        * tao/TypeCodeFactory_Adapter.h:
+          Doxygen changes
+
+Tue Apr 26 12:21:05 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Acceptor_Impl.h:
+        * tao/Acceptor_Impl.cpp:
+        * tao/Acceptor_Registry.h:
+        * tao/Adapter_Registry.h:
+        * tao/Bind_Dispatcher_Guard.h:
+        * tao/Blocked_Connect_Strategy.h:
+        * tao/Blocked_Connect_Strategy.cpp:
+        * tao/Cleanup_Func_Registry.h:
+        * tao/Collocated_Invocation.cpp:
+        * tao/LF_Event_Loop_Thread_Helper.inl:
+        * tao/LF_Follower_Auto_Adder.inl:
+        * tao/Leader_Follower.cpp:
+        * tao/Queued_Message.h:
+        * tao/Transport_Cache_Manager_T.cpp:
+        * tao/Wait_On_LF_No_Upcall.h:
+        * tao/Wait_On_LF_No_Upcall.cpp:
+        * tao/Wait_On_Reactor.h:
+        * tao/Wait_On_Read.h:
+          Doxygen changes
+
+Tue Apr 26 11:57:42 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Leader_Follower.h:
+        * tao/Leader_Follower.inl:
+        * tao/Wait_On_LF_No_Upcall.h:
+        * tao/Wait_On_Leader_Follower.h:
+        * tao/Wait_On_Reactor.h:
+        * tao/Wait_On_Read.h:
+        * tao/Wait_Strategy.h:
+          Use explicit for single argument constructors, doxygen improvements
+
+Tue Apr 26 11:13:59 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/MT_NoUpcall_Client_Leader/client.cpp:
+        * tests/MT_NoUpcall_Client_Leader/run_test.pl:
+        * tests/MT_NoUpcall_Client_Leader/server.cpp:
+          Make it possible to pass number of threads through the commandline
+
+Tue Apr 26 09:42:36 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Leader_Follower.h:
+        * tao/Leader_Follower.inl:
+          Use bool instead of int for several methods
+
+        * tao/Thread_Lane_Resources.cpp:
+          Simplied some code
+
+Tue Apr 26 09:26:48 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_orb_tests.lst:
+          MT_NoUpcall_Client_Leader shouldn't run when there is no messaging
+
+Tue Apr 26 09:00:31 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_orb_tests.lst:
+          Disabled some tests with CORBA/e micro
+
+        * tao/Connection_Handler.cpp:
+        * tao/Resume_Handle_Deferred.h:
+        * tao/Resume_Handle_Deferred.cpp:
+          Use reference counting for deletion, also log an error and return -1
+          when schedule_timer fails, we have a critical error at that moment
+
+        * tao/Policy_Validator.cpp:
+        * tao/TAO_Singleton.cpp:
+        * tao/Leader_Follower.cpp:
+          Use %@ for logging pointers
+
+Fri Apr 22 12:41:53 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * orbsvcs/tests/Bug_3418_Regression/b.conf:
+        * orbsvcs/tests/HTIOP/HT_Config.conf:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/windows.conf:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/non-windows.conf:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/windows.conf:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/non-windows.conf:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/windows.conf:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/windows.conf:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/windows.conf:
+        * orbsvcs/tests/Notify/Lanes/consumer.conf:
+        * orbsvcs/tests/Notify/Lanes/notify.conf:
+        * performance-tests/Protocols/lksctp_params.conf:
+        * performance-tests/Protocols/sctp_params.conf:
+        * performance-tests/RTCorba/Thread_Pool/native-svc.conf:
+        * tests/Bug_3068_Regression/server.conf:
+        * tests/ORB_Local_Config/Bug_1459/m.conf:
+        * tests/ORB_Local_Config/Two_DLL_ORB/secondary-empty.conf:
+        * tests/RTCORBA/Explicit_Binding/svc.conf:
+          Fuzz: added $Id string
+
+Fri Apr 22 12:14:18 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Connection_Handler.cpp:
+        * tao/Resume_Handle_Deferred.h:
+        * tao/Resume_Handle_Deferred.cpp:
+          Notify a specific event handler
+
+        * tao/Resume_Handle_Deferred.inl:
+          Removed this file, virtual methods may not be inline
+
+Fri Apr 22 11:56:20 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Resume_Handle_Deferred.h:
+        * tao/Resume_Handle_Deferred.inl:
+        * tao/Resume_Handle_Deferred.cpp:
+          We should only trigger the reactor
+
+        * tao/Transport.cpp:
+          Doxygen changes
+
+Fri Apr 22 07:28:43 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+        * DevGuideExamples/Multithreading/Reactive/svc.conf:
+        * DevGuideExamples/Multithreading/ThreadPerConnection/server.conf:
+        * DevGuideExamples/RTCORBA/svc.conf:
+        * docs/tutorials/Quoter/Event_Service/ec.conf:
+        * examples/PluggableUDP/tests/Performance/svc.conf:
+        * examples/PluggableUDP/tests/SimplePerformance/svc.conf:
+        * examples/RTCORBA/Activity/client.conf:
+        * examples/RTCORBA/Activity/server.conf:
+        * examples/RTCORBA/Activity/svc.conf.client:
+        * examples/RTCORBA/Activity/svc.conf.server:
+        * examples/RTScheduling/Fixed_Priority_Scheduler/svc.conf.client:
+        * examples/RTScheduling/Fixed_Priority_Scheduler/svc.conf.server:
+        * examples/RTScheduling/MIF_Scheduler/svc.conf.client:
+        * examples/RTScheduling/MIF_Scheduler/svc.conf.server:
+        * orbsvcs/Concurrency_Service/svc.conf:
+        * orbsvcs/DevGuideExamples/EventServices/RTEC_Federated/supplier.conf:
+        * orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/ec.conf:
+        * orbsvcs/DevGuideExamples/EventServices/RTEC_MCast_Federated/supplier.conf:
+        * orbsvcs/DevGuideExamples/NotifyService/RTNotify/notify.conf:
+        * orbsvcs/DevGuideExamples/NotifyService/RTNotify/nsclient.conf:
+        * orbsvcs/DevGuideExamples/ValueTypes/Notify/notify.conf:
+        * orbsvcs/Event_Service/svc.conf:
+        * orbsvcs/Logging_Service/Notify_Logging_Service/svc.conf:
+        * orbsvcs/TAO_Service/svc.conf:
+        * orbsvcs/examples/ImR/Combined_Service/dynserver.conf:
+        * orbsvcs/examples/ImR/Combined_Service/start_all.conf:
+        * orbsvcs/examples/Notify/Lanes/client.conf:
+        * orbsvcs/examples/Notify/Lanes/notify.conf:
+        * orbsvcs/examples/Notify/ThreadPool/client.conf:
+        * orbsvcs/examples/Notify/ThreadPool/notify.conf:
+        * orbsvcs/examples/RtEC/IIOPGateway/ec.conf:
+        * orbsvcs/examples/RtEC/IIOPGateway/gateway.conf:
+        * orbsvcs/examples/RtEC/Kokyu/svc.conf:
+        * orbsvcs/examples/RtEC/MCast/svc.conf:
+        * orbsvcs/examples/RtEC/Schedule/svc.conf:
+        * orbsvcs/examples/RtEC/Simple/ec.conf:
+        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_reactive.conf:
+        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_rtcorba.conf:
+        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.dispatching_threaded.conf:
+        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_null.conf:
+        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.filter_per_supplier.conf:
+        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_read.conf:
+        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_copy_on_write.conf:
+        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_delayed.conf:
+        * orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/ec.locking_immediate.conf:
+        * orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/roundtrip.conf:
+        * orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/realtime.conf:
+        * orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/realtime.conf:
+        * orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_reactive.conf:
+        * orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_rtcorba.conf:
+        * orbsvcs/performance-tests/RTEvent/Roundtrip/ec.dispatching_threaded.conf:
+        * orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_read.conf:
+        * orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_copy_on_write.conf:
+        * orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_delayed.conf:
+        * orbsvcs/performance-tests/RTEvent/Roundtrip/ec.locking_immediate.conf:
+        * orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_null.conf:
+        * orbsvcs/performance-tests/RTEvent/Roundtrip/ec.supplier_filter_per_supplier.conf:
+        * orbsvcs/performance-tests/RTEvent/Roundtrip/roundtrip.conf:
+        * orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf:
+        * orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/svc.conf:
+        * orbsvcs/tests/Bug_2316_Regression/svc.conf:
+        * orbsvcs/tests/Bug_2377_Regression/svc.conf:
+        * orbsvcs/tests/Bug_2925_Regression/svc.conf:
+        * orbsvcs/tests/Bug_3387_Regression/NotSvc.conf:
+        * orbsvcs/tests/Bug_3418_Regression/m.conf:
+        * orbsvcs/tests/Bug_3444_Regression/diop_svc.conf:
+        * orbsvcs/tests/Bug_3444_Regression/miop_svc.conf:
+        * orbsvcs/tests/CosEvent/Basic/svc.pull.conf:
+        * orbsvcs/tests/CosEvent/Timeout/cosevent.conf:
+        * orbsvcs/tests/EC_MT_Mcast/svc.conf:
+        * orbsvcs/tests/EC_Mcast/svc.conf:
+        * orbsvcs/tests/EC_Throughput/ec.conf:
+        * orbsvcs/tests/Event/Basic/control.conf:
+        * orbsvcs/tests/Event/Basic/mt.svc.conf:
+        * orbsvcs/tests/Event/Basic/observer.conf:
+        * orbsvcs/tests/Event/Basic/svc.complex.conf:
+        * orbsvcs/tests/Event/Basic/svc.conf:
+        * orbsvcs/tests/Event/Mcast/Complex/consumer-ec.conf:
+        * orbsvcs/tests/Event/Mcast/Complex/supplier-ec.conf:
+        * orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/supplier.conf:
+        * orbsvcs/tests/Event/Mcast/Two_Way/gateway.conf:
+        * orbsvcs/tests/Event/Performance/ec.list.conf:
+        * orbsvcs/tests/Event/Performance/ec.mt.conf:
+        * orbsvcs/tests/Event/Performance/ec.rb_tree.conf:
+        * orbsvcs/tests/Event/Performance/ec.st.conf:
+        * orbsvcs/tests/Event/Performance/latency.conf:
+        * orbsvcs/tests/Event/UDP/svc.conf:
+        * orbsvcs/tests/HTIOP/AMI/exclusive.conf:
+        * orbsvcs/tests/HTIOP/AMI/muxed.conf:
+        * orbsvcs/tests/ImplRepo/scale/client.conf:
+        * orbsvcs/tests/InterfaceRepo/Persistence_Test/svc.conf:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/svc.conf:
+        * orbsvcs/tests/Miop/McastHello/svc.conf:
+        * orbsvcs/tests/Notify/Basic/notify.mt.conf:
+        * orbsvcs/tests/Notify/Basic/notify.reactive.conf:
+        * orbsvcs/tests/Notify/Basic/notify.rt.conf:
+        * orbsvcs/tests/Notify/Blocking/notify.conf:
+        * orbsvcs/tests/Notify/Bug_1385_Regression/notify.conf:
+        * orbsvcs/tests/Notify/Bug_1884_Regression/ecf.conf:
+        * orbsvcs/tests/Notify/Lanes/consumer.conf:
+        * orbsvcs/tests/Notify/Persistent_Filter/NS.conf:
+        * orbsvcs/tests/Notify/PluggableTopology/plugtop_ns.conf:
+        * orbsvcs/tests/Notify/Reconnecting/event.conf:
+        * orbsvcs/tests/Notify/Reconnecting/ns_mt.conf:
+        * orbsvcs/tests/Notify/Reconnecting/ns_mt_both.conf:
+        * orbsvcs/tests/Notify/Reconnecting/ns_mt_topo.conf:
+        * orbsvcs/tests/Notify/Reconnecting/ns_st.conf:
+        * orbsvcs/tests/Notify/Reconnecting/ns_st_both.conf:
+        * orbsvcs/tests/Notify/Reconnecting/ns_st_topo.conf:
+        * orbsvcs/tests/Notify/ThreadPool/consumer.conf:
+        * orbsvcs/tests/Notify/ThreadPool/notify.conf:
+        * orbsvcs/tests/Notify/ThreadPool/supplier.conf:
+        * orbsvcs/tests/Notify/Validate_Client/notify.conf:
+        * orbsvcs/tests/Notify/XML_Persistence/svc.conf:
+        * orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf:
+        * orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf:
+        * orbsvcs/tests/Notify/performance-tests/RedGreen/svc.conf:
+        * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/cos_notify.conf:
+        * orbsvcs/tests/Notify/performance-tests/scripts/1_Path_Period_0_Lanes/rt_notify.conf:
+        * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/cos_notify.conf:
+        * orbsvcs/tests/Notify/performance-tests/scripts/3_Path_Period_10ms_Lanes/rt_notify.conf:
+        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify/notify.conf:
+        * orbsvcs/tests/Notify/performance-tests/scripts/Max_Throughput/Notify_RTCORBA/notify.conf:
+        * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/cos_notify.conf:
+        * orbsvcs/tests/Notify/performance-tests/scripts/Paths_vs_Throughput/rt_notify.conf:
+        * orbsvcs/tests/Security/BiDirectional/client.conf:
+        * orbsvcs/tests/Security/BiDirectional/server.conf:
+        * orbsvcs/tests/Security/Bug_2908_Regression/client.conf:
+        * orbsvcs/tests/Security/Bug_2908_Regression/server.conf:
+        * orbsvcs/tests/Security/EndpointPolicy/svc.conf:
+        * orbsvcs/tests/Security/InsecureReferences/client.conf:
+        * orbsvcs/tests/Security/MT_IIOP_SSL/client.conf:
+        * orbsvcs/tests/Security/MT_IIOP_SSL/server.conf:
+        * orbsvcs/tests/Security/MT_SSLIOP/client.conf:
+        * orbsvcs/tests/Security/MT_SSLIOP/server.conf:
+        * orbsvcs/tests/Security/ssliop_CSD/csd.conf:
+        * orbsvcs/tests/Security/ssliop_corbaloc/client.conf:
+        * orbsvcs/tests/Security/ssliop_corbaloc/server.conf:
+        * orbsvcs/tests/unit/Notify/MC/MonitorManager/svc.conf:
+        * performance-tests/Protocols/altq.conf:
+        * performance-tests/Protocols/svc.conf:
+        * performance-tests/RTCorba/Thread_Pool/svc.conf:
+        * tests/AMI/muxed.conf:
+        * tests/AMI_Timeouts/svc.conf:
+        * tests/Bug_2186_Regression/server.conf:
+        * tests/Bug_2935_Regression/middle.conf:
+        * tests/Bug_3000_Regression/rw.conf:
+        * tests/Bug_3068_Regression/client.conf:
+        * tests/Bug_3163_Regression/server.conf:
+        * tests/Bug_3251_Regression/Bug_3251.conf:
+        * tests/Bug_3598a_Regression/svc.conf:
+        * tests/Bug_3630_Regression/TAO Conf File.conf:
+        * tests/Bug_3630_Regression/TAO_Conf_File.conf:
+        * tests/Bug_3683_Regression/svc.conf:
+        * tests/Bug_3801_Regression/exclusive.conf:
+        * tests/Bug_3801_Regression/muxed.conf:
+        * tests/Bug_3837_Regression/logger.conf:
+        * tests/CSD_Strategy_Tests/TP_Test_Dynamic/svc.conf:
+        * tests/CSD_Strategy_Tests/TP_Test_Static/svc.conf:
+        * tests/CodeSets/simple/cs_test.conf:
+        * tests/CodeSets/simple/svc.conf:
+        * tests/CodeSets/simple/wcs_test.conf:
+        * tests/Collocation_Opportunities/svc.conf:
+        * tests/Exposed_Policies/svc.conf:
+        * tests/Leader_Followers/select_mt.conf:
+        * tests/Leader_Followers/tp.conf:
+        * tests/ORB_Local_Config/Bug_1459/a.conf:
+        * tests/ORB_Local_Config/Bug_1459/b.conf:
+        * tests/ORB_Local_Config/Bug_1459/d.conf:
+        * tests/ORB_Local_Config/Bug_1459/m1.conf:
+        * tests/ORB_Local_Config/Bug_3049/a.conf:
+        * tests/ORB_Local_Config/Service_Dependency/Service_Config_Test.conf:
+        * tests/ORB_Local_Config/Two_DLL_ORB/primary-csd.conf:
+        * tests/ORB_Local_Config/Two_DLL_ORB/primary-ssl.conf:
+        * tests/ORB_Local_Config/Two_DLL_ORB/secondary-csd.conf:
+        * tests/ORB_Local_Config/Two_DLL_ORB/secondary-ssl.conf:
+        * tests/Oneway_Send_Timeouts/block_flush.conf:
+        * tests/Oneway_Send_Timeouts/lf_flush.conf:
+        * tests/Oneway_Send_Timeouts/reactive_flush.conf:
+        * tests/Optimized_Connection/oc_svc.conf:
+        * tests/POA/EndpointPolicy/multi_prot.conf:
+        * tests/POA/Explicit_Activation/alternate.conf:
+        * tests/Parallel_Connect_Strategy/blocked.conf:
+        * tests/Parallel_Connect_Strategy/reactive.conf:
+        * tests/RTCORBA/Banded_Connections/svc.conf:
+        * tests/RTCORBA/Bug_3382_Regression/svc.conf:
+        * tests/RTCORBA/Bug_3643_Regression/svc.conf.dynamic:
+        * tests/RTCORBA/Client_Propagated/svc.conf:
+        * tests/RTCORBA/Client_Protocol/svc.conf:
+        * tests/RTCORBA/Collocation/continuous.conf:
+        * tests/RTCORBA/Collocation/svc.conf:
+        * tests/RTCORBA/Destroy_Thread_Pool/continuous.conf:
+        * tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf:
+        * tests/RTCORBA/Dynamic_Thread_Pool/svc.conf:
+        * tests/RTCORBA/Linear_Priority/svc.conf:
+        * tests/RTCORBA/MT_Client_Protocol_Priority/svc.conf:
+        * tests/RTCORBA/Persistent_IOR/continuous.conf:
+        * tests/RTCORBA/Policy_Combinations/svc.conf:
+        * tests/RTCORBA/Priority_Inversion_With_Bands/continuous.conf:
+        * tests/RTCORBA/Priority_Inversion_With_Bands/svc.conf:
+        * tests/RTCORBA/Profile_And_Endpoint_Selection/svc.conf:
+        * tests/RTCORBA/Server_Declared/continuous.conf:
+        * tests/RTCORBA/Server_Declared/svc.conf:
+        * tests/RTCORBA/Server_Protocol/server_iiop.conf:
+        * tests/RTCORBA/Server_Protocol/server_iiop_shmiop.conf:
+        * tests/RTCORBA/Server_Protocol/server_iiop_uiop.conf:
+        * tests/RTCORBA/Server_Protocol/server_reverse.conf:
+        * tests/RTCORBA/Server_Protocol/server_reverse_nt.conf:
+        * tests/RTCORBA/Server_Protocol/server_shmiop.conf:
+        * tests/RTCORBA/Server_Protocol/server_uiop.conf:
+        * tests/RTCORBA/Thread_Pool/continuous.conf:
+        * tests/RTCORBA/Thread_Pool/svc.conf:
+        * tests/TransportCurrent/Framework/client-static.conf:
+        * tests/TransportCurrent/Framework/client.conf:
+        * tests/TransportCurrent/Framework/server-static.conf:
+        * tests/TransportCurrent/Framework/server.conf:
+        * tests/TransportCurrent/IIOP/client_dynamic.conf:
+        * tests/TransportCurrent/IIOP/client_static.conf:
+        * tests/TransportCurrent/IIOP/server_dynamic.conf:
+        * tests/TransportCurrent/IIOP/server_static.conf:
+          Fuzz. Added lacking $Id string.
+
+Thu Apr 21 13:02:25 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_orb_tests.lst:
+          Updated test list
+
+        * tests/AMI/mt_noupcall.conf:
+        * tests/AMI/run_mt_noupcall.pl:
+        * tests/AMI/run_test.pl:
+          New run_mt_noupcall, the existing script was using -ORBCollocation no
+          which doesn't work with AMI and mt_noupcall
+
+        * tests/AMI/simple_client.cpp:
+          Layout change
+
+Thu Apr 21 12:07:41 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/tao_orb_tests.lst:
+          Run AMI test with more options
+
+        * tests/AMI/exclusive.conf:
+        * tests/AMI/server.conf:
+          Added Id tag
+
+        * tests/AMI/mt_noupcall.conf:
+          New file for testing with mt_noupcall
+
+        * tests/AMI/run_test.pl:
+          Add option -mt_noupcall and give client/server separate debug levels
+
+Thu Apr 21 11:17:36 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Wait_On_LF_No_Upcall.cpp:
+          Log transport id
+
+Thu Apr 21 10:31:58 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Connection_Handler.cpp:
+          Use the orb core reactor which is the LF reactor
+
+Wed Apr 20 08:59:58 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
+          Improved portability
+
+        * bin/tao_orb_tests.lst:
+          Added new test
+
+        * tao/Leader_Follower.h:
+          Layout change
+
+        * tao/Strategies/SHMIOP_Acceptor.cpp:
+        * tao/Wait_On_LF_No_Upcall.cpp:
+          Fixed coverity errors
+
+        * tests/Bug_3531b_Regression:
+        * tests/Bug_3531b_Regression/Bug_3531b_Regression.mpc:
+        * tests/Bug_3531b_Regression/run_test.pl:
+        * tests/Bug_3531b_Regression/server.cpp:
+          New test
+
+Wed Apr 20 09:52:52 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO version 2.0.2 released.
+
+Local Variables:
+mode: change-log
+add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time))
+indent-tabs-mode: nil
+End:
+ambiguous
diff --git a/TAO/MPC/config/taobaseidldefaults.mpb b/TAO/MPC/config/taobaseidldefaults.mpb
index 510dcce15a0..8f40f508f9a 100644
--- a/TAO/MPC/config/taobaseidldefaults.mpb
+++ b/TAO/MPC/config/taobaseidldefaults.mpb
@@ -20,7 +20,7 @@ project: build_files {
     libpath              = $(ACE_ROOT)/lib
     inputext             = .idl
     source_pre_extension = C
-    header_pre_extension = C, S
+    header_pre_extension = C
     source_outputext     = .cpp, .cxx, .cc, .C
     header_outputext     = .h, .hpp, .hxx, .hh
     keyword idlflags     = commandflags
@@ -30,9 +30,6 @@ project: build_files {
       commandflags(!-SS && !-Ssi || !-Sci || -GT && !-SS && !-oS) += .inl, .i
     }
     optional(inline_pre_extension) {
-      commandflags(!-SS && !-Ssi && !-oS) += S
-    }
-    optional(inline_pre_extension) {
       commandflags(!-Sci) += C
     }
 
@@ -46,6 +43,9 @@ project: build_files {
     optional(header_outputext) {
       commandflags(-SS && !-oS) += S
     }
+    optional(header_pre_extension) {
+      commandflags(!-oS) += S
+    }
 
     // Other
     optional(template_outputext) {
@@ -59,11 +59,11 @@ project: build_files {
     }
 
     optional(source_pre_extension) {
-      commandflags(-Gsv) += _svnt
+      commandflags(-Gsv) += _svnt, _svnt_T
     }
 
     optional(header_pre_extension) {
-      commandflags(-Gsv) += _svnt
+      commandflags(-Gsv) += _svnt, _svnt_T
     }
 
     optional(source_pre_extension) {
@@ -74,14 +74,6 @@ project: build_files {
       commandflags(-Gcn) += _conn
     }
 
-    optional(source_pre_extension) {
-      commandflags(-Gex) += _exec
-    }
-
-    optional(header_pre_extension) {
-      commandflags(-Gex) += _exec
-    }
-
     optional(generic_outputext) {
       commandflags(-Glem || -GM) += .idl
     }
diff --git a/TAO/MPC/modules/IDLHelper.pm b/TAO/MPC/modules/IDLHelper.pm
index 553d93207de..cc33ad2ddf9 100644
--- a/TAO/MPC/modules/IDLHelper.pm
+++ b/TAO/MPC/modules/IDLHelper.pm
@@ -10,6 +10,19 @@ sub get_output {
   my($self, $file, $flags) = @_;
   my @out;
 
+  # handle generated executor files (if any)
+  if ($flags =~ /-Gex/ && !($flags =~ /-oN/)) {
+    my $gendir = '';
+    if ($flags =~ /-oE\s*(\S+)/) {
+      $gendir = $1;
+      if (!($gendir =~ /(\\|\/)$/)) {
+        $gendir .= '/';
+      }
+    }
+    $file =~ /^(.*)(\.p?idl)$/;
+    push(@out, $gendir.$1."_exec.h");
+    push(@out, $gendir.$1."_exec.cpp");
+  }
   if ($flags =~ /-Gxhex/ && $flags =~ /-Wb,exec_export_include=(\S*)/) {
     push(@out, $1);
   }
diff --git a/TAO/NEWS b/TAO/NEWS
index b6058523c6b..7a390c52755 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -1,4 +1,7 @@
-USER VISIBLE CHANGES BETWEEN TAO-2.0.5 and TAO-2.1.0
+USER VISIBLE CHANGES BETWEEN TAO-2.0.6 and TAO-2.1.0
+====================================================
+
+USER VISIBLE CHANGES BETWEEN TAO-2.0.5 and TAO-2.0.6
 ====================================================
 
 . Added new define TAO_DEFAULT_COLLOCATION_STRATEGY (default = thru_poa)
@@ -8,6 +11,19 @@ USER VISIBLE CHANGES BETWEEN TAO-2.0.5 and TAO-2.1.0
   possible collocation, first direct if possible, then through_poa if possible
   else no collocation.
 
+. Enhanced the RW -ORBWaitStrategy and the EXCLUSIVE -ORBTransportMuxStrategy
+  to also work with AMI requests.
+
+. mt_noupcall has been improved and generically speaking the handling of client
+  leader threads in LF has been improved and fixed of potential deadlock
+  situations
+
+. The TAO skeletons got refactored to reduced footprint, a footprint saving
+  for the skeletons between 10 and 60% has been achieved. For the full
+  distribution including CIAO, DAnCE, OpenDDS, and DDS4CCM using RTI DDS this
+  resulted in a reduction of 650,000 lines of code. Also the S.inl files are
+  not generated anymore
+
 USER VISIBLE CHANGES BETWEEN TAO-2.0.4 and TAO-2.0.5
 ====================================================
 
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index 0e87ae48e5c..2f51c8f5bb0 100644
--- a/TAO/PROBLEM-REPORT-FORM
+++ b/TAO/PROBLEM-REPORT-FORM
@@ -40,8 +40,8 @@
 To: tao-bugs@list.isis.vanderbilt.edu
 Subject: [area]: [synopsis]
 
-    TAO VERSION: 2.0.5
-    ACE VERSION: 6.0.5
+    TAO VERSION: 2.0.6
+    ACE VERSION: 6.0.6
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html
index 256d8dc5b61..0dfd27c5502 100644
--- a/TAO/TAO-INSTALL.html
+++ b/TAO/TAO-INSTALL.html
@@ -103,9 +103,9 @@ bundle as a single piece instead of trying to mix and match things up.<P>
 
   <LI>Build and install the TAO release under <CODE>$TAO_ROOT</CODE>.
         <P> TAO also uses GNUmakefiles and project files generated
-        from MPC to compile. The beta or the release distribution will
-        come with stock GNUmakefiles, project files (for VC7.1 and VC
-        8) and Borland makefiles which were all generated by
+        from MPC to compile. The full distribution will
+        come with stock GNUmakefiles, project files (for VC9 and VC
+        10) awhich were all generated by
         MPC. </P>
 
         <P>The easiest and recommended way to compile the
@@ -193,11 +193,6 @@ GNU Make can be obtained from various places in source and binary
 form. Please see <a href="../ACE/ACE-INSTALL.html">ACE-INSTALL.html</a>
 for details from where they can be obtained.<P>
 
-<h2><strong><a name="makenotes">Explicit templates</a></strong></h2>
-
-It is not possible to use TAO with explicit templates. Your compiler
-must support implicit templates. <P>
-
 <HR><P>
 <h3>Using cross compilation</h3>
 
@@ -438,22 +433,6 @@ points are also relevant to users who are trying to use TAO with VC++
 files. If something is missing then it is probably a bug with
 MPC. Please report such bugs to the tao-users newsgroups.
 
-<H4>Borland C++ Builder</H4> <P>
-
-To build TAO using C++Builder please follow the
-<A HREF="../ACE/ACE-INSTALL.html#borland">ACE installation notes</A>, with the
-difference being that you first build ACE and then you
-give the following command in the $ACE_ROOT\TAO directory:<BR>
-<BLOCKQUOTE><CODE>
-make -f Makefile.bor
-</CODE></BLOCKQUOTE><P>
-
-For more detailed information on building and using TAO with Borland's
-C++ Builder environment, please see the <A
-HREF="http://www.tenermerx.com/programming/corba/tao_bcb/index.html">online</A> help
-provided by <A HREF="mailto:chris@kohlhoff.com">Christopher
-Kohlhoff</A>. <P>
-
 <H4>Upgrading From Older Releases</H4>
 
 <P>When a newer version of ACE/TAO is installed, rebuild all should be
@@ -497,17 +476,6 @@ The scripts may work on earlier versions of perl, but we cannot say for sure
 that they do.</P>
 
 <HR>
-<H3>Native Exceptions</H3>
-
-<P>TAO will use native exceptions if ACE_HAS_EXCEPTIONS is defined when it is
-compiled. This can be accomplished in two ways: by defining ACE_HAS_EXCEPTIONS
-in the config.h or config-*.h files (such as on Windows) or by using
-<CODE>make exceptions=1</CODE> when you compile TAO.</P>
-
-<P>Take note though, that this only enables support in ACE/TAO, the correct
-compiler flags must also be given to the compiler to enable them.</P>
-
-<HR>
 <P>
 
 <H3>Minimum CORBA</H3>
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index eca1e42fdeb..8604cf44788 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -43,12 +43,13 @@ TAO_CodeGen::TAO_CodeGen (void)
     server_template_header_ (0),
     server_skeletons_ (0),
     server_template_skeletons_ (0),
-    server_inline_ (0),
     anyop_header_ (0),
     anyop_source_ (0),
     gperf_input_stream_ (0),
     ciao_svnt_header_ (0),
     ciao_svnt_source_ (0),
+    ciao_svnt_template_header_ (0),
+    ciao_svnt_template_source_ (0),
     ciao_exec_header_ (0),
     ciao_exec_source_ (0),
     ciao_exec_idl_ (0),
@@ -495,7 +496,7 @@ TAO_CodeGen::start_server_header (const char *fname)
   // We must include all the skeleton headers corresponding to
   // IDL files included by the current IDL file.
   // We will use the included IDL file names as they appeared
-  // in the original main IDL file, not the one  which went
+  // in the original main IDL file, not the one which went
   // thru CC preprocessor.
   for (size_t j = 0;
        j < idl_global->n_included_idl_files ();
@@ -676,18 +677,6 @@ TAO_CodeGen::start_server_skeletons (const char *fname)
 
   this->gen_skel_src_includes ();
 
-  // Only when we generate a server inline file generate the include
-  if (be_global->gen_server_inline ())
-    {
-      // Generate the code that includes the inline file if not included in the
-      // header file.
-      *this->server_skeletons_ << "\n\n#if !defined (__ACE_INLINE__)\n";
-      *this->server_skeletons_ << "#include \""
-                               << be_global->be_get_server_inline_fname (1)
-                               << "\"\n";
-      *this->server_skeletons_ << "#endif /* !defined INLINE */";
-    }
-
   // Begin versioned namespace support after initial headers have been
   // included, but before the inline file and post include
   // directives.
@@ -756,39 +745,6 @@ TAO_CodeGen::server_template_skeletons (void)
   return this->server_template_skeletons_;
 }
 
-// Set the server inline stream.
-int
-TAO_CodeGen::start_server_inline (const char *fname)
-{
-  // Clean up between multiple files.
-  delete this->server_inline_;
-
-  ACE_NEW_RETURN (this->server_inline_,
-                  TAO_OutStream,
-                  -1);
-
-  if (this->server_inline_->open (fname, TAO_OutStream::TAO_SVR_INL) == -1)
-    {
-      return -1;
-    }
-
-  // Generate the ident string, if any.
-  this->gen_ident_string (this->server_inline_);
-
-  // Begin versioned namespace support after initial headers, if any, have been
-  // included.
-  *this->server_inline_ << be_global->versioning_begin ();
-
-  return 0;
-}
-
-// Get the server inline stream.
-TAO_OutStream *
-TAO_CodeGen::server_inline (void)
-{
-  return this->server_inline_;
-}
-
 int
 TAO_CodeGen::start_anyop_header (const char *fname)
 {
@@ -1112,7 +1068,7 @@ TAO_CodeGen::start_ciao_svnt_header (const char *fname)
      << "# pragma once\n"
      << "#endif /* ACE_LACKS_PRAGMA_ONCE */\n";
 
-  this->gen_svnt_hdr_includes ();
+  this->gen_svnt_hdr_includes (this->ciao_svnt_header_);
 
   return 0;
 }
@@ -1154,9 +1110,131 @@ TAO_CodeGen::start_ciao_svnt_source (const char *fname)
   *this->ciao_svnt_source_
     << "#include \""
     << be_global->be_get_ciao_svnt_hdr_fname (true)
+    << "\"" << be_nl;
+
+  *this->ciao_svnt_source_
+    << "#include \""
+    << be_global->be_get_ciao_tmpl_svnt_hdr_fname(true)
     << "\"";
 
-  this->gen_svnt_src_includes ();
+  this->gen_svnt_src_includes (this->ciao_svnt_source_);
+
+  return 0;
+}
+
+int
+TAO_CodeGen::start_ciao_svnt_template_header (const char *fname)
+{
+  // Clean up between multiple files.
+  delete this->ciao_svnt_template_header_;
+
+  ACE_NEW_RETURN (this->ciao_svnt_template_header_,
+                  TAO_OutStream,
+                  -1);
+
+  int status =
+    this->ciao_svnt_template_header_->open (fname,
+                                            TAO_OutStream::CIAO_SVNT_T_HDR);
+
+  if (status == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("TAO_CodeGen::start_ciao_svnt_template_header - ")
+                         ACE_TEXT ("Error opening file\n")),
+                        -1);
+    }
+
+  TAO_OutStream &os = *this->ciao_svnt_template_header_;
+
+  os << be_nl
+     << "// TAO_IDL - Generated from" << be_nl
+     << "// " << __FILE__ << ":" << __LINE__
+     << be_nl_2;
+
+  // Generate the #ident string, if any.
+  this->gen_ident_string (this->ciao_svnt_template_header_);
+
+  // Generate the #ifndef clause.
+  this->gen_ifndef_string (fname,
+                           this->ciao_svnt_template_header_,
+                           "CIAO_SESSION_",
+                           "_H_");
+
+  if (be_global->pre_include () != 0)
+    {
+      os << "#include /**/ \""
+         << be_global->pre_include ()
+         << "\"\n";
+    }
+
+  // All CIAO examples so far have component skeleton and servant
+  // generated code in the same library, using the skel export macro,
+  // so the values for the servant export default to the skel values.
+  // Eventually, there should be a way to completely decouple them.
+  if (be_global->svnt_export_include () != 0)
+    {
+      os << "\n#include /**/ \""
+         << be_global->svnt_export_include ()
+         << "\"\n";
+    }
+  else if (be_global->skel_export_include () != 0)
+    {
+      os << "\n#include /**/ \""
+         << be_global->skel_export_include ()
+         << "\"\n";
+    }
+
+  // Some compilers don't optimize the #ifndef header include
+  // protection, but do optimize based on #pragma once.
+  os << "\n#if !defined (ACE_LACKS_PRAGMA_ONCE)\n"
+     << "# pragma once\n"
+     << "#endif /* ACE_LACKS_PRAGMA_ONCE */\n";
+
+  this->gen_svnt_hdr_includes (this->ciao_svnt_template_header_);
+
+  return 0;
+}
+
+int
+TAO_CodeGen::start_ciao_svnt_template_source (const char *fname)
+{
+  // Clean up between multiple files.
+  delete this->ciao_svnt_template_source_;
+
+  ACE_NEW_RETURN (this->ciao_svnt_template_source_,
+                  TAO_OutStream,
+                  -1);
+
+  int status =
+    this->ciao_svnt_template_source_->open (fname,
+                                            TAO_OutStream::CIAO_SVNT_T_IMPL);
+
+  if (status == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("TAO_CodeGen::")
+                         ACE_TEXT ("start_ciao_svnt_template_source - ")
+                         ACE_TEXT ("Error opening file\n")),
+                        -1);
+    }
+
+  TAO_OutStream &os = *this->ciao_svnt_template_source_;
+
+  os << be_nl
+     << "// TAO_IDL - Generated from" << be_nl
+     << "// " << __FILE__ << ":" << __LINE__
+     << be_nl_2;
+
+  // Generate the #ident string, if any.
+  this->gen_ident_string (this->ciao_svnt_template_source_);
+
+  // Generate the include statement for the server header.
+  *this->ciao_svnt_template_source_
+    << "#include \""
+    << be_global->be_get_ciao_svnt_hdr_fname (true)
+    << "\"" << be_nl;
+
+  this->gen_svnt_src_includes (this->ciao_svnt_template_source_);
 
   return 0;
 }
@@ -1172,6 +1250,19 @@ TAO_CodeGen::ciao_svnt_source (void)
 {
   return this->ciao_svnt_source_;
 }
+
+TAO_OutStream *
+TAO_CodeGen::ciao_svnt_template_header (void)
+{
+  return this->ciao_svnt_template_header_;
+}
+
+TAO_OutStream *
+TAO_CodeGen::ciao_svnt_template_source (void)
+{
+  return this->ciao_svnt_template_source_;
+}
+
 int
 TAO_CodeGen::start_ciao_exec_header (const char *fname)
 {
@@ -1183,8 +1274,8 @@ TAO_CodeGen::start_ciao_exec_header (const char *fname)
                   -1);
 
   int status =
-    this->ciao_exec_header_->open (fname,
-                                   TAO_OutStream::CIAO_EXEC_HDR);
+   this->ciao_exec_header_->open (fname,
+                                  TAO_OutStream::CIAO_EXEC_HDR);
 
   if (status == -1)
     {
@@ -1240,7 +1331,6 @@ TAO_CodeGen::start_ciao_exec_source (const char *fname)
   int status =
     this->ciao_exec_source_->open (fname,
                                    TAO_OutStream::CIAO_EXEC_IMPL);
-
   if (status == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -1654,17 +1744,6 @@ TAO_CodeGen::end_server_header (void)
               << be_global->be_get_server_template_hdr_fname (true)
               << "\"\n";
         }
-
-      // Only when we generate a server inline file generate the include
-      if (be_global->gen_server_inline ())
-        {
-          // Insert the code to include the inline file.
-          *os << "\n#if defined (__ACE_INLINE__)\n";
-          *os << "#include \""
-              << be_global->be_get_server_inline_fname (1)
-              << "\"\n";
-          *os << "#endif /* defined INLINE */";
-        }
     }
 
   if (be_global->post_include () != 0)
@@ -1682,18 +1761,6 @@ TAO_CodeGen::end_server_header (void)
   return 0;
 }
 
-void
-TAO_CodeGen::end_server_inline (void)
-{
-  *this->server_inline_ << "\n";
-
-  // End versioned namespace support.  Do not place include directives
-  // before this.
-  *this->server_inline_ << be_global->versioning_end ();
-
-  *this->server_inline_ << "\n";
-}
-
 int
 TAO_CodeGen::end_implementation_header (const char *fname)
 {
@@ -1869,6 +1936,43 @@ TAO_CodeGen::end_ciao_svnt_source (void)
 }
 
 int
+TAO_CodeGen::end_ciao_svnt_template_header (void)
+{
+  *this->ciao_svnt_template_header_ << be_nl
+                                    << "#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)"
+                                    << be_nl << "#include \""
+                                    << be_global->be_get_ciao_tmpl_svnt_src_fname (true)
+                                    << "\"" << be_nl
+                                    << "#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */"
+                                    << be_nl_2
+                                    << "#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)"
+                                    << be_nl << "#pragma implementation (\""
+                                    << be_global->be_get_ciao_tmpl_svnt_src_fname (true)
+                                    << "\")"
+                                    << be_nl << "#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */"
+                                    << be_nl;
+
+  if (be_global->post_include () != 0)
+    {
+      *this->ciao_svnt_template_header_ << "\n\n#include /**/ \""
+                                        << be_global->post_include ()
+                                        << "\"";
+    }
+
+  *this->ciao_svnt_template_header_ << "\n\n#endif /* ifndef */\n";
+
+  return 0;
+}
+
+int
+TAO_CodeGen::end_ciao_svnt_template_source (void)
+{
+  *this->ciao_svnt_template_source_ << "\n";
+
+  return 0;
+}
+
+int
 TAO_CodeGen::end_ciao_exec_header (void)
 {
   if (be_global->post_include () != 0)
@@ -2045,7 +2149,7 @@ TAO_CodeGen::gen_export_file (const char *filename,
   ACE_CString file_str;
 
   const char *output_path =
-    be_util::get_output_path (false, for_skel);
+    be_util::get_output_path (false, for_skel, false);
 
   if (output_path != 0)
     {
@@ -2775,6 +2879,8 @@ TAO_CodeGen::gen_skel_src_includes (void)
       this->gen_standard_include (this->server_skeletons_,
                                   "tao/Buffer_Allocator_T.h");
       this->gen_standard_include (this->server_skeletons_,
+                                  "tao/Messaging/AMH_Skeletons.h");
+      this->gen_standard_include (this->server_skeletons_,
                                   "ace/Auto_Functor.h");
     }
 
@@ -3198,7 +3304,7 @@ TAO_CodeGen::gen_typecode_includes (TAO_OutStream * stream)
 }
 
 void
-TAO_CodeGen::gen_svnt_hdr_includes (void)
+TAO_CodeGen::gen_svnt_hdr_includes (TAO_OutStream *stream)
 {
   ACE_CString container_file ("ciao/Containers/");
   container_file += be_global->ciao_container_type ();
@@ -3207,7 +3313,7 @@ TAO_CodeGen::gen_svnt_hdr_includes (void)
   container_file += "_ContainerC.h";
 
   this->gen_standard_include (
-    this->ciao_svnt_header_,
+    stream,
     container_file.c_str ());
 
   ACE_CString context_file ("ciao/Contexts/");
@@ -3217,55 +3323,59 @@ TAO_CodeGen::gen_svnt_hdr_includes (void)
   context_file += "_Context_T.h";
 
   this->gen_standard_include (
-    this->ciao_svnt_header_,
-       context_file.c_str ());
+    stream,
+    context_file.c_str ());
 
   ACE_CString servant_file ("ciao/Servants/");
   servant_file += be_global->ciao_container_type ();
   servant_file += "/Servant_Impl_T.h";
 
   this->gen_standard_include (
-    this->ciao_svnt_header_,
+    stream,
     servant_file.c_str ());
 
   this->gen_standard_include (
-    this->ciao_svnt_header_,
+    stream,
     "ciao/Servants/Home_Servant_Impl_T.h");
 
-  *this->ciao_svnt_header_ << be_nl;
+  this->gen_standard_include (
+    stream,
+    "ciao/Servants/Facet_Servant_Base_T.h");
+
+  *stream << be_nl;
 
   this->gen_standard_include (
-    this->ciao_svnt_header_,
+    stream,
     be_global->be_get_ciao_exec_stub_hdr_fname (true));
 
-  *this->ciao_svnt_header_ << be_nl;
+  *stream << be_nl;
 
   this->gen_standard_include (
-    this->ciao_svnt_header_,
+    stream,
     be_global->be_get_server_hdr_fname (true));
 }
 
 void
-TAO_CodeGen::gen_svnt_src_includes (void)
+TAO_CodeGen::gen_svnt_src_includes (TAO_OutStream *stream)
 {
   this->gen_standard_include (
-    this->ciao_svnt_source_,
+    stream,
     "ciao/Valuetype_Factories/Cookies.h");
 
   this->gen_standard_include (
-    this->ciao_svnt_source_,
+    stream,
     "tao/SystemException.h");
 
   this->gen_standard_include (
-    this->ciao_svnt_source_,
+    stream,
     "tao/Valuetype/ValueFactory.h");
 
   this->gen_standard_include (
-    this->ciao_svnt_source_,
+    stream,
     "tao/ORB_Core.h");
 
   this->gen_standard_include (
-    this->ciao_svnt_source_,
+    stream,
     "ace/SString.h");
 }
 
@@ -3640,7 +3750,6 @@ TAO_CodeGen::destroy (void)
   delete this->server_skeletons_;
   delete this->server_template_skeletons_;
   delete this->client_inline_;
-  delete this->server_inline_;
   delete this->anyop_source_;
   delete this->anyop_header_;
   delete this->ciao_svnt_header_;
diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp
index d24446abc8e..7fbf68871e3 100644
--- a/TAO/TAO_IDL/be/be_global.cpp
+++ b/TAO/TAO_IDL/be/be_global.cpp
@@ -72,9 +72,10 @@ BE_GlobalData::BE_GlobalData (void)
     server_template_hdr_ending_ (ACE::strnew ("S_T.h")),
     server_skeleton_ending_ (ACE::strnew ("S.cpp")),
     server_template_skeleton_ending_ (ACE::strnew ("S_T.cpp")),
-    server_inline_ending_ (ACE::strnew ("S.inl")),
     anyop_hdr_ending_ (ACE::strnew ("A.h")),
     anyop_src_ending_ (ACE::strnew ("A.cpp")),
+    ciao_svnt_hdr_template_ending_ (ACE::strnew ("_svnt_T.h")),
+    ciao_svnt_src_template_ending_ (ACE::strnew ("_svnt_T.cpp")),
     ciao_svnt_hdr_ending_ (ACE::strnew ("_svnt.h")),
     ciao_svnt_src_ending_ (ACE::strnew ("_svnt.cpp")),
     ciao_exec_hdr_ending_ (ACE::strnew ("_exec.h")),
@@ -92,6 +93,7 @@ BE_GlobalData::BE_GlobalData (void)
     stub_include_dir_ (0),
     skel_output_dir_ (0),
     anyop_output_dir_ (0),
+    exec_output_dir_ (0),
     any_support_ (true),
     cdr_support_ (true),
     tc_support_ (true),
@@ -126,7 +128,6 @@ BE_GlobalData::BE_GlobalData (void)
     gen_anyop_files_ (false),
     gen_skel_files_ (true),
     gen_client_inline_ (true),
-    gen_server_inline_ (true),
     gen_client_stub_ (true),
     gen_server_skeleton_ (true),
     gen_local_iface_anyops_ (true),
@@ -139,6 +140,7 @@ BE_GlobalData::BE_GlobalData (void)
     gen_ciao_exec_idl_ (false),
     gen_ciao_exec_impl_ (false),
     gen_ciao_exec_reactor_impl_ (false),
+    overwrite_not_exec_(false),
     gen_ciao_conn_impl_ (false),
     gen_dds_typesupport_idl_ (false),
     gen_ciao_valuefactory_reg_ (true),
@@ -182,7 +184,8 @@ be_change_idl_file_extension (UTL_String* idl_file,
                               const char *new_extension,
                               bool base_name_only = false,
                               bool for_anyop = false,
-                              bool for_skel = false)
+                              bool for_skel = false,
+                              bool for_exec = false)
 {
   // @@ This shouldn't happen anyway; but a better error handling
   // mechanism is needed.
@@ -227,7 +230,7 @@ be_change_idl_file_extension (UTL_String* idl_file,
 
   // Anyop * skel file output defaults to general output dir if not set.
   const char *output_path =
-    be_util::get_output_path (for_anyop, for_skel);
+    be_util::get_output_path (for_anyop, for_skel, for_exec);
 
   if (!base_name_only && output_path != 0)
     {
@@ -272,7 +275,6 @@ be_change_idl_file_extension (UTL_String* idl_file,
 
   // Append the newextension.
   ACE_OS::strcat (fname, new_extension);
-
   return fname;
 }
 
@@ -389,17 +391,6 @@ BE_GlobalData::be_get_server_template_skeleton (UTL_String *idl_file_name,
 }
 
 const char *
-BE_GlobalData::be_get_server_inline (UTL_String *idl_file_name,
-                                     bool base_name_only)
-{
-  return be_change_idl_file_extension (idl_file_name,
-                                       be_global->server_inline_ending (),
-                                       base_name_only,
-                                       false,
-                                       true);
-}
-
-const char *
 BE_GlobalData::be_get_anyop_header (UTL_String *idl_file_name,
                                     bool base_name_only)
 {
@@ -429,6 +420,16 @@ BE_GlobalData::be_get_ciao_svnt_header (UTL_String *idl_file_name,
 }
 
 const char *
+BE_GlobalData::be_get_ciao_svnt_template_header (UTL_String *idl_file_name,
+                                                bool base_name_only)
+{
+  return be_change_idl_file_extension (idl_file_name,
+                                       be_global->ciao_svnt_header_template_ending (),
+                                       base_name_only);
+}
+
+
+const char *
 BE_GlobalData::be_get_ciao_svnt_source (UTL_String *idl_file_name,
                                         bool base_name_only)
 {
@@ -438,12 +439,24 @@ BE_GlobalData::be_get_ciao_svnt_source (UTL_String *idl_file_name,
 }
 
 const char *
+BE_GlobalData::be_get_ciao_svnt_template_source (UTL_String *idl_file_name,
+                                                bool base_name_only)
+{
+  return be_change_idl_file_extension (idl_file_name,
+                                       be_global->ciao_svnt_source_template_ending (),
+                                       base_name_only);
+}
+
+const char *
 BE_GlobalData::be_get_ciao_exec_header (UTL_String *idl_file_name,
                                         bool base_name_only)
 {
   return be_change_idl_file_extension (idl_file_name,
                                        be_global->ciao_exec_header_ending (),
-                                       base_name_only);
+                                       base_name_only,
+                                       false,
+                                       false,
+                                       true);
 }
 
 const char *
@@ -452,7 +465,10 @@ BE_GlobalData::be_get_ciao_exec_source (UTL_String *idl_file_name,
 {
   return be_change_idl_file_extension (idl_file_name,
                                        be_global->ciao_exec_source_ending (),
-                                       base_name_only);
+                                       base_name_only,
+                                       false,
+                                       false,
+                                       true);
 }
 
 const char *
@@ -630,15 +646,6 @@ BE_GlobalData::be_get_server_template_skeleton_fname (
 }
 
 const char *
-BE_GlobalData::be_get_server_inline_fname (
-  bool base_name_only)
-{
-  return
-    be_get_server_inline (idl_global->stripped_filename (),
-                          base_name_only);
-}
-
-const char *
 BE_GlobalData::be_get_anyop_source_fname (
   bool base_name_only)
 {
@@ -666,6 +673,15 @@ BE_GlobalData::be_get_ciao_svnt_hdr_fname (
 }
 
 const char *
+BE_GlobalData::be_get_ciao_tmpl_svnt_hdr_fname (
+    bool base_name_only)
+{
+  return
+    be_get_ciao_svnt_template_header (idl_global->stripped_filename (),
+                                      base_name_only);
+}
+
+const char *
 BE_GlobalData::be_get_ciao_svnt_src_fname (
   bool base_name_only)
 {
@@ -675,6 +691,15 @@ BE_GlobalData::be_get_ciao_svnt_src_fname (
 }
 
 const char *
+BE_GlobalData::be_get_ciao_tmpl_svnt_src_fname (
+    bool base_name_only)
+{
+  return
+    be_get_ciao_svnt_template_source (idl_global->stripped_filename (),
+                                      base_name_only);
+}
+
+const char *
 BE_GlobalData::be_get_ciao_exec_hdr_fname (
   bool base_name_only)
 {
@@ -1243,19 +1268,6 @@ BE_GlobalData::server_template_skeleton_ending (void) const
 }
 
 void
-BE_GlobalData::server_inline_ending (const char* s)
-{
-  ACE::strdelete (this->server_inline_ending_);
-  this->server_inline_ending_ = ACE::strnew (s);
-}
-
-const char*
-BE_GlobalData::server_inline_ending (void) const
-{
-  return this->server_inline_ending_;
-}
-
-void
 BE_GlobalData::anyop_header_ending (const char* s)
 {
   ACE::strdelete (this->anyop_hdr_ending_);
@@ -1344,6 +1356,32 @@ BE_GlobalData::ciao_svnt_source_ending (void) const
 }
 
 void
+BE_GlobalData::ciao_svnt_header_template_ending (const char* s)
+{
+  ACE::strdelete (this->ciao_svnt_hdr_template_ending_);
+  this->ciao_svnt_hdr_template_ending_ = ACE::strnew (s);
+}
+
+const char*
+BE_GlobalData::ciao_svnt_header_template_ending (void) const
+{
+  return this->ciao_svnt_hdr_template_ending_;
+}
+
+void
+BE_GlobalData::ciao_svnt_source_template_ending (const char* s)
+{
+  ACE::strdelete (this->ciao_svnt_src_template_ending_);
+  this->ciao_svnt_src_template_ending_ = ACE::strnew (s);
+}
+
+const char*
+BE_GlobalData::ciao_svnt_source_template_ending (void) const
+{
+  return this->ciao_svnt_src_template_ending_;
+}
+
+void
 BE_GlobalData::ciao_exec_header_ending (const char* s)
 {
   ACE::strdelete (this->ciao_exec_hdr_ending_);
@@ -1498,6 +1536,17 @@ BE_GlobalData::output_dir (void) const
 {
   return this->output_dir_;
 }
+bool
+BE_GlobalData::overwrite_not_exec (void) const
+{
+  return this->overwrite_not_exec_;
+}
+
+void
+BE_GlobalData::overwrite_not_exec (bool val)
+{
+  this->overwrite_not_exec_ = val;
+}
 
 void
 BE_GlobalData::skel_output_dir (const char* s)
@@ -1539,6 +1588,18 @@ BE_GlobalData::anyop_output_dir (void) const
 }
 
 void
+BE_GlobalData::exec_output_dir (const char* s)
+{
+  ACE::strdelete (this->exec_output_dir_);
+  this->exec_output_dir_ = ACE::strnew (s);
+}
+
+const char*
+BE_GlobalData::exec_output_dir (void) const
+{
+  return this->exec_output_dir_;
+}
+void
 BE_GlobalData::any_support (bool val)
 {
   this->any_support_ = val;
@@ -1972,9 +2033,6 @@ BE_GlobalData::destroy (void)
   ACE::strdelete (this->server_template_skeleton_ending_);
   this->server_template_skeleton_ending_ = 0;
 
-  ACE::strdelete (this->server_inline_ending_);
-  this->server_inline_ending_ = 0;
-
   ACE::strdelete (this->anyop_hdr_ending_);
   this->anyop_hdr_ending_ = 0;
 
@@ -2032,6 +2090,9 @@ BE_GlobalData::destroy (void)
   ACE::strdelete (this->anyop_output_dir_);
   this->anyop_output_dir_ = 0;
 
+  ACE::strdelete (this->exec_output_dir_);
+  this->exec_output_dir_ = 0;
+
   if (0 != this->messaging_)
     {
       this->messaging_->destroy ();
@@ -2304,18 +2365,6 @@ BE_GlobalData::gen_client_inline (bool val)
 }
 
 bool
-BE_GlobalData::gen_server_inline (void) const
-{
-  return this->gen_server_inline_;
-}
-
-void
-BE_GlobalData::gen_server_inline (bool val)
-{
-  this->gen_server_inline_ = val;
-}
-
-bool
 BE_GlobalData::gen_client_stub (void) const
 {
   return this->gen_client_stub_;
@@ -2705,8 +2754,6 @@ BE_GlobalData::parse_args (long &i, char **av)
         //      Default is "S.cpp".
         // <-sT Server's template skeleton file name ending>
         //      Default is "S_T.cpp".
-        // <-si Server's inline file name ending>
-        //      Default is "S.inl".
         // <-sI Server's implementation skeleton file name ending>
         //      Default is "I.cpp".
 
@@ -2722,12 +2769,6 @@ BE_GlobalData::parse_args (long &i, char **av)
             be_global->server_template_skeleton_ending (av[i + 1]);
             ++i;
           }
-        else if (av[i][2] == 'i')
-          {
-            idl_global->append_idl_flag (av[i + 1]);
-            be_global->server_inline_ending (av[i + 1]);
-            ++i;
-          }
         else if (av[i][2] == 'I')
           {
             idl_global->append_idl_flag (av[i + 1]);
@@ -2736,7 +2777,7 @@ BE_GlobalData::parse_args (long &i, char **av)
           }
         else
           {
-            // I expect 's' or 'T' or 'i' or 't' after 's'.
+            // I expect 's' or 'T' or or 't' after 's'.
             ACE_ERROR ((
                 LM_ERROR,
                 ACE_TEXT ("IDL: I don't understand the '%C' option\n"),
@@ -2924,6 +2965,61 @@ BE_GlobalData::parse_args (long &i, char **av)
                   ));
               }
           }
+        else if (av[i][2] == 'E')
+          {
+            if (av[i][3] == '\0')
+              {
+                idl_global->append_idl_flag (av[i + 1]);
+                int result = ACE_OS::mkdir (av[i + 1]);
+
+                #if !defined (__BORLANDC__)
+                  if (result != 0 && errno != EEXIST)
+                #else
+                  // The Borland RTL doesn't give EEXIST back, only EACCES in
+                  // case the directory exists, reported to Borland as QC 9495
+                  if (result != 0 && errno != EEXIST && errno != EACCES)
+                #endif
+                  {
+                    ACE_ERROR ((
+                        LM_ERROR,
+                        ACE_TEXT ("IDL: unable to create directory %C")
+                        ACE_TEXT (" specified by -oE option\n"),
+                        av[i + 1]
+                      ));
+
+                    break;
+                  }
+
+                be_global->exec_output_dir (av[i + 1]);
+                ++i;
+              }
+            else
+              {
+                ACE_ERROR ((
+                    LM_ERROR,
+                    ACE_TEXT ("IDL: I don't understand")
+                    ACE_TEXT (" the '%C' option\n"),
+                    av[i]
+                  ));
+              }
+          }
+        else if (av[i][2] == 'N')
+           {
+             if (av[i][3] == '\0')
+               {
+                 // Don't overwrite exec files.
+                 be_global->overwrite_not_exec (true);
+               }
+             else
+               {
+                 ACE_ERROR ((
+                     LM_ERROR,
+                     ACE_TEXT ("IDL: I don't understand")
+                     ACE_TEXT (" the '%C' option\n"),
+                     av[i]
+                   ));
+               }
+           }
         else if (av[i][2] == 'S')
           {
             if (av[i][3] == '\0')
@@ -3423,7 +3519,6 @@ BE_GlobalData::parse_args (long &i, char **av)
               {
                 // Disable skeleton file generation.
                 be_global->gen_skel_files (false);
-                be_global->gen_server_inline (false);
                 be_global->gen_server_skeleton (false);
               }
             else
@@ -3437,12 +3532,7 @@ BE_GlobalData::parse_args (long &i, char **av)
           }
         else if (av[i][2] == 's')
           {
-            if (av[i][3] == 'i')
-              {
-                // No skeleton inline.
-                be_global->gen_server_inline (false);
-              }
-            else if (av[i][3] == 'c')
+            if (av[i][3] == 'c')
               {
                 // No skeleton inline.
                 be_global->gen_server_skeleton (false);
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index b0028396a15..799dd96221d 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -94,6 +94,7 @@ be_interface::be_interface (UTL_ScopedName *n,
     skel_count_ (0),
     in_mult_inheritance_ (-1),
     original_interface_ (0),
+    is_amh_rh_ (false),
     is_ami_rh_ (false),
     is_ami4ccm_rh_ (false),
     full_skel_name_ (0),
@@ -929,6 +930,19 @@ int
 be_interface::gen_operation_table (const char *flat_name,
                                    const char *skeleton_class_name)
 {
+  // TODO:
+  // find another way to determine whether this is an AMH class
+  // Create 'is_amh' methods, just like AMI. Problem is finding where
+  // to invoke these methods since an AMH class is generated twice:
+  // once for AMH and once the 'normal' way.
+
+  bool amh = false;
+  ACE_CString tmp (skeleton_class_name);
+  if (tmp.strstr ("AMH_") != ACE_String_Base_Const::npos)
+    {
+      amh = true;
+    }
+
   // Check out the op_lookup_strategy.
   switch (be_global->lookup_strategy ())
   {
@@ -970,39 +984,96 @@ be_interface::gen_operation_table (const char *flat_name,
           }
 
         // Generate the skeleton for the is_a method.
-        *os << "{\"_is_a\", &" << skeleton_class_name
-            << "::_is_a_skel, 0}," << be_nl;
+        if (amh)
+          {
+            *os << "{\"_is_a\", &TAO_AMH_Skeletons::_is_a_amh_skel, 0}," << be_nl;
+          }
+        else if (be_global->gen_thru_poa_collocation ())
+          {
+            *os << "{\"_is_a\", &TAO_ServantBase::_is_a_thru_poa_skel, 0}," << be_nl;
+          }
+        else
+          {
+            *os << "{\"_is_a\", &TAO_ServantBase::_is_a_skel, 0}," << be_nl;
+          }
 
         ++this->skel_count_;
 
         if (!be_global->gen_minimum_corba ())
           {
-            *os << "{\"_non_existent\", &" << skeleton_class_name
-                << "::_non_existent_skel, 0}," << be_nl;
+            if (amh)
+              {
+                *os << "{\"_non_existent\", &TAO_AMH_Skeletons"
+                    << "::_non_existent_amh_skel, 0}," << be_nl;
+              }
+            else if (be_global->gen_thru_poa_collocation ())
+              {
+                *os << "{\"_non_existent\", &TAO_ServantBase"
+                    << "::_non_existent_thru_poa_skel, 0}," << be_nl;
+              }
+            else
+              {
+                *os << "{\"_non_existent\", &TAO_ServantBase"
+                    << "::_non_existent_skel, 0}," << be_nl;
+              }
 
             ++this->skel_count_;
           }
 
         if (!be_global->gen_corba_e () && !be_global->gen_minimum_corba ())
           {
-            *os << "{\"_component\", &" << skeleton_class_name
-                << "::_component_skel, 0}," << be_nl;
+            if (amh)
+              {
+                *os << "{\"_component\", &TAO_AMH_Skeletons"
+                    << "::_component_amh_skel, 0}," << be_nl;
+              }
+            else if (be_global->gen_thru_poa_collocation ())
+              {
+                *os << "{\"_component\", &TAO_ServantBase"
+                    << "::_component_thru_poa_skel, 0}," << be_nl;
+              }
+            else
+              {
+                *os << "{\"_component\", &TAO_ServantBase"
+                    << "::_component_skel, 0}," << be_nl;
+              }
 
             ++this->skel_count_;
           }
 
         if (!be_global->gen_corba_e () && !be_global->gen_minimum_corba ())
           {
-            *os << "{\"_interface\", &" << skeleton_class_name
-                << "::_interface_skel, 0}," << be_nl;
+            if (amh)
+              {
+                *os << "{\"_interface\", &TAO_AMH_Skeletons"
+                    << "::_interface_amh_skel, 0}," << be_nl;
+              }
+            else
+              {
+                *os << "{\"_interface\", &TAO_ServantBase"
+                    << "::_interface_skel, 0}," << be_nl;
+              }
 
             ++this->skel_count_;
           }
 
         if (!be_global->gen_minimum_corba ())
           {
-            *os << "{\"_repository_id\", &" << skeleton_class_name
-                << "::_repository_id_skel, 0}" << be_uidt_nl;
+            if (amh)
+              {
+                *os << "{\"_repository_id\", &TAO_AMH_Skeletons"
+                    << "::_repository_id_amh_skel, 0}" << be_uidt_nl;
+              }
+            else if (be_global->gen_thru_poa_collocation ())
+              {
+                *os << "{\"_repository_id\", &TAO_ServantBase"
+                    << "::_repository_id_thru_poa_skel, 0}" << be_uidt_nl;
+              }
+            else
+              {
+                *os << "{\"_repository_id\", &TAO_ServantBase"
+                    << "::_repository_id_skel, 0}" << be_uidt_nl;
+              }
 
             ++this->skel_count_;
           }
@@ -1137,43 +1208,98 @@ be_interface::gen_operation_table (const char *flat_name,
                               -1);
           }
 
-        *os << "_is_a,&"
-            << skeleton_class_name
-            << "::_is_a_skel, 0" << be_nl;
+        if (amh)
+          {
+            *os << "_is_a,&TAO_AMH_Skeletons"
+                << "::_is_a_amh_skel, 0" << be_nl;
+          }
+        else if (be_global->gen_thru_poa_collocation ())
+          {
+            *os << "_is_a,&TAO_ServantBase"
+                << "::_is_a_thru_poa_skel, 0" << be_nl;
+          }
+        else
+          {
+            *os << "_is_a,&TAO_ServantBase"
+                << "::_is_a_skel, 0" << be_nl;
+          }
 
         ++this->skel_count_;
 
         if (!be_global->gen_minimum_corba ())
           {
-            *os << "_non_existent,&"
-                << skeleton_class_name
-                << "::_non_existent_skel, 0" << be_nl;
+            if (amh)
+              {
+                *os << "_non_existent,&TAO_AMH_Skeletons"
+                    << "::_non_existent_amh_skel, 0" << be_nl;
+              }
+            else if (be_global->gen_thru_poa_collocation ())
+              {
+                *os << "_non_existent,&TAO_ServantBase"
+                    << "::_non_existent_thru_poa_skel, 0" << be_nl;
+              }
+            else
+              {
+                *os << "_non_existent,&TAO_ServantBase"
+                    << "::_non_existent_skel, 0" << be_nl;
+              }
 
             ++this->skel_count_;
           }
 
         if (!be_global->gen_corba_e () && !be_global->gen_minimum_corba ())
           {
-            *os << "_component,&"
-                << skeleton_class_name
-                << "::_component_skel, 0" << be_nl;
+            if (amh)
+              {
+                *os << "_component,&TAO_AMH_Skeletons"
+                    << "::_component_amh_skel, 0" << be_nl;
+              }
+            else if (be_global->gen_thru_poa_collocation ())
+              {
+                *os << "_component,&TAO_ServantBase"
+                    << "::_component_thru_poa_skel, 0" << be_nl;
+              }
+            else
+              {
+                *os << "_component,&TAO_ServantBase"
+                    << "::_component_skel, 0" << be_nl;
+              }
             ++this->skel_count_;
           }
 
         if (!be_global->gen_corba_e () && !be_global->gen_minimum_corba ())
           {
-            *os << "_interface,&"
-                << skeleton_class_name
-                << "::_interface_skel, 0" << be_nl;
+            if (amh)
+              {
+                *os << "_interface,&TAO_AMH_Skeletons"
+                    << "::_interface_amh_skel, 0" << be_nl;
+              }
+            else
+              {
+                *os << "_interface,&TAO_ServantBase"
+                    << "::_interface_skel, 0" << be_nl;
+              }
 
             ++this->skel_count_;
           }
 
         if (!be_global->gen_minimum_corba ())
           {
-            *os << "_repository_id,&"
-                << skeleton_class_name
-                << "::_repository_id_skel, 0" << be_nl;
+            if (amh)
+              {
+                *os << "_repository_id,&TAO_AMH_Skeletons"
+                    << "::_repository_id_amh_skel, 0" << be_nl;
+              }
+            else if (be_global->gen_thru_poa_collocation ())
+              {
+                *os << "_repository_id,&TAO_ServantBase"
+                    << "::_repository_id_thru_poa_skel, 0" << be_nl;
+              }
+            else
+              {
+                *os << "_repository_id,&TAO_ServantBase"
+                    << "::_repository_id_skel, 0" << be_nl;
+              }
 
             ++this->skel_count_;
           }
@@ -1281,7 +1407,7 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
               if (be_global->gen_direct_collocation ())
                 {
                   *os << " &"
-                      << derived_interface->full_direct_proxy_impl_name ()
+                      << this->full_direct_proxy_impl_name ()
                       << "::" << d->local_name ();
                 }
               else
@@ -1310,7 +1436,7 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
               if (be_global->gen_direct_collocation ())
                 {
                   *os << " &"
-                      << derived_interface->full_direct_proxy_impl_name ()
+                      << this->full_direct_proxy_impl_name ()
                       << "::_get_" << d->local_name ();
                 }
               else
@@ -1332,7 +1458,7 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
                   if (be_global->gen_direct_collocation ())
                     {
                       *os << " &"
-                          << derived_interface->full_direct_proxy_impl_name ()
+                          << this->full_direct_proxy_impl_name ()
                           << "::_set_" << d->local_name ();
                     }
                   else
@@ -1378,15 +1504,64 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
 
               // We are an operation node. We use the original
               // operation name, not the one with _cxx_ in it.
-              *os << d->original_local_name () << ",&"
-                  << full_skeleton_name << "::"
-                  << d->local_name () << "_skel,";
-
+              // We need to the name of the base class!! But since
+              // we don't know whether this is an AMH class, we
+              // need to check this, using the full_skeleton_name
+              // TODO: find a more elegant solution for this
+              ACE_CString tmp (full_skeleton_name);
+              if (tmp.strstr ("AMH_") != ACE_String_Base_Const::npos)
+                {
+                  ACE_CString name (d->full_name ());
+                  ACE_String_Base_Const::size_type const last = name.rfind(':') - 1;
+                  name = name.substring (0, last);
+                  if (name.rfind (':') != ACE_String_Base_Const::npos)
+                    {
+                      ACE_CString nspace = name.substring (0, name.rfind (':') - 1);
+                      name = name.substring (name.rfind (':') + 1);
+                      *os << d->original_local_name () << ",&POA_"
+                          << nspace.c_str () << "::AMH_"
+                          << name.c_str () << "::"
+                          << d->original_local_name ()
+                          << "_skel,";
+                    }
+                  else
+                    {
+                      *os << d->original_local_name () << ",&POA_AMH_"
+                          << name.c_str () << "::"
+                          << d->original_local_name ()
+                          << "_skel,";
+                    }
+                }
+              else
+                {
+                  if (!d->is_abstract ())
+                    {
+                      *os << d->original_local_name () << ",&POA_"
+                          << d->full_name () << "_skel,";
+                    }
+                  else
+                    {
+                      *os << d->original_local_name () << ",&"
+                          << full_skeleton_name << "::"
+                          << d->original_local_name ()
+                          << "_skel,";
+                    }
+                }
               if (be_global->gen_direct_collocation ())
                 {
-                  *os << " &"
-                      << derived_interface->full_direct_proxy_impl_name ();
-                  *os << "::" << d->local_name ();
+                  if (!d->is_abstract ())
+                    {
+                      *os << " &"
+                          << this->full_direct_proxy_impl_name ()
+                          << "::" << d->local_name ();
+                    }
+                  else
+                    {
+                      *os << " &"
+                          << derived_interface->full_direct_proxy_impl_name ()
+                          << "::" << d->local_name ();
+                    }
+
                 }
               else
                 {
@@ -1408,19 +1583,47 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
                 }
 
               // Generate only the "get" entry if we are readonly.
-              *os << "_get_" << d->original_local_name () << ",&"
-                  << full_skeleton_name << "::_get_"
-                  << d->local_name () << "_skel,";
+              // we need to split the full name in order to push _set_
+              // or _get_ in between the namespace and attribute name.
 
-              if (be_global->gen_direct_collocation ())
+              //determine the correct namespace
+              ACE_CString nspace (d->full_name ());
+              ACE_String_Base_Const::size_type const pos = nspace.rfind(':');
+              nspace = nspace.substring(0, pos + 1);
+
+              if (!d->is_abstract ())
                 {
-                  *os << " &"
-                      << derived_interface->full_direct_proxy_impl_name ()
-                      << "::_get_" << d->local_name ();
+                  *os << "_get_" << d->original_local_name () << ",&POA_"
+                      << nspace.c_str () << "_get_"
+                      << d->original_local_name () << "_skel,";
+
+                  if (be_global->gen_direct_collocation ())
+                    {
+                      *os << " &"
+                          << this->full_direct_proxy_impl_name ()
+                          << "::_get_" << d->local_name ();
+                    }
+                  else
+                    {
+                      *os << " 0";
+                    }
                 }
               else
                 {
-                  *os << " 0";
+                  *os << "_get_" << d->original_local_name () << ",&"
+                      << full_skeleton_name << "::_get_"
+                      << d->original_local_name () << "_skel,";
+
+                  if (be_global->gen_direct_collocation ())
+                    {
+                      *os << " &"
+                          << derived_interface->full_direct_proxy_impl_name ()
+                          << "::_get_" << d->local_name ();
+                    }
+                  else
+                    {
+                      *os << " 0";
+                    }
                 }
 
               *os << "\n";
@@ -1429,20 +1632,41 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
 
               if (!attr->readonly ())
                 {
-                  // The set method
-                  *os << "_set_" << d->original_local_name () << ",&"
-                      << full_skeleton_name << "::_set_"
-                      << d->local_name () << "_skel,";
-
-                  if (be_global->gen_direct_collocation ())
+                  if (!d->is_abstract ())
                     {
-                      *os << " &"
-                          << derived_interface->full_direct_proxy_impl_name ()
-                          << "::_set_" << d->local_name ();
+                      // The set method
+                      *os << "_set_" << d->original_local_name () << ",&POA_"
+                          << nspace.c_str () << "_set_"
+                          << d->original_local_name () << "_skel,";
+
+                      if (be_global->gen_direct_collocation ())
+                        {
+                          *os << " &"
+                              << this->full_direct_proxy_impl_name ()
+                              << "::_set_" << d->local_name ();
+                        }
+                      else
+                        {
+                          *os << " 0";
+                        }
                     }
                   else
                     {
-                      *os << " 0";
+                      // The set method in case abstract
+                      *os << "_set_" << d->original_local_name () << ",&"
+                          << full_skeleton_name << "::_set_"
+                          << d->original_local_name () << "_skel,";
+
+                      if (be_global->gen_direct_collocation ())
+                        {
+                          *os << " &"
+                              << derived_interface->full_direct_proxy_impl_name ()
+                              << "::_set_" << d->local_name ();
+                        }
+                      else
+                        {
+                          *os << " 0";
+                        }
                     }
 
                   *os << "\n";
@@ -1464,37 +1688,6 @@ be_interface::gen_optable_entries (be_interface *derived_interface,
 }
 
 void
-be_interface::gen_collocated_skel_body (be_interface *derived,
-                                        be_interface *ancestor,
-                                        AST_Decl *d,
-                                        const char *prefix,
-                                        bool /* direct */,
-                                        UTL_ExceptList *,
-                                        TAO_OutStream *os)
-{
-  *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
-
-  // Generate the static method corresponding to this method.
-  *os << be_nl_2
-      << "ACE_INLINE void" << be_nl
-      << derived->full_direct_proxy_impl_name ()
-      << "::" << prefix << d->local_name () << " ("
-      << be_idt_nl
-      << "TAO_Abstract_ServantBase *servant," << be_nl
-      << "TAO::Argument ** args)" << be_uidt_nl;
-
-  *os << "{" << be_idt_nl
-      << ancestor->full_direct_proxy_impl_name ()
-      << "::" << prefix << d->local_name () << " ("
-      << be_idt_nl
-      << "servant," << be_nl
-      << "args);" << be_uidt
-      << be_uidt_nl
-      << "}"<< be_nl;
-}
-
-void
 be_interface::gen_ostream_operator (TAO_OutStream *os,
                                     bool /* use_underscore */)
 {
@@ -2130,375 +2323,6 @@ be_interface::is_a_helper (be_interface * /*derived*/,
 }
 
 int
-be_interface::gen_skel_helper (be_interface *derived,
-                               be_interface *ancestor,
-                               TAO_OutStream *os)
-{
-  // If derived and ancestor are same, skip it.
-  if (derived == ancestor)
-    {
-      return 0;
-    }
-
-  // If an operation or an attribute is abstract (declared in an
-  // abstract interface), we will either generate the full
-  // definition (if there are no concrete interfaces between the
-  // abstract ancestor and us) or, if there is a concrete ancestor
-  // in between, we will catch its definition elsewhere in this
-  // traversal.
-  if (ancestor->is_abstract ())
-    {
-      return 0;
-    }
-
-  // Else generate code that does the cast to the appropriate type.
-
-  if (ancestor->nmembers () > 0)
-    {
-      // If there are elements in ancestor scope i.e., any operations and
-      // attributes defined by "ancestor", become methods on the derived
-      // class which call the corresponding method of the base class by
-      // doing the proper casting.
-      for (UTL_ScopeActiveIterator si (ancestor, UTL_Scope::IK_decls);
-           !si.is_done ();
-           si.next ())
-        {
-          // Get the next AST decl node
-          AST_Decl *d = si.item ();
-          AST_Decl::NodeType nt = d->node_type ();
-
-          if (nt == AST_Decl::NT_op)
-            {
-              be_operation *op =
-                be_operation::narrow_from_decl (d);
-
-              /// These are not generated on the server side.
-              if (op->is_sendc_ami ())
-                {
-                  continue;
-                }
-
-              *os << be_nl_2
-                  << "// TAO_IDL - Generated from" << be_nl
-                  << "// " << __FILE__ << ":" << __LINE__
-                  << be_nl_2;
-
-              if (os->stream_type () == TAO_OutStream::TAO_SVR_HDR)
-                {
-                  // Generate the static method corresponding to this method.
-                  *os << "static void" << be_nl
-                      << d->local_name ()
-                      << "_skel (" << be_idt << be_idt_nl
-                      << "TAO_ServerRequest & server_request," << be_nl
-                      << "void * servant_upcall," << be_nl
-                      << "void * servant);" << be_uidt
-                      << be_uidt;
-                }
-              else
-                { // Generate code in the inline file.
-                  // Generate the static method corresponding to this method.
-                  *os << "ACE_INLINE" << be_nl
-                      << "void" << be_nl
-                      << derived->full_skel_name () << "::"
-                      << d->local_name ()
-                      << "_skel (" << be_idt_nl
-                      << "TAO_ServerRequest & server_request," << be_nl
-                      << "void * servant_upcall," << be_nl
-                      << "void * servant)"
-                      << be_uidt_nl
-                      << "{" << be_idt_nl;
-
-                   *os << ancestor->full_skel_name ()
-                      << " * const impl =" << be_idt_nl
-                      << "static_cast<"
-                      << derived->full_skel_name ()
-                      << " *> (servant);" << be_uidt_nl;
-
-                  *os << ancestor->full_skel_name ()
-                      << "::" << d->local_name ()
-                      << "_skel (" << be_idt_nl
-                      << "server_request," << be_nl
-                      << "servant_upcall," << be_nl
-                      << "impl);" << be_uidt
-                      << be_uidt_nl
-                      << "}";
-                }
-            }
-          else if (nt == AST_Decl::NT_attr)
-            {
-              AST_Attribute *attr = AST_Attribute::narrow_from_decl (d);
-
-              if (attr == 0)
-                {
-                  return -1;
-                }
-
-              *os << be_nl_2;
-
-              if (os->stream_type () == TAO_OutStream::TAO_SVR_HDR)
-                {
-                  // Generate the static method corresponding to this method.
-                  *os << "static void" << be_nl
-                      << "_get_" << d->local_name ()
-                      << "_skel (" << be_idt << be_idt_nl
-                      << "TAO_ServerRequest & server_request," << be_nl
-                      << "void * servant_upcall," << be_nl
-                      << "void * servant);" << be_uidt
-                      << be_uidt;
-                }
-              else
-                { // Generate code in the inline file.
-                  // Generate the static method corresponding to this method.
-                  *os << "ACE_INLINE" << be_nl
-                      << "void" << be_nl
-                      << derived->full_skel_name () << "::_get_"
-                      << d->local_name ()
-                      << "_skel (" << be_idt << be_idt_nl
-                      << "TAO_ServerRequest & server_request," << be_nl
-                      << "void * servant_upcall," << be_nl
-                      << "void * servant)" << be_uidt
-                      << be_uidt_nl
-                      << "{" << be_idt_nl;
-
-                   *os << ancestor->full_skel_name ()
-                      << " * const impl = static_cast<"
-                      << derived->full_skel_name ()
-                      << " *> (servant);" << be_nl;
-
-                  *os << ancestor->full_skel_name ()
-                      << "::_get_" << d->local_name ()
-                      << "_skel (" << be_idt << be_idt_nl
-                      << "server_request," << be_nl
-                      << "servant_upcall," << be_nl
-                      << "impl);" << be_uidt
-                      << be_uidt << be_uidt_nl
-                      << "}";
-                }
-
-              if (!attr->readonly ())
-                {
-                  *os << be_nl_2;
-
-                  if (os->stream_type () == TAO_OutStream::TAO_SVR_HDR)
-                    {
-                      // Generate the static method corresponding to
-                      // this method.
-                      *os << "static void" << be_nl
-                          << "_set_" << d->local_name ()
-                          << "_skel (" << be_idt << be_idt_nl
-                          << "TAO_ServerRequest & server_request," << be_nl
-                          << "void * servant_upcall," << be_nl
-                          << "void * servant);" << be_uidt
-                          << be_uidt;
-                    }
-                  else
-                    { // Generate code in the inline file.
-                      // Generate the static method corresponding to
-                      // this method.
-                      *os << "ACE_INLINE" << be_nl
-                          << "void" << be_nl
-                          << derived->full_skel_name ()
-                          << "::_set_" << d->local_name ()
-                          << "_skel (" << be_idt << be_idt_nl
-                          << "TAO_ServerRequest & server_request," << be_nl
-                          << "void * servant_upcall," << be_nl
-                          << "void * servant)" << be_uidt
-                          << be_uidt_nl
-                          << "{" << be_idt_nl;
-
-                      *os << ancestor->full_skel_name ()
-                          << " * const impl = static_cast<"
-                          << derived->full_skel_name ()
-                          << " *> (servant);" << be_nl;
-
-                      *os << ancestor->full_skel_name ()
-                          << "::_set_" << d->local_name ()
-                          << "_skel (" << be_idt << be_idt_nl
-                          << "server_request," << be_nl
-                          << "servant_upcall," << be_nl
-                          << "impl);" << be_uidt
-                          << be_uidt << be_uidt_nl
-                          << "}";
-                    }
-                }
-            }
-        } // End of FOR.
-    }
-
-  return 0;
-}
-
-int
-be_interface::gen_colloc_op_decl_helper (be_interface *derived,
-                                         be_interface *ancestor,
-                                         TAO_OutStream *os)
-{
-  // If derived and ancestor are same, skip it.
-  if (derived == ancestor)
-    {
-      return 0;
-    }
-
-  // If an operation or an attribute is abstract (declared in an
-  // abstract interface), we will either generate the full
-  // definition (if there are no concrete interfaces between the
-  // abstract ancestor and us) or, if there is a concrete ancestor
-  // in between, we will catch its definition elsewhere in this
-  // traversal.
-  if (ancestor->is_abstract () || ancestor->nmembers () == 0)
-    {
-      return 0;
-    }
-
-  for (UTL_ScopeActiveIterator si (ancestor, UTL_Scope::IK_decls);
-       !si.is_done ();
-       si.next ())
-    {
-      // Get the next AST decl node
-      AST_Decl *d = si.item ();
-
-      if (d->node_type () == AST_Decl::NT_op)
-        {
-          *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-              << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
-
-          // Generate the static method corresponding to this method.
-          *os << "static void" << be_nl
-              << d->local_name () << " (" << be_idt_nl
-              << "TAO_Abstract_ServantBase *servant, "
-              << "TAO::Argument **args);" << be_uidt_nl;
-        }
-      else if (d->node_type () == AST_Decl::NT_attr)
-        {
-          AST_Attribute *attr = AST_Attribute::narrow_from_decl (d);
-
-          if (attr == 0)
-            {
-              return -1;
-            }
-
-          // Generate the static method corresponding to this method.
-          *os << "static void" << be_nl
-              << "_get_" << d->local_name () << " (" << be_idt_nl
-              << "TAO_Abstract_ServantBase *servant, "
-              << "TAO::Argument **args);" << be_uidt_nl;
-
-          if (!attr->readonly ())
-            {
-              *os << be_nl_2;
-
-              // Generate the static method corresponding to
-              // this method.
-              *os << "static void" << be_nl
-                  << "_set_" << d->local_name () << " ("
-                  << be_idt_nl
-                  << "TAO_Abstract_ServantBase *servant, "
-                  << "TAO::Argument **args);" << be_uidt_nl;
-            }
-        }
-    }
-
-  return 0;
-}
-
-int
-be_interface::gen_colloc_op_defn_helper (be_interface *derived,
-                                         be_interface *ancestor,
-                                         TAO_OutStream *os)
-{
-  // If derived and ancestor are same, skip it.
-  if (derived == ancestor)
-    {
-      return 0;
-    }
-
-  // If an operation or an attribute is abstract (declared in an
-  // abstract interface), we will either generate the full
-  // definition (if there are no concrete interfaces between the
-  // abstract ancestor and us) or, if there is a concrete ancestor
-  // in between, we will catch its definition elsewhere in this
-  // traversal.
-  if (ancestor->is_abstract () || ancestor->nmembers () == 0)
-    {
-      return 0;
-    }
-
-  AST_Decl *d = 0;
-  be_operation *op = 0;
-
-  for (UTL_ScopeActiveIterator si (ancestor, UTL_Scope::IK_decls);
-       !si.is_done ();
-       si.next ())
-    {
-      // Get the next AST decl node
-      d = si.item ();
-      AST_Decl::NodeType nt = d->node_type ();
-
-      if (nt == AST_Decl::NT_op)
-        {
-          op = be_operation::narrow_from_decl (d);
-
-          /// Skip these on the skeleton side.
-          if (op->is_sendc_ami ())
-            {
-              continue;
-            }
-
-          if (be_global->gen_direct_collocation ())
-            {
-              be_interface::gen_collocated_skel_body (derived,
-                                                      ancestor,
-                                                      d,
-                                                      "",
-                                                      true,
-                                                      op->exceptions (),
-                                                      os);
-            }
-        }
-      else if (nt == AST_Decl::NT_attr)
-        {
-          AST_Attribute *attr = AST_Attribute::narrow_from_decl (d);
-
-          if (attr == 0)
-            {
-              return -1;
-            }
-
-          if (be_global->gen_direct_collocation ())
-            {
-              be_interface::gen_collocated_skel_body (
-                  derived,
-                  ancestor,
-                  d,
-                  "_get_",
-                  true,
-                  attr->get_get_exceptions (),
-                  os
-                );
-            }
-
-          if (!attr->readonly ())
-            {
-              if (be_global->gen_direct_collocation ())
-                {
-                  be_interface::gen_collocated_skel_body (
-                      derived,
-                      ancestor,
-                      d,
-                      "_set_",
-                      true,
-                      attr->get_set_exceptions (),
-                      os
-                    );
-                }
-            }
-        }
-    }
-
-  return 0;
-}
-
-int
 be_interface::copy_ctor_helper (be_interface *derived,
                                 be_interface *base,
                                 TAO_OutStream *os)
diff --git a/TAO/TAO_IDL/be/be_produce.cpp b/TAO/TAO_IDL/be/be_produce.cpp
index aa74be74b5c..9cd87e5a950 100644
--- a/TAO/TAO_IDL/be/be_produce.cpp
+++ b/TAO/TAO_IDL/be/be_produce.cpp
@@ -74,6 +74,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "be_extern.h"
 #include "fe_extern.h"
 #include "global_extern.h"
+#include "be_util.h"
 
 // Clean up before exit, whether successful or not.
 TAO_IDL_BE_Export void
@@ -185,13 +186,6 @@ BE_produce (void)
   be_visitor_root_sh root_sh_visitor (&ctx);
   BE_visit_root (root_sh_visitor, "server header");
 
-  if (be_global->gen_server_inline ())
-    {
-      ctx.state (TAO_CodeGen::TAO_ROOT_SI);
-      be_visitor_root_si root_si_visitor (&ctx);
-      BE_visit_root (root_si_visitor, "server inline");
-    }
-
   if (be_global->gen_server_skeleton ())
     {
       ctx.state (TAO_CodeGen::TAO_ROOT_SS);
@@ -228,6 +222,14 @@ BE_produce (void)
       ctx.state (TAO_CodeGen::TAO_ROOT_SVS);
       be_visitor_root_svs root_svs_visitor (&ctx);
       BE_visit_root (root_svs_visitor, "CIAO servant source");
+
+      ctx.state (TAO_CodeGen::TAO_ROOT_SVTH);
+      be_visitor_root_svth root_svth_visitor (&ctx);
+      BE_visit_root (root_svth_visitor, "CIAO template servant header");
+
+      ctx.state (TAO_CodeGen::TAO_ROOT_SVTS);
+      be_visitor_root_svts root_svts_visitor (&ctx);
+      BE_visit_root (root_svts_visitor, "CIAO template servant source");
     }
 
   if (be_global->gen_ciao_exec_idl ())
@@ -239,13 +241,17 @@ BE_produce (void)
 
   if (be_global->gen_ciao_exec_impl ())
     {
-      ctx.state (TAO_CodeGen::TAO_ROOT_EXH);
-      be_visitor_root_exh root_exh_visitor (&ctx);
-      BE_visit_root (root_exh_visitor, "CIAO exec impl header");
-
-      ctx.state (TAO_CodeGen::TAO_ROOT_EXS);
-      be_visitor_root_exs root_exs_visitor (&ctx);
-      BE_visit_root (root_exs_visitor, "CIAO exec impl source");
+      bool  generate = be_util::overwrite_ciao_exec_files ();
+      if(generate)
+        {
+          ctx.state (TAO_CodeGen::TAO_ROOT_EXH);
+          be_visitor_root_exh root_exh_visitor (&ctx);
+          BE_visit_root (root_exh_visitor, "CIAO exec impl header");
+
+          ctx.state (TAO_CodeGen::TAO_ROOT_EXS);
+          be_visitor_root_exs root_exs_visitor (&ctx);
+          BE_visit_root (root_exs_visitor, "CIAO exec impl source");
+        }
     }
 
   if (be_global->gen_ciao_conn_impl ())
diff --git a/TAO/TAO_IDL/be/be_provides.cpp b/TAO/TAO_IDL/be/be_provides.cpp
index 5c788a3ee39..938c66559b4 100644
--- a/TAO/TAO_IDL/be/be_provides.cpp
+++ b/TAO/TAO_IDL/be/be_provides.cpp
@@ -47,19 +47,18 @@ be_provides::provides_type (void) const
 }
 
 int
-be_provides::gen_facet_svnt_decl (TAO_OutStream &os)
+be_provides::gen_facet_svnt_tmpl_decl (TAO_OutStream &os)
 {
-   be_type *impl =
+  be_type *impl =
     be_type::narrow_from_decl (this->provides_type ());
 
-   if (impl->is_local () || impl->svnt_hdr_facet_gen ())
-     {
-       return 0;
-     }
+  if (impl->is_local () || impl->svnt_hdr_facet_gen ())
+    {
+      return 0;
+    }
 
-  // No '_cxx_' prefix>
   const char *lname =
-    impl->original_local_name ()->get_string ();
+    impl->local_name ()->get_string ();
 
   be_decl *scope =
     be_scope::narrow_from_scope (impl->defined_in ())->decl ();
@@ -74,31 +73,22 @@ be_provides::gen_facet_svnt_decl (TAO_OutStream &os)
      << "namespace CIAO_FACET" << suffix.c_str () << be_nl
      << "{" << be_idt_nl;
 
-  const char *impl_name = "::CORBA::Object";
   bool is_intf = impl->node_type () == AST_Decl::NT_interface;
 
-  if (is_intf)
-    {
-      impl_name =
-        be_interface::narrow_from_decl (impl)->full_skel_name ();
-    }
-
-  os << "class " << lname << "_Servant" << be_idt_nl
-     << ": public virtual " << impl_name << be_uidt_nl
-     << "{" << be_nl
+  os << "template <typename BASE, typename EXEC, typename CONTEXT>" << be_nl
+     << "class " << lname << "_Servant_T" << be_idt_nl
+     << ": public virtual ::CIAO::Facet_Servant_Base_T<BASE, EXEC, "
+     << "CONTEXT>" << be_uidt_nl << "{" << be_nl
      << "public:" << be_idt_nl;
 
   AST_Decl *s = ScopeAsDecl (impl->defined_in ());
   ACE_CString sname_str (s->full_name ());
-  const char *sname = sname_str.c_str ();
-  const char *global = (sname_str == "" ? "" : "::");
 
-  os << lname << "_Servant (" << be_idt_nl
-     << global << sname << "::CCM_"
-     << lname << "_ptr executor," << be_nl
+  os << lname << "_Servant_T (" << be_idt_nl
+     << "typename EXEC::_ptr_type executor," << be_nl
      << "::Components::CCMContext_ptr ctx);" << be_uidt_nl << be_nl;
 
-  os << "virtual ~" << lname << "_Servant (void);";
+  os << "virtual ~" << lname << "_Servant_T (void);";
 
   if (is_intf)
     {
@@ -124,20 +114,7 @@ be_provides::gen_facet_svnt_decl (TAO_OutStream &os)
         }
     }
 
-  os << be_nl_2 << "/// Get component implementation." << be_nl
-     << "virtual CORBA::Object_ptr _get_component (void);"
-     << be_uidt_nl << be_nl;
-
-  os << "protected:" << be_idt_nl;
-
-  os << "/// Facet executor." << be_nl
-     << global << sname << "::CCM_"
-     << lname << "_var executor_;" << be_nl_2;
-
-  os << "/// Context object." << be_nl
-     << "::Components::CCMContext_var ctx_;" << be_uidt_nl;
-
-  os << "};" << be_nl << be_uidt_nl;
+  os << be_uidt_nl << "};" << be_nl << be_uidt_nl;
 
   os << "}";
 
@@ -146,7 +123,7 @@ be_provides::gen_facet_svnt_decl (TAO_OutStream &os)
 }
 
 int
-be_provides::gen_facet_svnt_defn (TAO_OutStream &os)
+be_provides::gen_facet_svnt_tmpl_defn (TAO_OutStream &os)
 {
   be_type *impl =
     be_type::narrow_from_decl (this->provides_type ());
@@ -156,16 +133,14 @@ be_provides::gen_facet_svnt_defn (TAO_OutStream &os)
       return 0;
     }
 
-  // No '_cxx_' prefix.
   const char *lname =
-    impl->original_local_name ()->get_string ();
+    impl->local_name ()->get_string ();
 
   be_decl *scope =
     be_scope::narrow_from_scope (impl->defined_in ())->decl ();
 
   ACE_CString sname_str (scope->full_name ());
 
-  const char *sname = sname_str.c_str ();
   const char *global = (sname_str == "" ? "" : "::");
 
   ACE_CString suffix (scope->flat_name ());
@@ -179,22 +154,20 @@ be_provides::gen_facet_svnt_defn (TAO_OutStream &os)
      << "namespace CIAO_FACET" << suffix.c_str () << be_nl
      << "{" << be_idt_nl;
 
-  os << lname << "_Servant::"
-     << lname << "_Servant (" << be_idt << be_idt_nl
-     << global << sname << "::CCM_"
-     << lname << "_ptr executor," << be_nl
+  os << "template <typename BASE, typename EXEC, typename CONTEXT>" << be_nl
+     << lname << "_Servant_T<BASE, EXEC, CONTEXT>::"
+     << lname << "_Servant_T (" << be_idt << be_idt_nl
+     << "typename EXEC::_ptr_type executor," << be_nl
      << "::Components::CCMContext_ptr ctx)" << be_uidt_nl
-     << ": executor_ ( " << global << sname
-     << "::CCM_" << lname
-     << "::_duplicate (executor))," << be_idt_nl
-     << "ctx_ ( ::Components::CCMContext::_duplicate (ctx))"
-     << be_uidt << be_uidt_nl
+     << ": " << global << "CIAO::Facet_Servant_Base_T<BASE, EXEC, "
+     << "CONTEXT> (executor, ctx)"
+     << be_uidt_nl
      << "{" << be_nl
      << "}";
 
-  os << be_nl_2
-     << lname << "_Servant::~"
-     << lname << "_Servant (void)" << be_nl
+  os << be_nl_2 << "template <typename BASE, typename EXEC, typename CONTEXT>" << be_nl
+     << lname << "_Servant_T<BASE, EXEC, CONTEXT>::~"
+     << lname << "_Servant_T (void)" << be_nl
      << "{" << be_nl
      << "}";
 
@@ -233,35 +206,7 @@ be_provides::gen_facet_svnt_defn (TAO_OutStream &os)
         }
     }
 
-  os << be_nl_2
-     << "::CORBA::Object_ptr" << be_nl
-     << lname << "_Servant::_get_component (void)"
-     << be_nl
-     << "{" << be_idt_nl
-     << "::Components::" << be_global->ciao_container_type ()
-     << "Context_var sc =" << be_idt_nl
-     << "::Components::" << be_global->ciao_container_type ()
-     << "Context::_narrow (this->ctx_.in ());"
-     << be_uidt_nl << be_nl
-     << "if (! ::CORBA::is_nil (sc.in ()))" << be_idt_nl
-     << "{" << be_idt_nl;
-
-  if (ACE_OS::strcmp (be_global->ciao_container_type (), "Session") == 0)
-    {
-      os << "return sc->get_CCM_object ();";
-    }
-  else
-    {
-      os << "return ::CORBA::Object::_nil ();";
-    }
-
-  os << be_uidt_nl << "}" << be_uidt_nl << be_nl;
-
-  os << "throw ::CORBA::INTERNAL ();" << be_uidt_nl
-     << "}";
-
-  os << be_uidt_nl
-     << "}";
+  os << be_uidt_nl << "}";
 
   impl->svnt_src_facet_gen (true);
   return 0;
@@ -304,7 +249,7 @@ be_facet_op_attr_defn_helper::emit (be_interface * /* derived_interface */,
 
   be_visitor_context ctx;
   ctx.stream (os);
-  ctx.state (TAO_CodeGen::TAO_ROOT_SVS);
+  ctx.state (TAO_CodeGen::TAO_ROOT_SVTS);
 
   for (UTL_ScopeActiveIterator i (base_interface, UTL_Scope::IK_decls);
        !i.is_done ();
diff --git a/TAO/TAO_IDL/be/be_util.cpp b/TAO/TAO_IDL/be/be_util.cpp
index a3dd1bf7e12..4c5f786e8a1 100644
--- a/TAO/TAO_IDL/be/be_util.cpp
+++ b/TAO/TAO_IDL/be/be_util.cpp
@@ -789,6 +789,17 @@ be_util::usage (void)
     ));
   ACE_DEBUG ((
       LM_DEBUG,
+      ACE_TEXT (" -oE <output_dir>\tOutput directory for the generated ")
+      ACE_TEXT ("executor files, only when -Gex option is used.")
+      ACE_TEXT (" Default is current directory\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
+      ACE_TEXT (" -oN\tWhen -Gex option is used, executor files shouldn't be overwritten ")
+      ACE_TEXT ("if they are already in the output directory.\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
       ACE_TEXT (" -si\t\t\tServer's inline file name ending.")
       ACE_TEXT (" Default is S.inl\n")
     ));
@@ -847,16 +858,11 @@ be_util::usage (void)
   ACE_DEBUG ((
       LM_DEBUG,
       ACE_TEXT (" -SS\t\t\tsuppress generating skeleton implementation")
-      ACE_TEXT (" and inline file (disabled by default)\n")
-    ));
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT (" -Sci\t\t\tsuppress generating client inline file")
       ACE_TEXT (" (disabled by default)\n")
     ));
   ACE_DEBUG ((
       LM_DEBUG,
-      ACE_TEXT (" -Ssi\t\t\tsuppress generating server inline file")
+      ACE_TEXT (" -Sci\t\t\tsuppress generating client inline file")
       ACE_TEXT (" (disabled by default)\n")
     ));
   ACE_DEBUG ((
@@ -905,7 +911,8 @@ be_util::generator_init (void)
 
 const char *
 be_util::get_output_path (bool for_anyop,
-                          bool for_skel)
+                          bool for_skel,
+                          bool for_exec)
 {
   if (for_anyop && 0 != be_global->anyop_output_dir ())
     {
@@ -915,12 +922,46 @@ be_util::get_output_path (bool for_anyop,
     {
       return be_global->skel_output_dir ();
     }
+  else if (for_exec && 0 != be_global->exec_output_dir ())
+    {
+      return be_global->exec_output_dir ();
+    }
   else
     {
       return be_global->output_dir ();
     }
 }
 
+bool
+be_util::overwrite_ciao_exec_files ()
+{
+  bool overwrite = true;
+  if (be_global->overwrite_not_exec())
+    {
+      bool src_exist = false;
+      bool hdr_exist = false;
+      const char *fname_hdr = be_global->be_get_ciao_exec_hdr_fname (false);
+      FILE* fp_hdr = ACE_OS::fopen(fname_hdr, "r");
+      if (fp_hdr)
+        {
+          // file exists, don't generate new exec files.
+          ACE_OS::fclose(fp_hdr);
+          hdr_exist = true;
+        }
+      const char *fname_src = be_global->be_get_ciao_exec_src_fname (false);
+      FILE* fp_src = ACE_OS::fopen(fname_src, "r");
+      if (fp_src)
+        {
+          // file exists, don't generate new exec files.
+          ACE_OS::fclose(fp_src);
+          src_exist = true;
+        }
+      if (hdr_exist && src_exist)
+          overwrite = false;
+    }
+  return overwrite;
+}
+
 void
 be_util::set_arg_seen_bit (be_type *bt)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
index 13d35b9613b..6f9c00523c2 100644
--- a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
@@ -115,7 +115,6 @@ be_visitor_amh_pre_proc::visit_interface (be_interface *node)
   be_interface *response_handler =
     this->create_response_handler (node,
                                    excep_holder);
-
   if (response_handler == 0)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp b/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp
index 36e5969b365..db8b57209f1 100644
--- a/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp
@@ -171,12 +171,14 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
         status = get_op.accept (&visitor);
         break;
       }
+    case TAO_CodeGen::TAO_ROOT_SVTH:
     case TAO_CodeGen::TAO_ROOT_SVH:
       {
         be_visitor_operation_ch visitor (&ctx);
         status = get_op.accept (&visitor);
         break;
       }
+    case TAO_CodeGen::TAO_ROOT_SVTS:
     case TAO_CodeGen::TAO_ROOT_SVS:
       {
         be_visitor_operation_svs visitor (&ctx);
@@ -340,12 +342,14 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
         status = set_op.accept (&visitor);
         break;
       }
+    case TAO_CodeGen::TAO_ROOT_SVTH:
     case TAO_CodeGen::TAO_ROOT_SVH:
       {
         be_visitor_operation_ch visitor (&ctx);
         status = set_op.accept (&visitor);
         break;
       }
+    case TAO_CodeGen::TAO_ROOT_SVTS:
     case TAO_CodeGen::TAO_ROOT_SVS:
       {
         be_visitor_operation_svs visitor (&ctx);
diff --git a/TAO/TAO_IDL/be/be_visitor_component.cpp b/TAO/TAO_IDL/be/be_visitor_component.cpp
index a1e66d0c267..ac735c69cb9 100644
--- a/TAO/TAO_IDL/be/be_visitor_component.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component.cpp
@@ -66,11 +66,11 @@
 
 #include "be_visitor_component/component.cpp"
 #include "be_visitor_component/component_svh.cpp"
-#include "be_visitor_component/facet_svh.cpp"
+#include "be_visitor_component/facet_svth.cpp"
 #include "be_visitor_component/context_svh.cpp"
 #include "be_visitor_component/servant_svh.cpp"
 #include "be_visitor_component/component_svs.cpp"
-#include "be_visitor_component/facet_svs.cpp"
+#include "be_visitor_component/facet_svts.cpp"
 #include "be_visitor_component/context_svs.cpp"
 #include "be_visitor_component/servant_svs.cpp"
 #include "be_visitor_component/component_ex_idl.cpp"
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component.cpp b/TAO/TAO_IDL/be/be_visitor_component/component.cpp
index 204ff9b79ad..3e1d2b5ddf2 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component.cpp
@@ -117,7 +117,6 @@ be_visitor_component::visit_operation (be_operation *node)
     case TAO_CodeGen::TAO_ROOT_CDR_OP_CH:
     case TAO_CodeGen::TAO_ROOT_CDR_OP_CS:
     case TAO_CodeGen::TAO_ROOT_CI:
-    case TAO_CodeGen::TAO_ROOT_SI:
     case TAO_CodeGen::TAO_ROOT_SVH:
     case TAO_CodeGen::TAO_ROOT_SVS:
     case TAO_CodeGen::TAO_ROOT_EXH:
@@ -277,10 +276,11 @@ be_visitor_component::visit_typedef (be_typedef *node)
     case TAO_CodeGen::TAO_ROOT_SH:
     case TAO_CodeGen::TAO_ROOT_IH:
     case TAO_CodeGen::TAO_ROOT_IS:
-    case TAO_CodeGen::TAO_ROOT_SI:
     case TAO_CodeGen::TAO_ROOT_SS:
     case TAO_CodeGen::TAO_ROOT_SVH:
     case TAO_CodeGen::TAO_ROOT_SVS:
+    case TAO_CodeGen::TAO_ROOT_SVTH:
+    case TAO_CodeGen::TAO_ROOT_SVTS:
     case TAO_CodeGen::TAO_ROOT_EXH:
     case TAO_CodeGen::TAO_ROOT_EXS:
     case TAO_CodeGen::TAO_ROOT_CNH:
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp
index 1764e19a800..b6a57eaacd2 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp
@@ -47,18 +47,6 @@ be_visitor_component_svh::visit_component (be_component *node)
   /// code generation.
   node->scan (node);
 
-  // Generate the facet servant class declaration.
-  be_visitor_facet_svh facet_visitor (this->ctx_);
-
-  if (facet_visitor.visit_component_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_component_svh::")
-                         ACE_TEXT ("visit_component - ")
-                         ACE_TEXT ("facet visitor failed\n")),
-                        -1);
-    }
-
   /// CIDL-generated namespace used 'CIDL_' + composition name.
   /// Now we use 'CIAO_' + component's flat name.
   os_ << be_nl_2
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_svs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_svs.cpp
index 5e098aa39fa..3248f0e7a88 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_svs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_svs.cpp
@@ -43,17 +43,6 @@ be_visitor_component_svs::visit_component (be_component *node)
       return 0;
     }
 
-  be_visitor_facet_svs facet_visitor (this->ctx_);
-
-  if (facet_visitor.visit_component_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_component_svs::")
-                         ACE_TEXT ("visit_component - ")
-                         ACE_TEXT ("facet visitor failed\n")),
-                        -1);
-    }
-
   /// CIDL-generated namespace used 'CIDL_' + composition name.
   /// Now we use 'CIAO_' + component's flat name.
   os_ << be_nl_2
diff --git a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp
index 287ee04e09d..a9edd6fa9dc 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp
@@ -224,6 +224,7 @@ be_visitor_executor_exh::visit_component (be_component *node)
   return 0;
 }
 
+
 int
 be_visitor_executor_exh::visit_provides (be_provides *node)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_svth.cpp
index 4f279b95e07..8bfe0c7b184 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/facet_svh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/facet_svth.cpp
@@ -1,7 +1,7 @@
 
 //=============================================================================
 /**
- *  @file    facet_svh.cpp
+ *  @file    facet_svth.cpp
  *
  *  $Id$
  *
@@ -13,28 +13,40 @@
  */
 //=============================================================================
 
-be_visitor_facet_svh::be_visitor_facet_svh (be_visitor_context *ctx)
+be_visitor_facet_svth::be_visitor_facet_svth (be_visitor_context *ctx)
   : be_visitor_component_scope (ctx)
 {
 }
 
-be_visitor_facet_svh::~be_visitor_facet_svh (void)
+be_visitor_facet_svth::~be_visitor_facet_svth (void)
 {
 }
 
 int
-be_visitor_facet_svh::visit_provides (be_provides *node)
+be_visitor_facet_svth::visit_provides (be_provides *node)
 {
-  if (node->gen_facet_svnt_decl (os_) == -1)
+  if (node->gen_facet_svnt_tmpl_decl (os_) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_facet_svh")
+                         ACE_TEXT ("be_visitor_facet_svth")
                          ACE_TEXT ("::visit_provides - ")
                          ACE_TEXT ("gen_facet_svnt_decl() ")
                          ACE_TEXT ("failed\n")),
                         -1);
     }
+  return 0;
+}
+
+int
+be_visitor_facet_svth::visit_component (be_component *node)
+{
+  this->visit_component_scope (node);
 
   return 0;
 }
 
+int
+be_visitor_facet_svth::visit_connector (be_connector *node)
+{
+  return this->visit_component (node);
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_svs.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_svts.cpp
index c9127923226..6c403855962 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/facet_svs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/facet_svts.cpp
@@ -1,7 +1,7 @@
 
 //=============================================================================
 /**
- *  @file    facet_svs.cpp
+ *  @file    facet_svts.cpp
  *
  *  $Id$
  *
@@ -13,28 +13,41 @@
  */
 //=============================================================================
 
-be_visitor_facet_svs::be_visitor_facet_svs (be_visitor_context *ctx)
+be_visitor_facet_svts::be_visitor_facet_svts (be_visitor_context *ctx)
   : be_visitor_component_scope (ctx)
 {
 }
 
-be_visitor_facet_svs::~be_visitor_facet_svs (void)
+be_visitor_facet_svts::~be_visitor_facet_svts (void)
 {
 }
 
 int
-be_visitor_facet_svs::visit_provides (be_provides *node)
+be_visitor_facet_svts::visit_provides (be_provides *node)
 {
-  if (node->gen_facet_svnt_defn (os_) == -1)
+  if (node->gen_facet_svnt_tmpl_defn (os_) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_facet_svs")
+                         ACE_TEXT ("be_visitor_facet_svts")
                          ACE_TEXT ("::visit_provides - ")
                          ACE_TEXT ("gen_facet_svnt_defn() ")
                          ACE_TEXT ("failed\n")),
                         -1);
     }
+  return 0;
+}
 
+int
+be_visitor_facet_svts::visit_component (be_component *node)
+{
+  this->visit_component_scope (node);
   return 0;
 }
 
+int
+be_visitor_facet_svts::visit_connector (be_connector *node)
+{
+  return this->visit_component (node);
+}
+
+
diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp
index 0709be18cd0..315309b808e 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp
@@ -140,6 +140,7 @@ be_visitor_servant_svh::visit_attribute (be_attribute *node)
   return v.visit_attribute (node);
 }
 
+
 int
 be_visitor_servant_svh::visit_provides (be_provides *node)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp
index f099df71945..d86de6b4ae1 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp
@@ -1,4 +1,3 @@
-
 //=============================================================================
 /**
  *  @file    servant_svs.cpp
@@ -12,6 +11,7 @@
  *  @author Jeff Parsons
  */
 //=============================================================================
+#include <be_helper.h>
 
 be_visitor_servant_svs::be_visitor_servant_svs (be_visitor_context *ctx)
   : be_visitor_component_scope (ctx),
@@ -308,13 +308,25 @@ be_visitor_servant_svs::visit_provides (be_provides *node)
         << "PortableServer::POA_var POA = cnt_safe->the_port_POA ();" << be_nl
         << "::CORBA::Object_var tmp =" << be_idt_nl
         << "this->get_facet_executor (\"" << port_name << "\");"<< be_uidt_nl << be_nl
-        << "::CIAO_FACET" << prefix_connector
-        << scope->flat_name () << "::" << lname
-        << "_Servant *" << port_name << "_servant_impl = " << be_idt_nl
-        << "new ::CIAO_FACET" << prefix_connector
-        << scope->flat_name () << "::" << lname
-        << "_Servant ("<< global << sname << "::CCM_" << lname << "::_narrow (tmp.in())," << be_nl
-        << "this->context_);" << be_uidt_nl << be_nl
+        << global << sname << "::CCM_" << lname << "_var tmp_var = " << be_idt_nl
+        << global << sname <<"::CCM_" << lname
+        << "::_narrow (tmp.in());" << be_uidt_nl << be_nl
+        << "typedef " << global << "CIAO_FACET" << prefix_connector
+        << scope->flat_name () << "::" << obj->local_name () << "_Servant_T <" << be_idt_nl
+        << "POA_" << sname << global << obj->local_name ()
+        << "," << be_nl << global << sname <<"::CCM_" << lname << "," << be_nl
+        << global << "Components::" << be_global->ciao_container_type ()
+        << "Context>" << be_idt_nl << lname
+        << "_type;" << be_uidt_nl << be_uidt_nl
+        << lname << "_type *" << port_name << "_servant_impl = 0;" << be_nl
+        << "ACE_NEW_THROW_EX (" << be_idt_nl
+        << port_name << "_servant_impl," << be_nl
+        << lname << "_type (" << be_idt_nl
+        << "tmp_var.in(), " << be_nl
+        << "this->context_)," << be_uidt_nl
+        << "CORBA::NO_MEMORY ());" << be_uidt_nl << be_nl
+        << "PortableServer::ServantBase_var safe_base_servant ("
+        << port_name << "_servant_impl);" << be_nl << be_nl
         << "PortableServer::ObjectId_var " << port_name << "_servant_oid =" << be_idt_nl
         << "PortableServer::string_to_ObjectId (obj_id.c_str());" << be_uidt_nl << be_nl
         << "POA->activate_object_with_id(" << port_name << "_servant_oid.in(),"
diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp
index 0fed23db173..624f08c864d 100644
--- a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp
@@ -1,17 +1,18 @@
 
 //=============================================================================
 /**
- *  @file    connactor_ami_exs.cpp
+ *  @file    connector_ami_exs.cpp
  *
  *  $Id$
  *
- * Visitor generating code for AMI4CCM Connectors in the exec
+ *  Visitor generating code for AMI4CCM Connectors in the exec
  *  impl source.
- **
+ *
  *
  *  @author Jeff Parsons
  */
 //=============================================================================
+
 be_visitor_connector_ami_exs::be_visitor_connector_ami_exs (
       be_visitor_context *ctx)
   : be_visitor_component_scope (ctx)
@@ -91,4 +92,3 @@ be_visitor_connector_ami_exs::gen_entrypoint (void)
       << "}";
 }
 
-
diff --git a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp
index ffeb3b78885..be124fd2dbf 100644
--- a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp
@@ -307,7 +307,7 @@ be_visitor_facet_ami_exs::gen_reply_handler_class (void)
 
   Facet_AMI_Exec_Op_Attr_Generator op_attr_gen (this);
 
-  int status =
+  int const status =
     callback_iface->traverse_inheritance_graph (
       op_attr_gen,
       &os_,
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
index 6c2dbd5b4ae..38979db785e 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
@@ -54,9 +54,9 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
           << "template<>" << be_nl
           << "::CORBA::Boolean" << be_nl
           << "Any_Dual_Impl_T<" << node->name ()
-          << ">::demarshal_value (" << be_idt << be_idt_nl
-          << "TAO_InputCDR & cdr" << be_uidt_nl
-          << ")" << be_uidt_nl
+          << ">::demarshal_value ("
+          << "TAO_InputCDR & cdr"
+          << ")" << be_nl
           << "{" << be_idt_nl
           << "::CORBA::String_var id;" << be_nl_2
           << "if (!(cdr >> id.out ()))" << be_idt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
index ed83ceca8a5..2996ce87e57 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
@@ -277,6 +277,27 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       *os << "}" << be_nl_2;
     }
 
+  if ((ACE_OS::strcmp (node->full_name (), "CORBA::InvalidPolicies") == 0) ||
+      (ACE_OS::strcmp (node->full_name (), "CORBA::PolicyError") == 0))
+    {
+      *os << "// TAO extension - the virtual _type method." << be_nl
+          << "::CORBA::TypeCode_ptr " << node->name ()
+          << "::_tao_type (void) const" << be_nl
+          << "{" << be_idt_nl
+          << "TAO_AnyTypeCode_Adapter *adapter =" << be_idt_nl
+          << "ACE_Dynamic_Service<TAO_AnyTypeCode_Adapter>::instance ("
+          << "\"AnyTypeCode_Adapter\");" << be_uidt_nl
+          << "if (adapter == 0)" << be_idt_nl
+          << "{" << be_idt_nl
+          << "ACE_ERROR_RETURN ((LM_ERROR," << be_idt_nl
+          << "ACE_TEXT (\"TAO \")," << be_nl
+          << "ACE_TEXT (\"Unable to find the \")" << be_nl
+          << "ACE_TEXT (\"AnyTypeCode Adapter instance\")), 0);" << be_uidt << be_uidt_nl
+          << "}" << be_uidt_nl
+          << "return adapter->_tao_type_" << node->local_name () <<  "();" << be_uidt_nl
+          << "}";
+    }
+
   // Switch streams to the *A.cpp file if we are using this option.
   if (be_global->gen_anyop_files ())
     {
@@ -284,14 +305,18 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       *os << be_nl_2;
     }
 
-  if (be_global->tc_support ())
+  if ((ACE_OS::strcmp (node->full_name (), "CORBA::InvalidPolicies") != 0) &&
+      (ACE_OS::strcmp (node->full_name (), "CORBA::PolicyError") != 0))
     {
-      *os << "// TAO extension - the virtual _type method." << be_nl;
-      *os << "::CORBA::TypeCode_ptr " << node->name ()
-          << "::_tao_type (void) const" << be_nl;
-      *os << "{" << be_idt_nl;
-      *os << "return ::" << node->tc_name () << ";" << be_uidt_nl;
-      *os << "}";
+      if (be_global->tc_support ())
+        {
+          *os << "// TAO extension - the virtual _type method." << be_nl;
+          *os << "::CORBA::TypeCode_ptr " << node->name ()
+              << "::_tao_type (void) const" << be_nl;
+          *os << "{" << be_idt_nl;
+          *os << "return ::" << node->tc_name () << ";" << be_uidt_nl;
+          *os << "}";
+        }
     }
 
   // Make sure we are generating to *C.cpp regardless of the above.
diff --git a/TAO/TAO_IDL/be/be_visitor_interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface.cpp
index 76d01092d19..b77d531b463 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface.cpp
@@ -64,7 +64,6 @@
 #include "be_visitor_interface/interface_cs.cpp"
 #include "be_visitor_interface/interface_sh.cpp"
 #include "be_visitor_interface/interface_ih.cpp"
-#include "be_visitor_interface/interface_si.cpp"
 #include "be_visitor_interface/interface_ss.cpp"
 #include "be_visitor_interface/interface_is.cpp"
 #include "be_visitor_interface/interface_ex_idl.cpp"
@@ -91,7 +90,6 @@
 // AMH
 #include "be_visitor_interface/amh_ch.cpp"
 #include "be_visitor_interface/amh_ss.cpp"
-#include "be_visitor_interface/amh_si.cpp"
 #include "be_visitor_interface/amh_sh.cpp"
 #include "be_visitor_interface/amh_rh_ss.cpp"
 #include "be_visitor_interface/amh_rh_sh.cpp"
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
index 13e39657395..4a969a016e1 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
@@ -118,58 +118,11 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node)
       << be_nl
       << "virtual ::CORBA::Boolean _is_a (const char* logical_type_id);" << be_nl_2;
 
-  // Add a skeleton for our _is_a method.
-  *os << "static void _is_a_skel (" << be_idt << be_idt_nl
-      << "TAO_ServerRequest &req," << be_nl
-      << "void *obj," << be_nl
-      << "void *servant_upcall" << be_uidt_nl
-      << ");" << be_uidt_nl << be_nl;
-
-  if (!be_global->gen_minimum_corba ())
-    {
-      // Add a skeleton for our _non_existent method.
-      *os << "static void _non_existent_skel (" << be_idt << be_idt_nl
-          << "TAO_ServerRequest &req," << be_nl
-          << "void *obj," << be_nl
-          << "void *servant_upcall" << be_uidt_nl
-          << ");" << be_uidt_nl << be_nl;
-    }
-
-  if (!be_global->gen_corba_e () && !be_global->gen_minimum_corba ())
-    {
-      // Add a skeleton for our _interface method.
-      *os << "static void _interface_skel (" << be_idt << be_idt_nl
-          << "TAO_ServerRequest &req," << be_nl
-          << "void *obj," << be_nl
-          << "void *servant_upcall" << be_uidt_nl
-          << ");" << be_uidt_nl << be_nl;
-    }
-
-  if (!be_global->gen_corba_e () && !be_global->gen_minimum_corba ())
-    {
-      // Add a skeleton for our _component method.
-      *os << "static void _component_skel (" << be_idt << be_idt_nl
-          << "TAO_ServerRequest &req," << be_nl
-          << "void *obj," << be_nl
-          << "void *servant_upcall" << be_uidt_nl
-          << ");" << be_uidt_nl << be_nl;
-    }
-
-  if (!be_global->gen_minimum_corba ())
-    {
-      // Add a skeleton for our _repository_id method.
-      *os << "static void _repository_id_skel (" << be_idt << be_idt_nl
-          << "TAO_ServerRequest &req," << be_nl
-          << "void *obj," << be_nl
-          << "void *servant_upcall" << be_uidt_nl
-          << ");" << be_uidt_nl << be_nl;
-    }
-
   // Add the dispatch method.
   *os << "virtual void _dispatch (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
-      << "void *_servant_upcall" << be_uidt_nl
-      << ");" << be_uidt_nl << be_nl;
+      << "TAO::Portable_Server::Servant_Upcall *_servant_upcall);" << be_uidt
+      << be_uidt_nl << be_nl;
 
   this->this_method (node);
 
@@ -187,18 +140,6 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node)
                         -1);
     }
 
-  // Generate skeletons for operations of our base classes. These
-  // skeletons just cast the pointer to the appropriate type
-  // before invoking the call.
-  if (node->traverse_inheritance_graph (be_interface::gen_skel_helper, os) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_amh_interface_sh::"
-                         "visit_interface - "
-                         "inheritance graph traversal failed\n"),
-                        -1);
-    }
-
   *os << be_uidt_nl
       << "};";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp
deleted file mode 100644
index 11b3910effa..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-//=============================================================================
-/**
-*  @file   amh_si.cpp
-*
-*  $Id$
-*
-*  Specialized interface visitor for AMH generates code that is
-*  specific to AMH interfaces.
-*
-*  @author Jeff Parsons <j.parsons@vanderbilt.edu>
-*/
-//=============================================================================
-
-be_visitor_amh_interface_si::be_visitor_amh_interface_si (
-    be_visitor_context *ctx)
-  : be_visitor_interface_si (ctx)
-{
-}
-
-be_visitor_amh_interface_si::~be_visitor_amh_interface_si (void)
-{
-}
-
-int
-be_visitor_amh_interface_si::visit_interface (be_interface *node)
-{
-  if (node->srv_inline_gen () || node->imported () || node->is_local ())
-    {
-      return 0;
-    }
-
-  // Do not generate AMH classes for any sort of implied IDL.
-  if (node->original_interface () != 0)
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  int status =
-    node->traverse_inheritance_graph (
-              be_visitor_amh_interface_si::gen_skel_helper, os);
-
-  if (status == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_amh_interface_si::"
-                         "visit_interface - "
-                         "inheritance graph traversal failed\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived,
-                                              be_interface *ancestor,
-                                              TAO_OutStream *os)
-{
-  // If derived and ancestor are same, skip it.
-  if (derived == ancestor)
-    {
-      return 0;
-    }
-
-  // If an operation or an attribute is abstract (declared in an
-  // abstract interface), we will either generate the full
-  // definition (if there are no concrete interfaces between the
-  // abstract ancestor and us) or, if there is a concrete ancestor
-  // in between, we will catch its definition elsewhere in this
-  // traversal.
-  if (ancestor->is_abstract ())
-    {
-      return 0;
-    }
-
-  // Else generate code that does the cast to the appropriate type.
-
-  if (ancestor->nmembers () > 0)
-    {
-      // If there are elements in ancestor scope i.e., any operations and
-      // attributes defined by "ancestor", become methods on the derived class
-      // which call the corresponding method of the base class by doing the
-      // proper casting.
-
-      ACE_CString ancestor_name ("POA_");
-      char *buf = 0;
-      ancestor->compute_full_name ("AMH_", "", buf);
-      ancestor_name += buf;
-      // buf was allocated by ACE_OS::strdup, so we need to use free instead
-      // of delete.
-      ACE_OS::free (buf);
-      buf = 0;
-
-      const char *ancestor_amh_name = ancestor_name.fast_rep ();
-
-      ACE_CString derived_name ("POA_");
-      derived->compute_full_name ("AMH_", "", buf);
-      derived_name += buf;
-      // buf was allocated by ACE_OS::strdup, so we need to use free instead
-      // of delete.
-      ACE_OS::free (buf);
-      buf = 0;
-
-      const char *derived_amh_name = derived_name.fast_rep ();
-
-      for (UTL_ScopeActiveIterator si (ancestor, UTL_Scope::IK_decls);
-           !si.is_done ();
-           si.next ())
-        {
-          // Get the next AST decl node
-          AST_Decl *d = si.item ();
-          AST_Decl::NodeType nt = d->node_type ();
-
-          if (nt == AST_Decl::NT_op)
-            {
-              be_operation *op =
-                be_operation::narrow_from_decl (d);
-
-              /// These implied IDL operations are for stub-side only.
-              if (op->is_sendc_ami ())
-                {
-                  continue;
-                }
-
-              *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
-                  << "// " << __FILE__ << ":" << __LINE__;
-
-              *os << be_nl_2;
-
-              // Generate code in the inline file.
-              // Generate the static method corresponding to this method.
-              *os << "ACE_INLINE" << be_nl
-                  << "void" << be_nl
-                  << derived_amh_name << "::"
-                  << d->local_name ()
-                  << "_skel (" << be_idt << be_idt_nl
-                  << "TAO_ServerRequest & req," << be_nl
-                  << "void * context," << be_nl
-                  << "void * obj)" << be_uidt
-                  << be_uidt_nl
-                  << "{" << be_idt_nl;
-              *os << ancestor_amh_name
-                  << "* const impl = static_cast<"
-                  << derived_amh_name
-                  << " *> (obj);" << be_nl;
-              *os << ancestor_amh_name
-                  << "::" << d->local_name ()
-                  << "_skel (" << be_idt_nl
-                  << "req," << be_nl
-                  << "context," << be_nl
-                  << "impl);" << be_uidt
-                  << be_uidt_nl
-                  << "}";
-            }
-          else if (nt == AST_Decl::NT_attr)
-            {
-              be_attribute *attr = be_attribute::narrow_from_decl (d);
-
-              if (attr == 0)
-                {
-                  return -1;
-                }
-
-              *os << be_nl_2;
-
-              // Generate code in the inline file.
-              // Generate the static method corresponding to this method.
-              *os << "ACE_INLINE" << be_nl
-                  << "void" << be_nl
-                  << derived_amh_name << "::_get_"
-                  << d->local_name ()
-                  << "_skel (" << be_idt << be_idt_nl
-                  << "TAO_ServerRequest & req," << be_nl
-                  << "void * context," << be_nl
-                  << "void * obj)" << be_uidt
-                  << be_uidt_nl
-                  << "{" << be_idt_nl;
-
-               *os << ancestor_amh_name
-                  << "* const impl = static_cast<"
-                  << derived_amh_name
-                  << " *> (obj);" << be_nl;
-
-              *os << ancestor_amh_name
-                  << "::_get_" << d->local_name ()
-                  << "_skel (" << be_idt << be_idt_nl
-                  << "req," << be_nl
-                  << "context," << be_nl
-                  << "impl);" << be_uidt
-                  << be_uidt << be_uidt_nl
-                  << "}";
-
-              if (!attr->readonly ())
-                {
-                  *os << be_nl_2;
-
-                  // Generate code in the inline file.
-                  // Generate the static method corresponding to
-                  // this method.
-                  *os << "ACE_INLINE" << be_nl
-                      << "void" << be_nl
-                      << derived_amh_name
-                      << "::_set_" << d->local_name ()
-                      << "_skel (" << be_idt << be_idt_nl
-                      << "TAO_ServerRequest & req," << be_nl
-                      << "void * context," << be_nl
-                      << "void * obj)" << be_uidt
-                      << be_uidt_nl
-                      << "{" << be_idt_nl;
-
-                   *os << ancestor_amh_name
-                      << "* const impl = static_cast<"
-                      << derived_amh_name
-                      << " *> (obj);" << be_nl;
-
-                  *os << ancestor_amh_name
-                      << "::_set_" << d->local_name ()
-                      << "_skel (" << be_idt << be_idt_nl
-                      << "req," << be_nl
-                      << "context," << be_nl
-                      << "impl);" << be_uidt
-                      << be_uidt << be_uidt_nl
-                      << "}";
-                }
-            }
-        } // End of FOR
-    }
-
-  return 0;
-}
-
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
index bba533b2f72..41d97645066 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
@@ -118,25 +118,18 @@ be_visitor_amh_interface_ss::dispatch_method (be_interface *node)
 
   *os << "void" << be_nl
       << full_skel_name << "::_dispatch (" << be_idt << be_idt_nl
-      << "TAO_ServerRequest & req," << be_nl
-      << "void * context" << be_uidt_nl
-      << ")" << be_uidt_nl
+      << "TAO_ServerRequest &req," << be_nl
+      << "TAO::Portable_Server::Servant_Upcall *context)" << be_uidt
+      << be_uidt_nl
       << "{" << be_idt_nl
-      << "this->asynchronous_upcall_dispatch (" << be_idt << be_idt_nl
-      << "req," << be_nl
-      << "context," << be_nl
-      << "this" << be_uidt_nl
-      << ");" << be_uidt << be_uidt_nl
+      << "this->asynchronous_upcall_dispatch ("
+      << "req,"
+      << "context,"
+      << "this"
+      << ");" << be_uidt_nl
       << "}";
 }
 
-void
-be_visitor_amh_interface_ss::generate_send_reply (TAO_OutStream * os)
-{
-  *os << be_nl_2
-      << "server_request.tao_send_reply ();";
-}
-
 int
 be_visitor_amh_interface_ss::generate_amh_classes (be_interface *)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
index 6426205be58..4766f0afb9a 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
@@ -91,23 +91,6 @@ be_visitor_interface_direct_proxy_impl_sh::visit_interface (
                         -1);
     }
 
-  // Generate static collocated operations for operations of our base
-  // classes.
-  int status =
-    node->traverse_inheritance_graph (
-              be_interface::gen_colloc_op_decl_helper,
-              os
-            );
-
-  if (status == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_interface_direct_proxy_impl_sh::"
-                         "visit_interface - "
-                         "inheritance graph traversal failed\n"),
-                        -1);
-    }
-
   *os << be_uidt_nl
       << "};" << be_nl_2
       << "//" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
index 2881de3760a..345e80863bc 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
@@ -497,7 +497,6 @@ be_visitor_interface::visit_operation (be_operation *node)
     case TAO_CodeGen::TAO_ROOT_CDR_OP_CH:
     case TAO_CodeGen::TAO_ROOT_CDR_OP_CS:
     case TAO_CodeGen::TAO_ROOT_CI:
-    case TAO_CodeGen::TAO_ROOT_SI:
       return 0; // nothing to be done
     default:
       {
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
index c7f2c0abd69..eb9bfbe2caf 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -158,11 +158,21 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
   *os << "virtual const char* _interface_repository_id "
       << "(void) const;";
 
-  // The virtual marshal method, to prevent marshal of local iterfaces.
+  // The virtual marshal method, to prevent marshal of local interfaces.
   *os << be_nl
       << "virtual ::CORBA::Boolean marshal "
       << "(TAO_OutputCDR &cdr);";
 
+  // If we are generating CORBA Policy we need to add some more methods
+  if (ACE_OS::strcmp (node->full_name (), "CORBA::Policy") == 0)
+    {
+      *os << be_nl
+          << "virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &);" << be_nl
+          << "virtual CORBA::Boolean _tao_decode (TAO_InputCDR &);" << be_nl
+          << "virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;" << be_nl
+          << "virtual TAO_Policy_Scope _tao_scope (void) const;" << be_nl;
+    }
+
   if (c == 0 && be_global->gen_ostream_operators ())
     {
       *os << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
index e4944a84974..554c40f5875 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
@@ -91,9 +91,9 @@ be_visitor_interface_ci::visit_interface (be_interface *node)
           << be_idt << be_idt_nl
           << "::IOP::IOR *ior," << be_nl
           << "TAO_ORB_Core *oc)" << be_uidt_nl;
-      *os << ": ::CORBA::Object (ior, oc)" << be_idt_nl;
+      *os << ": ::CORBA::Object (ior, oc)";
 
-      *os << be_uidt << be_uidt_nl
+      *os << be_uidt_nl
           << "{" << be_nl
           << "}" ;
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
index 0680d6e970b..fb2d3352040 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -101,6 +101,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << "{" << be_idt_nl
           << "return ";
 
+
       if (node->is_abstract () || c != 0)
         {
           *os << "cdr << p;";
@@ -114,6 +115,32 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << "}";
     }
 
+  // If we are generating CORBA Policy we need to add some more methods
+  if (ACE_OS::strcmp (node->full_name (), "CORBA::Policy") == 0)
+    {
+      *os << be_nl
+          << "CORBA::Boolean" << be_nl
+          << "CORBA::Policy::_tao_encode (TAO_OutputCDR &)" << be_nl
+          << "{" << be_nl
+          << "  return false;" << be_nl
+          << "}" << be_nl << be_nl
+          << "CORBA::Boolean" << be_nl
+          << "CORBA::Policy::_tao_decode (TAO_InputCDR &)" << be_nl
+          << "{" << be_nl
+          << "  return false;" << be_nl
+          << "}" << be_nl << be_nl
+          << "TAO_Cached_Policy_Type" << be_nl
+          << "CORBA::Policy::_tao_cached_type (void) const" << be_nl
+          << "{" << be_nl
+            << "return TAO_CACHED_POLICY_UNCACHED;" << be_nl
+          << "}" << be_nl << be_nl
+          << "TAO_Policy_Scope" << be_nl
+          << "CORBA::Policy::_tao_scope (void) const" << be_nl
+          << "{" << be_nl
+          << "  return TAO_POLICY_DEFAULT_SCOPE;" << be_nl
+          << "}" << be_nl;
+    }
+
   if (c == 0 && be_global->gen_ostream_operators ())
     {
       *os << be_nl_2
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
index ece9840819c..25018bb4a05 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
@@ -127,60 +127,10 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
   // _is_a
   *os << "virtual ::CORBA::Boolean _is_a (const char* logical_type_id);" << be_nl_2;
 
-  // Add a skeleton for our _is_a method.
-  *os << "static void _is_a_skel (" << be_idt << be_idt_nl
-      << "TAO_ServerRequest & req," << be_nl
-      << "void * servant_upcall," << be_nl
-      << "void * servant);" << be_uidt
-      << be_uidt_nl << be_nl;
-
-  if (!be_global->gen_minimum_corba ())
-    {
-      // Add a skeleton for our _non_existent method.
-      *os << "static void _non_existent_skel ("
-          << be_idt << be_idt_nl
-          << "TAO_ServerRequest & req," << be_nl
-          << "void * servant_upcall," << be_nl
-          << "void * servant);" << be_uidt
-          << be_uidt_nl << be_nl;
-    }
-
-  if (!be_global->gen_corba_e () && !be_global->gen_minimum_corba ())
-    {
-      // Add a skeleton for our _interface method.
-      *os << "static void _interface_skel ("
-          << be_idt << be_idt_nl
-          << "TAO_ServerRequest & req," << be_nl
-          << "void * servant_upcall," << be_nl
-          << "void * servant);" << be_uidt
-          << be_uidt_nl << be_nl;
-    }
-
-  if (!be_global->gen_corba_e () && !be_global->gen_minimum_corba ())
-    {
-      // Add a skeleton for our _component method.
-      *os << "static void _component_skel (" << be_idt << be_idt_nl
-          << "TAO_ServerRequest & req," << be_nl
-          << "void * servant_upcall," << be_nl
-          << "void * servant);" << be_uidt
-          << be_uidt_nl << be_nl;
-    }
-
-  if (!be_global->gen_minimum_corba ())
-    {
-      // Add a skeleton for our _repository_id method.
-      *os << "static void _repository_id_skel ("
-          << be_idt << be_idt_nl
-          << "TAO_ServerRequest & req," << be_nl
-          << "void * servant_upcall," << be_nl
-          << "void * servant);" << be_uidt
-          << be_uidt_nl << be_nl;
-    }
-
   // Add the dispatch method.
   *os << "virtual void _dispatch (" << be_idt << be_idt_nl
       << "TAO_ServerRequest & req," << be_nl
-      << "void * servant_upcall);" << be_uidt
+      << "TAO::Portable_Server::Servant_Upcall *servant_upcall);" << be_uidt
       << be_uidt_nl << be_nl;
 
   this->this_method (node);
@@ -200,24 +150,6 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
                         -1);
     }
 
-  // Generate skeletons for operations of our base classes. These
-  // skeletons just cast the pointer to the appropriate type
-  // before invoking the call.
-  int const status =
-    node->traverse_inheritance_graph (
-              be_interface::gen_skel_helper,
-              os);
-
-  if (status == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_interface_sh::")
-                         ACE_TEXT ("visit_interface - ")
-                         ACE_TEXT ("inheritance graph ")
-                         ACE_TEXT ("traversal failed\n")),
-                        -1);
-    }
-
   *os << be_uidt_nl << "};";
 
   be_visitor_context ctx (*this->ctx_);
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp
deleted file mode 100644
index 465650b6dc1..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-
-//=============================================================================
-/**
- *  @file    interface_si.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Interfaces in the server inline file
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
-// ************************************************************************
-// Interface visitor for server inline
-// ************************************************************************
-
-be_visitor_interface_si::be_visitor_interface_si (be_visitor_context *ctx)
-  : be_visitor_interface (ctx)
-{
-}
-
-be_visitor_interface_si::~be_visitor_interface_si (void)
-{
-}
-
-int
-be_visitor_interface_si::visit_interface (be_interface *node)
-{
-  if (node->srv_inline_gen ()
-      || node->imported ()
-      || node->is_local ()
-      || node->is_abstract ())
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // Determine if we are in some form of a multiple inheritance.
-  int status =
-    node->traverse_inheritance_graph (be_interface::in_mult_inheritance_helper,
-                                      0);
-
-  if (status == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_interface_si::")
-                         ACE_TEXT ("visit_interface ")
-                         ACE_TEXT ("error determining mult ")
-                         ACE_TEXT ("inheritance\n")),
-                        -1);
-    }
-
-  // Generate skeletons for operations of our base classes. These skeletons
-  // just cast the pointer to the appropriate type before invoking the
-  // call. Hence we generate these in the inline file.
-  status = node->traverse_inheritance_graph (be_interface::gen_skel_helper,
-                                             os);
-  if (status == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_interface_si::")
-                         ACE_TEXT ("visit_interface - ")
-                         ACE_TEXT ("codegen for base ")
-                         ACE_TEXT ("class skeletons failed\n")),
-                        -1);
-    }
-
-  if (this->generate_amh_classes (node) == -1)
-    {
-      return -1;
-    }
-
-  if (be_global->gen_direct_collocation ())
-    {
-      status =
-        node->traverse_inheritance_graph (
-            be_interface::gen_colloc_op_defn_helper,
-            os);
-
-      if (status == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("be_visitor_interface_si::")
-                             ACE_TEXT ("visit_interface - ")
-                             ACE_TEXT ("codegen for collocated base ")
-                             ACE_TEXT ("class skeletons failed\n")),
-                            -1);
-        }
-    }
-
-  return 0;
-}
-
-int
-be_visitor_interface_si::visit_component (be_component *node)
-{
-  return this->visit_interface (node);
-}
-
-int
-be_visitor_interface_si::visit_connector (be_connector *node)
-{
-  return this->visit_interface (node);
-}
-
-int
-be_visitor_interface_si::generate_amh_classes (be_interface *node)
-{
-  // We have to check for an abstract ancestor until AMH is integrated
-  // with abstract interfaces. If the node itself is abstract, this
-  // visitor would not be created.
-  if (be_global->gen_amh_classes () && !node->has_mixed_parentage ())
-    {
-      be_visitor_amh_interface_si amh_intf (this->ctx_);
-      return amh_intf.visit_interface (node);
-    }
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
index 4298c71e52f..6528801c099 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -55,7 +55,6 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
     {
       return -1;
     }
-
   ACE_CString full_skel_name_holder =
     this->generate_full_skel_name (node);
 
@@ -171,514 +170,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
 
   *os << be_nl_2;
 
-  // Generate code for the _is_a skeleton.
-  {
-    be_predefined_type rt (AST_PredefinedType::PT_boolean, 0);
-    // @@ Cheat a little by placing a space before the operation name
-    //    to prevent the IDL compiler from interpreting the leading
-    //    underscore as an IDL escape.
-    Identifier op_name (" _is_a");
-    UTL_ScopedName scoped_name (&op_name, 0);
-    be_operation is_a (&rt,
-                       AST_Operation::OP_noflags,
-                       &scoped_name,
-                       node->is_local (),
-                       node->is_abstract ());
-    is_a.set_defined_in (node);
-
-    ACE_CDR::ULong bound = 0UL;
-
-    auto_ptr<AST_String> s (
-      idl_global->gen ()->create_string (
-        idl_global->gen ()->create_expr (bound,
-                                         AST_Expression::EV_ulong)));
-
-    Identifier arg_name ("repository_id");
-    UTL_ScopedName scoped_arg_name (&arg_name, 0);
-    AST_Argument *repository_id =
-      idl_global->gen ()->create_argument (AST_Argument::dir_IN,
-                                           s.get (),
-                                           &scoped_arg_name);
-
-    is_a.be_add_argument (repository_id);
-
-    ACE_CString is_a_upcall_command_name =
-      "_is_a_" + ACE_CString (node_local_name) + "_Upcall_Command" ;
-
-    be_visitor_operation_upcall_command_ss upcall_command_visitor (this->ctx_);
-    upcall_command_visitor.visit (&is_a,
-                                  full_skel_name,
-                                  is_a_upcall_command_name.c_str ());
-
-    *os << be_nl_2
-        << "void " << full_skel_name
-        << "::_is_a_skel (" << be_idt << be_idt_nl
-        << "TAO_ServerRequest & server_request," << be_nl
-        << "void * TAO_INTERCEPTOR (servant_upcall)," << be_nl
-        << "void * servant)" << be_uidt << be_uidt_nl
-        << "{" << be_idt;
-
-    // Generate exception list.
-    be_visitor_operation_exceptlist_ss exception_list (this->ctx_);
-    exception_list.visit_operation (&is_a);
-
-    be_visitor_operation_ss op_visitor (this->ctx_);
-
-    *os << "TAO::SArg_Traits< ";
-
-    op_visitor.gen_arg_template_param_name (&is_a,
-                                            &rt,
-                                            os);
-
-    *os << ">::ret_val retval;";
-
-    op_visitor.gen_skel_body_arglist (&is_a,
-                                      os);
-
-    *os << be_nl_2
-        << "TAO::Argument * const args[] =" << be_idt_nl
-        << "{" << be_idt_nl
-        << "&retval," << be_nl
-        << "&_tao_" << arg_name.get_string ()
-        << be_uidt_nl
-        << "};" << be_uidt_nl << be_nl;
-
-    *os << "static size_t const nargs = 2;" << be_nl_2;
-
-    // Get the right object implementation.
-    *os << full_skel_name << " * const impl =" << be_idt_nl
-        << "static_cast<"
-        << full_skel_name << " *> (servant);"
-        << be_uidt_nl;
-
-    // Upcall_Command instantiation.
-    *os << be_nl
-        << is_a_upcall_command_name.c_str()
-        << " command (" << be_idt_nl
-        << "impl";
-
-    if (!is_a.void_return_type ()
-        || is_a.argument_count () > 0)
-      {
-        // server_request.operation_details () will be non-zero in the
-        // thru-POA collocation case.  Use them if available.
-        *os << "," << be_nl;
-
-        if (be_global->gen_thru_poa_collocation ())
-          *os << "server_request.operation_details ()," << be_nl;
-
-        *os << "args";
-      }
-
-    *os << ");" << be_uidt_nl << be_nl;
-
-    *os << "TAO::Upcall_Wrapper upcall_wrapper;" << be_nl
-        << "upcall_wrapper.upcall (server_request" << be_nl
-        << "                       , args" << be_nl
-        << "                       , nargs" << be_nl
-        << "                       , command"
-        << "\n#if TAO_HAS_INTERCEPTORS == 1" << be_nl
-        << "                       , servant_upcall" << be_nl
-        << "                       , exceptions" << be_nl
-        << "                       , nexceptions"
-        << "\n#endif  /* TAO_HAS_INTERCEPTORS == 1 */" << be_nl
-        << "                       );";
-
-    this->generate_send_reply (os);
-
-    *os << be_uidt_nl
-        << "}" << be_nl_2;
-
-    is_a.destroy ();
-    rt.destroy ();
-    s.get ()->destroy ();
-  }
-
-  if (!be_global->gen_minimum_corba ())
-  {
-    // Generate code for the _non_existent skeleton.
-    be_predefined_type rt (AST_PredefinedType::PT_boolean, 0);
-    // @@ Cheat a little by placing a space before the operation name
-    //    to prevent the IDL compiler from interpreting the leading
-    //    underscore as an IDL escape.
-    Identifier op_name (" _non_existent");
-    UTL_ScopedName scoped_name (&op_name, 0);
-    be_operation non_existent (&rt,
-                               AST_Operation::OP_noflags,
-                               &scoped_name,
-                               node->is_local (),
-                               node->is_abstract ());
-    non_existent.set_defined_in (node);
-
-    ACE_CString non_exist_upcall_command_name =
-      "_non_existent_"
-      + ACE_CString (node_local_name)
-      + "_Upcall_Command";
-
-    be_visitor_operation_upcall_command_ss upcall_command_visitor (this->ctx_);
-    upcall_command_visitor.visit (&non_existent,
-                                  full_skel_name,
-                                  non_exist_upcall_command_name.c_str ());
-
-    *os << be_nl_2
-        << "void " << full_skel_name
-        << "::_non_existent_skel (" << be_idt << be_idt_nl
-        << "TAO_ServerRequest & server_request," << be_nl
-        << "void * TAO_INTERCEPTOR (servant_upcall)," << be_nl
-        << "void * servant)" << be_uidt << be_uidt_nl
-        << "{" << be_idt;
-
-    // Generate exception list.
-    be_visitor_operation_exceptlist_ss exception_list (this->ctx_);
-    exception_list.visit_operation (&non_existent);
-
-    be_visitor_operation_ss op_visitor (this->ctx_);
-
-    *os << "TAO::SArg_Traits< ";
-
-    op_visitor.gen_arg_template_param_name (&non_existent,
-                                            &rt,
-                                            os);
-
-    *os << ">::ret_val retval;";
-
-    op_visitor.gen_skel_body_arglist (&non_existent,
-                                      os);
-
-    *os << be_nl_2
-        << "TAO::Argument * const args[] =" << be_idt_nl
-        << "{" << be_idt_nl
-        << "&retval"
-        << be_uidt_nl
-        << "};" << be_uidt_nl << be_nl;
-
-    *os << "static size_t const nargs = 1;" << be_nl_2;
-
-    // Get the right object implementation.
-    *os << full_skel_name << " * const impl =" << be_idt_nl
-        << "static_cast<"
-        << full_skel_name << " *> (servant);"
-        << be_uidt_nl;
-
-    // Upcall_Command instantiation.
-    *os << be_nl
-        << non_exist_upcall_command_name.c_str()
-        << " command (" << be_idt_nl
-        << "impl";
-
-    if (!non_existent.void_return_type ()
-        || non_existent.argument_count () > 0)
-      {
-        // server_request.operation_details () will be non-zero in the
-        // thru-POA collocation case.  Use them if available.
-        *os << "," << be_nl;
-
-        if (be_global->gen_thru_poa_collocation ())
-          *os << "server_request.operation_details ()," << be_nl;
-
-        *os << "args";
-      }
-
-    *os << ");" << be_uidt_nl << be_nl;
-
-    *os << "TAO::Upcall_Wrapper upcall_wrapper;" << be_nl
-        << "upcall_wrapper.upcall (server_request" << be_nl
-        << "                       , args" << be_nl
-        << "                       , nargs" << be_nl
-        << "                       , command"
-        << "\n#if TAO_HAS_INTERCEPTORS == 1" << be_nl
-        << "                       , servant_upcall" << be_nl
-        << "                       , exceptions" << be_nl
-        << "                       , nexceptions"
-        << "\n#endif  /* TAO_HAS_INTERCEPTORS == 1 */" << be_nl
-        << "                       );";
-
-    this->generate_send_reply (os);
-
-    *os << be_uidt_nl
-        << "}" << be_nl;
-
-    non_existent.destroy ();
-    rt.destroy ();
-  }
-
-  if (!be_global->gen_minimum_corba ())
-  {
-    ACE_CDR::ULong bound = 0UL;
-
-    // Generate code for the _repository_id skeleton.
-    auto_ptr<AST_String> s (
-      idl_global->gen ()->create_string (
-        idl_global->gen ()->create_expr (bound,
-                                         AST_Expression::EV_ulong)));
-
-    // @@ Cheat a little by placing a space before the operation name
-    //    to prevent the IDL compiler from interpreting the leading
-    //    underscore as an IDL escape.
-    Identifier op_name (" _repository_id");
-    UTL_ScopedName scoped_name (&op_name, 0);
-    be_operation repository_id (s.get (),
-                                AST_Operation::OP_noflags,
-                                &scoped_name,
-                                node->is_local (),
-                                node->is_abstract ());
-    repository_id.set_defined_in (node);
-
-    ACE_CString repository_id_upcall_command_name =
-      "_repository_id_"
-      + ACE_CString (node_local_name)
-      + "_Upcall_Command" ;
-
-    be_visitor_operation_upcall_command_ss upcall_command_visitor (this->ctx_);
-    upcall_command_visitor.visit (&repository_id,
-                                  full_skel_name,
-                                  repository_id_upcall_command_name.c_str ());
-
-    *os << be_nl_2
-        << "void " << full_skel_name
-        << "::_repository_id_skel (" << be_idt << be_idt_nl
-        << "TAO_ServerRequest & server_request," << be_nl
-        << "void * TAO_INTERCEPTOR (servant_upcall)," << be_nl
-        << "void * servant)" << be_uidt << be_uidt_nl
-        << "{" << be_idt;
-
-    // Generate exception list.
-    be_visitor_operation_exceptlist_ss exception_list (this->ctx_);
-    exception_list.visit_operation (&repository_id);
-
-    be_visitor_operation_ss op_visitor (this->ctx_);
-
-    *os << "TAO::SArg_Traits< ";
-
-    op_visitor.gen_arg_template_param_name (&repository_id,
-                                            s.get (),
-                                            os);
-
-    *os << ">::ret_val retval;";
-
-    op_visitor.gen_skel_body_arglist (&repository_id,
-                                      os);
-
-    *os << be_nl_2
-        << "TAO::Argument * const args[] =" << be_idt_nl
-        << "{" << be_idt_nl
-        << "&retval"
-        << be_uidt_nl
-        << "};" << be_uidt_nl << be_nl;
-
-    *os << "static size_t const nargs = 1;" << be_nl_2;
-
-    // Get the right object implementation.
-    *os << full_skel_name << " * const impl =" << be_idt_nl
-        << "static_cast<"
-        << full_skel_name << " *> (servant);"
-        << be_uidt_nl;
-
-    // Upcall_Command instantiation.
-    *os << be_nl
-        << repository_id_upcall_command_name.c_str()
-        << " command (" << be_idt_nl
-        << "impl";
-
-    if (!repository_id.void_return_type ()
-        || repository_id.argument_count () > 0)
-      {
-        // server_request.operation_details () will be non-zero in the
-        // thru-POA collocation case.  Use them if available.
-        *os << "," << be_nl;
-
-        if (be_global->gen_thru_poa_collocation ())
-          *os << "server_request.operation_details ()," << be_nl;
-
-        *os << "args";
-      }
-
-    *os << ");" << be_uidt_nl << be_nl;
-
-    *os << "TAO::Upcall_Wrapper upcall_wrapper;" << be_nl
-        << "upcall_wrapper.upcall (server_request" << be_nl
-        << "                       , args" << be_nl
-        << "                       , nargs" << be_nl
-        << "                       , command"
-        << "\n#if TAO_HAS_INTERCEPTORS == 1" << be_nl
-        << "                       , servant_upcall" << be_nl
-        << "                       , exceptions" << be_nl
-        << "                       , nexceptions"
-        << "\n#endif  /* TAO_HAS_INTERCEPTORS == 1 */" << be_nl
-        << "                       );";
-
-    this->generate_send_reply (os);
-
-    *os << be_uidt_nl
-        << "}";
-
-    repository_id.destroy ();
-    s.get ()->destroy ();
-  }
-
-  if (!be_global->gen_corba_e ()
-      && !be_global->gen_minimum_corba ())
-  {
-    *os << be_nl_2;
-
-    *os << "// TAO_IDL - Generated from" << be_nl
-        << "// " << __FILE__ << ":" << __LINE__;
-
-    *os << be_nl_2
-        << "void " << full_skel_name
-        << "::_interface_skel (" << be_idt << be_idt_nl
-        << "TAO_ServerRequest & server_request," << be_nl
-        << "void * /* servant_upcall */," << be_nl
-        << "void * servant)" << be_uidt << be_uidt_nl;
-    *os << "{" << be_idt_nl;
-    *os << "TAO_IFR_Client_Adapter *_tao_adapter =" << be_idt_nl
-        << "ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ("
-        << be_idt << be_idt_nl
-        << "TAO_ORB_Core::ifr_client_adapter_name ());"
-        << be_uidt
-        << be_uidt_nl << be_uidt_nl;
-    *os << "if (!_tao_adapter)" << be_idt_nl
-        << "{" << be_idt_nl
-        << "throw ::CORBA::INTF_REPOS (::CORBA::OMGVMCID | 1, ::CORBA::COMPLETED_NO);"
-        << be_uidt_nl
-        << "}" << be_uidt_nl << be_nl;
-
-    // Get the right object implementation.
-    *os << full_skel_name << " * const impl =" << be_idt_nl
-        << "static_cast<"
-        << full_skel_name << " *> (servant);"
-        << be_uidt_nl;
-
-    *os << "::CORBA::InterfaceDef_ptr _tao_retval = impl->_get_interface ();"
-        << be_nl
-        << "server_request.init_reply ();" << be_nl
-        << "TAO_OutputCDR &_tao_out = *server_request.outgoing ();"
-        << be_nl_2
-        << "::CORBA::Boolean const _tao_result =" << be_idt_nl
-        << "_tao_adapter->interfacedef_cdr_insert (_tao_out, _tao_retval);"
-        << be_uidt_nl << be_nl
-        << "_tao_adapter->dispose (_tao_retval);"
-        << be_nl_2;
-
-    *os << "if (!_tao_result)" << be_idt_nl
-        << "{" << be_idt_nl
-        << "throw ::CORBA::MARSHAL ();" << be_uidt_nl
-        << "}" << be_uidt;
-
-    this->generate_send_reply (os);
-
-    *os << be_uidt_nl
-        << "}" << be_nl_2;
-  }
-
-  // Generate code for the _component skeleton, don't generate it when
-  // we use CORBA/e
-  if (!be_global->gen_corba_e () && !be_global->gen_minimum_corba ())
-  {
-    be_predefined_type rt (AST_PredefinedType::PT_object, 0);
-    // @@ Cheat a little by placing a space before the operation name
-    //    to prevent the IDL compiler from interpreting the leading
-    //    underscore as an IDL escape.
-
-    // Yes, _get_component()
-    Identifier op_name (" _get_component");
-    UTL_ScopedName scoped_name (&op_name, 0);
-    be_operation get_component (&rt,
-                                AST_Operation::OP_noflags,
-                                &scoped_name,
-                                node->is_local (),
-                                node->is_abstract ());
-    get_component.set_defined_in (node);
-
-    ACE_CString get_component_upcall_command_name =
-      "_get_component_"
-      + ACE_CString (node_local_name)
-      + "_Upcall_Command" ;
-
-    be_visitor_operation_upcall_command_ss upcall_command_visitor (this->ctx_);
-    upcall_command_visitor.visit (&get_component,
-                                  full_skel_name,
-                                  get_component_upcall_command_name.c_str());
-
-    *os << be_nl_2
-        << "void " << full_skel_name
-        << "::_component_skel (" << be_idt << be_idt_nl
-        << "TAO_ServerRequest & server_request," << be_nl
-        << "void * TAO_INTERCEPTOR (servant_upcall)," << be_nl
-        << "void * servant" << be_uidt_nl
-        << ")" << be_uidt_nl
-        << "{" << be_idt;
-
-    // Generate exception list.
-    be_visitor_operation_exceptlist_ss exception_list (this->ctx_);
-    exception_list.visit_operation (&get_component);
-
-    be_visitor_operation_ss operation_visitor (this->ctx_);
-
-    *os << "TAO::SArg_Traits< ";
-
-    operation_visitor.gen_arg_template_param_name (&get_component,
-                                                   &rt,
-                                                   os);
-
-    *os << ">::ret_val retval;";
-
-    *os << be_nl_2
-        << "TAO::Argument * const args[] =" << be_idt_nl
-        << "{" << be_idt_nl
-        << "&retval"
-        << be_uidt_nl
-        << "};" << be_uidt_nl << be_nl;
-
-    *os << "static size_t const nargs = 1;" << be_nl_2;
-
-    // Get the right object implementation.
-    *os << full_skel_name << " * const impl =" << be_idt_nl
-        << "static_cast<"
-        << full_skel_name << " *> (servant);"
-        << be_uidt_nl;
-
-    // Upcall_Command instantiation.
-    *os << be_nl
-        << get_component_upcall_command_name.c_str ()
-        << " command (" << be_idt_nl
-        << "impl";
-
-    if (!get_component.void_return_type ()
-        || get_component.argument_count () > 0)
-      {
-        // server_request.operation_details () will be non-zero in the
-        // thru-POA collocation case.  Use them if available.
-        *os << "," << be_nl;
-
-        if (be_global->gen_thru_poa_collocation ())
-          *os << "server_request.operation_details ()," << be_nl;
-
-        *os << "args";
-      }
-
-    *os << ");" << be_uidt_nl << be_nl;
-
-
-    *os << "TAO::Upcall_Wrapper upcall_wrapper;" << be_nl
-        << "upcall_wrapper.upcall (server_request" << be_nl
-        << "                       , args" << be_nl
-        << "                       , nargs" << be_nl
-        << "                       , command"
-        << "\n#if TAO_HAS_INTERCEPTORS == 1" << be_nl
-        << "                       , servant_upcall" << be_nl
-        << "                       , exceptions" << be_nl
-        << "                       , nexceptions"
-        << "\n#endif  /* TAO_HAS_INTERCEPTORS == 1 */" << be_nl
-        << "                       );" << be_uidt_nl
-        << "}";
-
-    get_component.destroy ();
-    rt.destroy ();
-  }
-
   // Generate code for the _is_a override.
-
   *os << be_nl_2
       << "::CORBA::Boolean " << full_skel_name
       << "::_is_a (const char* value)" << be_nl
@@ -927,12 +419,6 @@ be_visitor_interface_ss::this_method (be_interface *node)
 }
 
 void
-be_visitor_interface_ss::generate_send_reply (TAO_OutStream *)
-{
-  // no-op for regular interfaces
-}
-
-void
 be_visitor_interface_ss::dispatch_method (be_interface *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
@@ -945,8 +431,10 @@ be_visitor_interface_ss::dispatch_method (be_interface *node)
   *os << be_nl_2;
 
   *os << "void " << node->full_skel_name ()
-      << "::_dispatch (TAO_ServerRequest & req, void * servant_upcall)"
-      << be_nl;
+      << "::_dispatch (" << be_idt_nl
+      << "TAO_ServerRequest & req," << be_nl
+      << "TAO::Portable_Server::Servant_Upcall* servant_upcall)"
+      << be_uidt_nl;
   *os << "{" << be_idt_nl;
   *os << "this->synchronous_upcall_dispatch (req, servant_upcall, this);"
       << be_uidt_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_module/module.cpp b/TAO/TAO_IDL/be/be_visitor_module/module.cpp
index 70965c24dc2..8402c983f6f 100644
--- a/TAO/TAO_IDL/be/be_visitor_module/module.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module/module.cpp
@@ -289,12 +289,6 @@ be_visitor_module::visit_interface (be_interface *node)
         status = node->accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_SI:
-      {
-        be_visitor_interface_si visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
     case TAO_CodeGen::TAO_ROOT_SS:
       {
         be_visitor_interface_ss visitor (&ctx);
@@ -353,6 +347,8 @@ be_visitor_module::visit_interface (be_interface *node)
     case TAO_CodeGen::TAO_ROOT_EXS:
     case TAO_CodeGen::TAO_ROOT_CNH:
     case TAO_CodeGen::TAO_ROOT_CNS:
+    case TAO_CodeGen::TAO_ROOT_SVTH:
+    case TAO_CodeGen::TAO_ROOT_SVTS:
       {
         // Nothing to be done for these cases.
         return 0;
@@ -484,7 +480,6 @@ be_visitor_module::visit_valuebox (be_valuebox *node)
         break;
       }
     case TAO_CodeGen::TAO_ROOT_SH:
-    case TAO_CodeGen::TAO_ROOT_SI:
     case TAO_CodeGen::TAO_ROOT_SS:
       {
         break;
@@ -564,12 +559,6 @@ be_visitor_module::visit_valuetype (be_valuetype *node)
         status = node->accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_SI:
-      {
-         be_visitor_valuetype_si visitor (&ctx);
-        status = node->accept (&visitor);
-        break;
-      }
     case TAO_CodeGen::TAO_ROOT_SS:
       {
         be_visitor_valuetype_ss visitor (&ctx);
@@ -669,7 +658,6 @@ be_visitor_module::visit_component (be_component *node)
     case TAO_CodeGen::TAO_ROOT_ANY_OP_CH:
     case TAO_CodeGen::TAO_ROOT_ANY_OP_CS:
     case TAO_CodeGen::TAO_ROOT_SH:
-    case TAO_CodeGen::TAO_ROOT_SI:
     case TAO_CodeGen::TAO_ROOT_SS:
       return this->visit_interface (node);
 
@@ -679,6 +667,18 @@ be_visitor_module::visit_component (be_component *node)
     case TAO_CodeGen::TAO_ROOT_CNH:
     case TAO_CodeGen::TAO_ROOT_CNS:
       break;
+    case TAO_CodeGen::TAO_ROOT_SVTH:
+      {
+        be_visitor_facet_svth visitor (&ctx);
+        status = node->accept (&visitor);
+        break;
+      }
+    case TAO_CodeGen::TAO_ROOT_SVTS:
+      {
+        be_visitor_facet_svts visitor (&ctx);
+        status = node->accept (&visitor);
+        break;
+      }
     case TAO_CodeGen::TAO_ROOT_SVH:
       {
         be_visitor_component_svh visitor (&ctx);
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
index 58125600147..604677bb249 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
@@ -127,8 +127,7 @@ void
 be_visitor_amh_operation_sh::generate_shared_prologue (
     be_decl *node,
     TAO_OutStream *os,
-    const char *skel_prefix
-  )
+    const char *skel_prefix)
 {
   *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
@@ -138,9 +137,9 @@ be_visitor_amh_operation_sh::generate_shared_prologue (
       << node->local_name ()
       << "_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &_tao_req," << be_nl
-      << "void *_tao_obj," << be_nl
-      << "void *_tao_servant_upcall" << be_uidt_nl
-      << ");" << be_uidt_nl << be_nl;
+      << "TAO::Portable_Server::Servant_Upcall *_tao_obj," << be_nl
+      << "TAO_ServantBase *_tao_servant_upcall"
+      << ");" << be_uidt_nl << be_uidt_nl;
 
   // We need the interface node in which this operation was defined. However,
   // if this operation node was an attribute node in disguise, we get this
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
index da9362998b9..0df2834e727 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
@@ -336,9 +336,9 @@ be_visitor_amh_operation_ss::generate_shared_prologue (be_decl *node,
       << node->local_name ()
       << "_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest & _tao_server_request," << be_nl
-      << "void * /* context */," << be_nl
-      << "void * _tao_servant" << be_uidt_nl
-      << ")" << be_uidt_nl;
+      << "TAO::Portable_Server::Servant_Upcall * /* context */," << be_nl
+      << "TAO_ServantBase * _tao_servant)" << be_uidt
+      << be_uidt_nl;
 
   // Generate the actual code for the skeleton.
   // last argument
@@ -346,7 +346,7 @@ be_visitor_amh_operation_ss::generate_shared_prologue (be_decl *node,
 
   // Get the right object implementation.
   *os << amh_skel_name.c_str () << " * const _tao_impl =" << be_idt_nl
-      << "static_cast<" << amh_skel_name.c_str () << " *> ("
+      << "dynamic_cast<" << amh_skel_name.c_str () << " *> ("
       << "_tao_servant" << ");" << be_uidt_nl;
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
index c69901bbc09..6cc527087ba 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
@@ -88,6 +88,15 @@ be_visitor_operation_direct_proxy_impl_ss::visit_operation (
   *os << be_uidt_nl
       << "{" << be_idt_nl;
 
+  *os << intf->full_skel_name () << "_ptr _tao_ptr = " << be_idt_nl
+      << "dynamic_cast<" << intf->full_skel_name () << "_ptr> ("
+      << "servant);" << be_uidt_nl;
+
+  *os << "if (!_tao_ptr)" << be_idt_nl
+      << "{" << be_idt_nl
+      << "throw CORBA::INTERNAL ();" << be_uidt_nl
+      << "}" << be_uidt_nl << be_nl;
+
   if (!node->void_return_type ())
     {
       *os << "((TAO::Arg_Traits< ";
@@ -99,9 +108,7 @@ be_visitor_operation_direct_proxy_impl_ss::visit_operation (
       *os << ">::ret_val *) args[0])->arg () =" << be_idt_nl;
     }
 
-  *os << "dynamic_cast<" << be_idt
-      << intf->full_skel_name () << "_ptr>" << be_nl << "("
-      << "servant)" << be_uidt_nl;
+  *os << "_tao_ptr";
 
   be_visitor_context ctx;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
index af72ab06923..034344a7d96 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
@@ -107,9 +107,9 @@ be_visitor_operation_sh::visit_operation (be_operation *node)
 
       *os << node->local_name ()
           << "_skel (" << be_idt << be_idt_nl
-          << "TAO_ServerRequest & server_request," << be_nl
-          << "void * servant_upcall," << be_nl
-          << "void * servant);" << be_uidt
+          << "TAO_ServerRequest &server_request," << be_nl
+          << "TAO::Portable_Server::Servant_Upcall *servant_upcall," << be_nl
+          << "TAO_ServantBase *servant);" << be_uidt
           << be_uidt;
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
index 2903992ecba..80a6ff9a21b 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
@@ -191,8 +191,8 @@ be_visitor_operation_ss::gen_skel_operation_body (be_operation * node,
   *os << this->ctx_->port_prefix ().c_str () << node->local_name ()
       << "_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest & server_request," << be_nl
-      << "void * TAO_INTERCEPTOR (servant_upcall)," << be_nl
-      << "void * servant)" << be_uidt << be_uidt_nl;
+      << "TAO::Portable_Server::Servant_Upcall *TAO_INTERCEPTOR (servant_upcall)," << be_nl
+      << "TAO_ServantBase *servant)" << be_uidt << be_uidt_nl;
 
   // Generate the actual code for the skeleton. However, if any of the
   // argument types is "native", we do not generate any skeleton
@@ -246,7 +246,7 @@ be_visitor_operation_ss::gen_skel_operation_body (be_operation * node,
 
   // Get the right object implementation.
   *os << intf->full_skel_name () << " * const impl =" << be_idt_nl
-      << "static_cast<"
+      << "dynamic_cast<"
       << intf->full_skel_name () << " *> (servant);" << be_uidt << be_uidt_nl;
 
   // Upcall_Command instantiation.
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_svs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_svs.cpp
index 68084dc7420..4b6d36e3524 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_svs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_svs.cpp
@@ -11,6 +11,7 @@
  *  @author Jeff Parsons
  */
 //=============================================================================
+#include <be_visitor_operation/operation_svs.h>
 
 be_visitor_operation_svs::be_visitor_operation_svs (
       be_visitor_context *ctx)
@@ -30,6 +31,12 @@ be_visitor_operation_svs::visit_operation (be_operation *node)
 
   os_ << be_nl_2;
 
+
+  if (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_SVTS)
+    {
+      os_ << "template <typename BASE, typename EXEC, typename CONTEXT>"
+          << be_nl;
+    }
   // Retrieve the operation return type.
   be_type *bt = be_type::narrow_from_decl (node->return_type ());
 
@@ -56,9 +63,19 @@ be_visitor_operation_svs::visit_operation (be_operation *node)
     }
 
   // Generate the operation name, avoiding possible _cxx_ prefix.
-  os_ << be_nl
-     << scope_->original_local_name ()->get_string ()
-     << "_Servant";
+  // USE STATE con the context!!!!!!!
+  if (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_SVTS)
+    {
+      os_ << be_nl
+          << scope_->original_local_name ()->get_string ()
+          << "_Servant_T<BASE, EXEC, CONTEXT>";
+    }
+  else
+    {
+      os_ << be_nl
+          << scope_->original_local_name ()->get_string ()
+          << "_Servant";
+    }
 
   os_ << "::" << node->local_name ();
 
diff --git a/TAO/TAO_IDL/be/be_visitor_root.cpp b/TAO/TAO_IDL/be/be_visitor_root.cpp
index 92456f48d4a..046c3c67913 100644
--- a/TAO/TAO_IDL/be/be_visitor_root.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root.cpp
@@ -67,13 +67,14 @@
 #include "be_visitor_root/root_ci.cpp"
 #include "be_visitor_root/root_cs.cpp"
 #include "be_visitor_root/root_sh.cpp"
-#include "be_visitor_root/root_si.cpp"
 #include "be_visitor_root/root_ss.cpp"
 #include "be_visitor_root/root_sth.cpp"
 #include "be_visitor_root/root_is.cpp"
 #include "be_visitor_root/root_ih.cpp"
 #include "be_visitor_root/root_svh.cpp"
 #include "be_visitor_root/root_svs.cpp"
+#include "be_visitor_root/root_svth.cpp"
+#include "be_visitor_root/root_svts.cpp"
 #include "be_visitor_root/root_ex_idl.cpp"
 #include "be_visitor_root/root_exh.cpp"
 #include "be_visitor_root/root_exs.cpp"
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp
deleted file mode 100644
index 35b082bc11b..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-
-//=============================================================================
-/**
- *  @file    root_si.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for the Root in the server inline file
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
-// ***********************************************
-// Root visitor for server inline
-// ***********************************************
-
-be_visitor_root_si::be_visitor_root_si (be_visitor_context *ctx)
-  : be_visitor_root (ctx)
-{
-}
-
-be_visitor_root_si::~be_visitor_root_si (void)
-{
-}
-
-int
-be_visitor_root_si::visit_root (be_root *node)
-{
-  if (this->init () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_root_si::init - ")
-                         ACE_TEXT ("failed to initialize\n")),
-                        -1);
-    }
-
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_root_si::visit_root - ")
-                         ACE_TEXT ("codegen for scope failed\n")),
-                        -1);
-    }
-
-  (void) tao_cg->end_server_inline ();
-
-  return  0;
-}
-
-int
-be_visitor_root_si::init (void)
-{
-  /// First open the server-side file for writing
-  int status =
-    tao_cg->start_server_inline (
-      be_global->be_get_server_inline_fname ());
-
-  if (status == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_root_si::init - ")
-                         ACE_TEXT ("Error opening server inline file\n")),
-                        -1);
-    }
-
-  /// Initialize the stream.
-  this->ctx_->stream (tao_cg->server_inline ());
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_svth.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_svth.cpp
new file mode 100644
index 00000000000..c4b4a10e963
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_svth.cpp
@@ -0,0 +1,73 @@
+
+//=============================================================================
+/**
+ *  @file    root_svth.cpp
+ *
+ *  $Id$
+ *
+ *  Visitor generating code for Root in the CIAO template servant header
+ *
+ *
+ *  @author Marcel Smit
+ */
+//=============================================================================
+
+// ********************************
+// Root visitor for CIAO template servant header
+// ********************************
+
+be_visitor_root_svth::be_visitor_root_svth (be_visitor_context *ctx)
+  : be_visitor_root (ctx)
+{
+}
+
+be_visitor_root_svth::~be_visitor_root_svth (void)
+{
+}
+
+int
+be_visitor_root_svth::visit_root (be_root *node)
+{
+  if (this->init () == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_root_svth::init - ")
+                         ACE_TEXT ("failed to initialize\n")),
+                        -1);
+    }
+
+  if (this->visit_scope (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_root_svth::visit_root - ")
+                         ACE_TEXT ("codegen for scope failed\n")),
+                        -1);
+    }
+
+  (void) tao_cg->end_ciao_svnt_template_header ();
+
+  return 0;
+}
+
+int
+be_visitor_root_svth::init (void)
+{
+  /// First open the file for writing.
+  int status =
+    tao_cg->start_ciao_svnt_template_header (
+      be_global->be_get_ciao_tmpl_svnt_hdr_fname ());
+
+  if (status == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_root_svth::init - ")
+                         ACE_TEXT ("Error opening CIAO servant ")
+                         ACE_TEXT ("header file\n")),
+                        -1);
+    }
+
+  /// Initialize the stream.
+  this->ctx_->stream (tao_cg->ciao_svnt_template_header ());
+
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_svts.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_svts.cpp
new file mode 100644
index 00000000000..cfe25bf2e18
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_svts.cpp
@@ -0,0 +1,73 @@
+
+//=============================================================================
+/**
+ *  @file    root_svts.cpp
+ *
+ *  $Id$
+ *
+ *  Visitor generating code for Root in the CIAO template servant source
+ *
+ *
+ *  @author Marcel Smit
+ */
+//=============================================================================
+
+// ********************************
+// Root visitor for CIAO template servant source
+// ********************************
+
+be_visitor_root_svts::be_visitor_root_svts (be_visitor_context *ctx)
+  : be_visitor_root (ctx)
+{
+}
+
+be_visitor_root_svts::~be_visitor_root_svts (void)
+{
+}
+
+int
+be_visitor_root_svts::visit_root (be_root *node)
+{
+  if (this->init () == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_root_svts::init - ")
+                         ACE_TEXT ("failed to initialize\n")),
+                        -1);
+    }
+
+  if (this->visit_scope (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_root_svts::visit_root - ")
+                         ACE_TEXT ("codegen for scope failed\n")),
+                        -1);
+    }
+
+  (void) tao_cg->end_ciao_svnt_template_source ();
+
+  return 0;
+}
+
+int
+be_visitor_root_svts::init (void)
+{
+  // First open the client-side header file for writing.
+  int status =
+    tao_cg->start_ciao_svnt_template_source (
+      be_global->be_get_ciao_tmpl_svnt_src_fname ());
+
+  if (status == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_root_svts::init - ")
+                         ACE_TEXT ("Error opening CIAO servant ")
+                         ACE_TEXT ("source file\n")),
+                        -1);
+    }
+
+  // Initialize the stream.
+  this->ctx_->stream (tao_cg->ciao_svnt_template_source ());
+
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype.cpp
index a05039ae09b..0a9d72c2e74 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype.cpp
@@ -69,7 +69,6 @@
 #include "be_visitor_valuetype/valuetype_ci.cpp"
 #include "be_visitor_valuetype/valuetype_cs.cpp"
 #include "be_visitor_valuetype/valuetype_sh.cpp"
-#include "be_visitor_valuetype/valuetype_si.cpp"
 #include "be_visitor_valuetype/valuetype_ss.cpp"
 #include "be_visitor_valuetype/valuetype_obv_ch.cpp"
 #include "be_visitor_valuetype/valuetype_obv_ci.cpp"
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
index 5c78a4feb29..dfd31b10afa 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
@@ -16,8 +16,7 @@
 
 
 be_visitor_valuetype_field_cs::be_visitor_valuetype_field_cs (
-    be_visitor_context *ctx
-  )
+    be_visitor_context *ctx)
   : be_visitor_decl (ctx),
     in_obv_space_ (0)
 {
@@ -144,7 +143,7 @@ be_visitor_valuetype_field_cs::visit_array (be_array *node)
   *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
-  *os << "// Accessor to set the member." << be_nl
+  *os << "/// Accessor to set the member." << be_nl
       << this->pre_op () << "void" << be_nl;
 
   this->op_name (bu,
@@ -589,7 +588,7 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node)
   *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
-  *os << "// Accessor to set the member." << be_nl
+  *os << "/// Accessor to set the member." << be_nl
       << this->pre_op () << "void" << be_nl;
 
   this->op_name (bu, os);
@@ -646,7 +645,7 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node)
   {
     case AST_PredefinedType::PT_pseudo:
     case AST_PredefinedType::PT_object:
-      *os << "// Retrieve the member" << be_nl
+      *os << "/// Retrieve the member" << be_nl
           << this->pre_op () << "::" << bt->name () << "_ptr" << be_nl;
 
       this->op_name (bu,
@@ -765,7 +764,7 @@ be_visitor_valuetype_field_cs::visit_sequence (be_sequence *node)
       << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // (1) set from a const
-  *os << "// Accessor to set the member." << be_nl
+  *os << "/// Accessor to set the member." << be_nl
       << this->pre_op () << "void" << be_nl;
 
   this->op_name (bu,
@@ -781,7 +780,7 @@ be_visitor_valuetype_field_cs::visit_sequence (be_sequence *node)
       << " = val;" << be_uidt_nl;
   *os << "}" << be_nl_2;
 
-  *os << "// Readonly get method." << be_nl
+  *os << "/// Readonly get method." << be_nl
       << this->pre_op () << "const " << bt->name () << " &" << be_nl;
 
   this->op_name (bu,
@@ -796,7 +795,7 @@ be_visitor_valuetype_field_cs::visit_sequence (be_sequence *node)
       << ";" << be_uidt_nl
       << "}" << be_nl_2;
 
-  *os << "// Read/write get method." << be_nl
+  *os << "/// Read/write get method." << be_nl
       << this->pre_op () << bt->name () << " &" << be_nl;
 
   this->op_name (bu,
@@ -836,7 +835,7 @@ be_visitor_valuetype_field_cs::visit_string (be_string *node)
   *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
-  *os << "// Accessor to set the member." << be_nl
+  *os << "/// Accessor to set the member." << be_nl
       << this->pre_op () << "void" << be_nl;
 
   this->op_name (bu,
@@ -860,7 +859,7 @@ be_visitor_valuetype_field_cs::visit_string (be_string *node)
       << "}" << be_nl_2;
 
   // (2) Set method from const char * or const wchar*.
-  *os << "// Accessor to set the member." << be_nl
+  *os << "/// Accessor to set the member." << be_nl
       << this->pre_op () << "void" << be_nl;
 
   this->op_name (bu,
@@ -896,7 +895,7 @@ be_visitor_valuetype_field_cs::visit_string (be_string *node)
   *os << "}" << be_nl_2;
 
   // (3) Set from const String_var&.
-  *os << "// Accessor to set the member." << be_nl
+  *os << "/// Accessor to set the member." << be_nl
       << this->pre_op () << "void" << be_nl;
 
   this->op_name (bu,
@@ -1006,7 +1005,7 @@ be_visitor_valuetype_field_cs::visit_structure (be_structure *node)
       << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
   // (1) Set from a const.
-  *os << "// Accessor to set the member." << be_nl
+  *os << "/// Accessor to set the member." << be_nl
       << this->pre_op () << "void" << be_nl;
 
   this->op_name (bu,
@@ -1023,7 +1022,7 @@ be_visitor_valuetype_field_cs::visit_structure (be_structure *node)
 
   *os << "}" << be_nl;
 
-  *os << "// Readonly get method." << be_nl
+  *os << "/// Readonly get method." << be_nl
       << this->pre_op () << "const " << bt->name () << " &" << be_nl;
 
   this->op_name (bu,
@@ -1037,7 +1036,7 @@ be_visitor_valuetype_field_cs::visit_structure (be_structure *node)
       << ";" << be_uidt_nl;
   *os << "}" << be_nl;
 
-  *os << "// Read/write get method." << be_nl
+  *os << "/// Read/write get method." << be_nl
       << this->pre_op () << bt->name () << " &" << be_nl;
 
   this->op_name (bu,
@@ -1122,7 +1121,7 @@ be_visitor_valuetype_field_cs::visit_union (be_union *node)
   *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl_2;
 
-  *os << "// Accessor to set the member" << be_nl
+  *os << "/// Accessor to set the member" << be_nl
       << this->pre_op () << "void" << be_nl;
 
   this->op_name (bu,
@@ -1135,7 +1134,7 @@ be_visitor_valuetype_field_cs::visit_union (be_union *node)
       << bu->field_pd_postfix () << " = val;" << be_uidt_nl;
   *os << "}" << be_nl;
 
-  *os << "// Readonly get method." << be_nl
+  *os << "/// Readonly get method." << be_nl
       << this->pre_op () << "const " << bt->name () << " &" << be_nl;
 
   this->op_name (bu,
@@ -1149,7 +1148,7 @@ be_visitor_valuetype_field_cs::visit_union (be_union *node)
       << ";" << be_uidt_nl
       << "}" << be_nl;
 
-  *os << "// Read/write get method." << be_nl
+  *os << "/// Read/write get method." << be_nl
       << this->pre_op () << bt->name () << " &" << be_nl;
 
   this->op_name (bu,
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
index 09db8aea597..dbe0de1df37 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
@@ -193,7 +193,6 @@ be_visitor_valuetype::visit_constant (be_constant *node)
     case TAO_CodeGen::TAO_ROOT_SH:
     case TAO_CodeGen::TAO_ROOT_IH:
     case TAO_CodeGen::TAO_ROOT_IS:
-    case TAO_CodeGen::TAO_ROOT_SI:
     case TAO_CodeGen::TAO_ROOT_SS:
       return 0; // Nothing to be done.
     default:
@@ -268,7 +267,6 @@ be_visitor_valuetype::visit_enum (be_enum *node)
     case TAO_CodeGen::TAO_ROOT_SH:
     case TAO_CodeGen::TAO_ROOT_IH:
     case TAO_CodeGen::TAO_ROOT_IS:
-    case TAO_CodeGen::TAO_ROOT_SI:
     case TAO_CodeGen::TAO_ROOT_SS:
       return 0; // Nothing to be done.
     default:
@@ -512,10 +510,11 @@ be_visitor_valuetype::visit_union (be_union *node)
         break;
       }
     case TAO_CodeGen::TAO_VALUETYPE_OBV_CH:
+    case TAO_CodeGen::TAO_MODULE_OBV_CI:
+    case TAO_CodeGen::TAO_MODULE_OBV_CS:
     case TAO_CodeGen::TAO_ROOT_SH:
     case TAO_CodeGen::TAO_ROOT_IH:
     case TAO_CodeGen::TAO_ROOT_IS:
-    case TAO_CodeGen::TAO_ROOT_SI:
     case TAO_CodeGen::TAO_ROOT_SS:
       return 0; // Nothing to be done.
     default:
@@ -630,7 +629,6 @@ be_visitor_valuetype::visit_typedef (be_typedef *node)
     case TAO_CodeGen::TAO_ROOT_SH:
     case TAO_CodeGen::TAO_ROOT_IH:
     case TAO_CodeGen::TAO_ROOT_IS:
-    case TAO_CodeGen::TAO_ROOT_SI:
     case TAO_CodeGen::TAO_ROOT_SS:
       return 0; // Nothing to be done.
     default:
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
index 69c39553917..18c10a03b78 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
@@ -74,8 +74,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node)
       unsigned long index = 0;
       this->gen_obv_init_constructor_args (node, index);
 
-      *os << be_uidt_nl
-          << ")" << be_uidt << be_uidt_nl
+      *os << ")" << be_uidt << be_uidt << be_uidt_nl
           << ": require_truncation_ (false)" << be_nl
           << "{" << be_idt;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_si.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_si.cpp
deleted file mode 100644
index 7b49825afb5..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_si.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-
-//=============================================================================
-/**
- *  @file    valuetype_si.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Interfaces in the server inline file
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-
-// ************************************************************************
-// Valuetype visitor for server inline
-// ************************************************************************
-
-be_visitor_valuetype_si::be_visitor_valuetype_si (be_visitor_context *ctx)
-  : be_visitor_valuetype (ctx)
-{
-}
-
-be_visitor_valuetype_si::~be_visitor_valuetype_si (void)
-{
-}
-
-int
-be_visitor_valuetype_si::visit_valuetype (be_valuetype *)
-{
-  // Nothing needed for now, but the visitor is here just in case.
-  return 0;
-}
-
-int
-be_visitor_valuetype_si::visit_eventtype (be_eventtype *node)
-{
-  return this->visit_valuetype (node);
-}
-
diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h
index b0611b2bb8a..03f7442c765 100644
--- a/TAO/TAO_IDL/be_include/be_codegen.h
+++ b/TAO/TAO_IDL/be_include/be_codegen.h
@@ -119,7 +119,6 @@ public:
       TAO_ROOT_CI,
       TAO_ROOT_CS,
       TAO_ROOT_SH,
-      TAO_ROOT_SI,
       TAO_ROOT_SS,
       TAO_ROOT_TIE_SH,
       TAO_ROOT_TIE_SS,
@@ -127,6 +126,8 @@ public:
       TAO_ROOT_IS,
       TAO_ROOT_SVH,
       TAO_ROOT_SVS,
+      TAO_ROOT_SVTH,
+      TAO_ROOT_SVTS,
       TAO_ROOT_EXH,
       TAO_ROOT_EXS,
       TAO_ROOT_CNH,
@@ -226,9 +227,6 @@ public:
   /// Set the server template header stream.
   int start_server_template_header (const char *fname);
 
-  /// Set the server inline stream.
-  int start_server_inline (const char *fname);
-
   /// Set the server skeletons stream.
   int start_server_skeletons (const char *fname);
 
@@ -243,6 +241,8 @@ public:
 
   int start_ciao_svnt_header (const char *fname);
   int start_ciao_svnt_source (const char *fname);
+  int start_ciao_svnt_template_header (const char *fname);
+  int start_ciao_svnt_template_source (const char *fname);
   int start_ciao_exec_header (const char *fname);
   int start_ciao_exec_source (const char *fname);
   int start_ciao_exec_idl (const char *fname);
@@ -263,9 +263,6 @@ public:
   /// Put a last #endif in the server header.
   int end_server_header (void);
 
-  /// Generate necessary code at end of server inline file.
-  void end_server_inline (void);
-
   /// Put a last #endif in the server header.
   int end_implementation_header (const char *fname);
 
@@ -289,6 +286,8 @@ public:
 
   int end_ciao_svnt_header (void);
   int end_ciao_svnt_source (void);
+  int end_ciao_svnt_template_header (void);
+  int end_ciao_svnt_template_source (void);
   int end_ciao_exec_header (void);
   int end_ciao_exec_source (void);
   int end_ciao_exec_idl (void);
@@ -323,9 +322,6 @@ public:
   /// Get the server template skeletons stream.
   TAO_OutStream *server_template_skeletons (void);
 
-  /// Get the server inline stream.
-  TAO_OutStream *server_inline (void);
-
   /// Get the server template inline stream.
   TAO_OutStream *server_template_inline (void);
 
@@ -341,6 +337,12 @@ public:
   /// Get the CIAO servant source stream.
   TAO_OutStream *ciao_svnt_source (void);
 
+  /// Get the CIAO template servant header stream.
+  TAO_OutStream *ciao_svnt_template_header (void);
+
+  /// Get the CIAO template servant source stream.
+  TAO_OutStream *ciao_svnt_template_source (void);
+
   /// Get the CIAO executor impl header stream.
   TAO_OutStream *ciao_exec_header (void);
 
@@ -417,8 +419,8 @@ private:
   void gen_typecode_includes (TAO_OutStream * stream);
 
   /// Used if one or both of the CIAO code gen flags are set.
-  void gen_svnt_hdr_includes (void);
-  void gen_svnt_src_includes (void);
+  void gen_svnt_hdr_includes (TAO_OutStream *stream);
+  void gen_svnt_src_includes (TAO_OutStream *stream);
   void gen_exec_hdr_includes (void);
   void gen_exec_src_includes (void);
   void gen_exec_idl_includes (void);
@@ -463,9 +465,6 @@ private:
   /// Server skeleton template stream.
   TAO_OutStream *server_template_skeletons_;
 
-  /// Server side inline file.
-  TAO_OutStream *server_inline_;
-
   /// Anyop header file.
   TAO_OutStream *anyop_header_;
 
@@ -481,6 +480,12 @@ private:
   /// Component servant source file.
   TAO_OutStream *ciao_svnt_source_;
 
+  /// Template component servant header file.
+  TAO_OutStream *ciao_svnt_template_header_;
+
+  /// Template component servant source file.
+  TAO_OutStream *ciao_svnt_template_source_;
+
   /// Component executor impl header file.
   TAO_OutStream *ciao_exec_header_;
 
diff --git a/TAO/TAO_IDL/be_include/be_global.h b/TAO/TAO_IDL/be_include/be_global.h
index 4838d0b77ff..e65c4d30646 100644
--- a/TAO/TAO_IDL/be_include/be_global.h
+++ b/TAO/TAO_IDL/be_include/be_global.h
@@ -99,9 +99,6 @@ public:
   static const char *be_get_server_template_skeleton_fname (
     bool base_name_only = false);
 
-  static const char *be_get_server_inline_fname (
-    bool base_name_only = false);
-
   static const char *be_get_anyop_source_fname (
     bool base_name_only = false);
 
@@ -111,9 +108,15 @@ public:
   static const char *be_get_ciao_svnt_hdr_fname (
     bool base_name_only = false);
 
+  static const char *be_get_ciao_tmpl_svnt_hdr_fname (
+    bool base_name_only=false);
+
   static const char *be_get_ciao_svnt_src_fname (
     bool base_name_only = false);
 
+  static const char *be_get_ciao_tmpl_svnt_src_fname (
+    bool base_name_only=false);
+
   static const char *be_get_ciao_exec_hdr_fname (
     bool base_name_only = false);
 
@@ -180,10 +183,6 @@ public:
       UTL_String *idl_file_name,
       bool base_name_only = false);
 
-  static const char *be_get_server_inline (
-    UTL_String *idl_file_name,
-    bool base_name_only = false);
-
   static const char *be_get_anyop_header (
     UTL_String *idl_file_name,
     bool base_name_only = false);
@@ -196,10 +195,18 @@ public:
     UTL_String *idl_file_name,
     bool base_name_only = false);
 
+  static const char *be_get_ciao_svnt_template_header (
+    UTL_String *idl_file_name,
+    bool base_name_only = false);
+
   static const char *be_get_ciao_svnt_source (
     UTL_String *idl_file_name,
     bool base_name_only = false);
 
+  static const char *be_get_ciao_svnt_template_source (
+    UTL_String *idl_file_name,
+    bool base_name_only = false);
+
   static const char *be_get_ciao_exec_header (
     UTL_String *idl_file_name,
     bool base_name_only = false);
@@ -481,12 +488,6 @@ public:
   /// Get the server_template_skeleton_ending.
   const char* server_template_skeleton_ending (void) const;
 
-  /// Set the server_inline_ending.
-  void server_inline_ending (const char* s);
-
-  /// Get the server_inline_ending.
-  const char* server_inline_ending (void) const;
-
   /// Set the anyop_header_ending.
   void anyop_header_ending (const char* s);
 
@@ -501,6 +502,12 @@ public:
 
   /// Similar to above, but for CIAO servant and executor
   /// impl and executor IDL files, if generated.
+  void ciao_svnt_header_template_ending (const char* s);
+  const char* ciao_svnt_header_template_ending (void) const;
+
+  void ciao_svnt_source_template_ending (const char* s);
+  const char* ciao_svnt_source_template_ending (void) const;
+
   void ciao_svnt_header_ending (const char* s);
   const char* ciao_svnt_header_ending (void) const;
 
@@ -603,6 +610,20 @@ public:
   /// to be kept. Default is output_dir_.
   const char* anyop_output_dir (void) const;
 
+  /// Set the directory where all the *exec.* files are
+  /// to be kept. Default is output_dir_.
+  void exec_output_dir (const char* s);
+
+  /// Get the directory where all the *exec.* files are
+  /// to be kept. Default is output_dir_.
+  const char* exec_output_dir (void) const;
+
+  ///Get the flag for not overwriting already existing exec files.
+  bool overwrite_not_exec (void) const;
+
+  ///Set the flag for not overwriting already existing exec files.
+  void overwrite_not_exec (bool val);
+
   /// Set any support.
   void any_support (bool);
 
@@ -797,10 +818,6 @@ public:
   bool gen_client_inline (void) const;
   void gen_client_inline (bool val);
 
-  /// Accessors for the member gen_server_inline_.
-  bool gen_server_inline (void) const;
-  void gen_server_inline (bool val);
-
   /// Accessors for the member gen_client_stub_.
   bool gen_client_stub (void) const;
   void gen_client_stub (bool val);
@@ -967,15 +984,18 @@ private:
   /// "S_T.cpp".
   char* server_template_skeleton_ending_;
 
-  /// Server's inline file name ending. Default is "S.i".
-  char* server_inline_ending_;
-
   /// Anyop header file name ending. Default is "A.h".
   char* anyop_hdr_ending_;
 
   /// Anyop source file name ending. Default is "A.cpp".
   char* anyop_src_ending_;
 
+  /// CIAO servant template header file name ending. Default is "_svnt_T.h".
+  char* ciao_svnt_hdr_template_ending_;
+
+  /// CIAO servant template source file name ending. Default is "_svnt_T.cpp".
+  char* ciao_svnt_src_template_ending_;
+
   /// CIAO servant header file name ending. Default is "_svnt.h".
   char* ciao_svnt_hdr_ending_;
 
@@ -1045,6 +1065,14 @@ private:
    */
   char* anyop_output_dir_;
 
+  /**
+    * Directory where all the *exec.* files are to be
+    * kept. Default value is 0 for this string which means the
+    * value for output_dir_ is used.
+    */
+  char* exec_output_dir_;
+
+
   /// do we support Any operators?
   bool any_support_;
 
@@ -1160,10 +1188,6 @@ private:
   bool gen_client_inline_;
 
   /// True by default, but a command line option can turn this off so
-  /// that we don't generate a server inline file
-  bool gen_server_inline_;
-
-  /// True by default, but a command line option can turn this off so
   /// that we don't generate a client stub file
   bool gen_client_stub_;
 
@@ -1206,6 +1230,10 @@ private:
   bool gen_ciao_exec_impl_;
   bool gen_ciao_exec_reactor_impl_;
 
+  ///Flag to indicate whether generated exec files should
+   ///overwritten already existing exe files
+   bool overwrite_not_exec_;
+
   /// False by default, this flag triggers code generation
   /// for CCM connector implementations.
   bool gen_ciao_conn_impl_;
diff --git a/TAO/TAO_IDL/be_include/be_helper.h b/TAO/TAO_IDL/be_include/be_helper.h
index fa1938ef12a..a34083dc2af 100644
--- a/TAO/TAO_IDL/be_include/be_helper.h
+++ b/TAO/TAO_IDL/be_include/be_helper.h
@@ -110,6 +110,8 @@ public:
       TAO_GPERF_INPUT,
       CIAO_SVNT_HDR,
       CIAO_SVNT_IMPL,
+      CIAO_SVNT_T_HDR,
+      CIAO_SVNT_T_IMPL,
       CIAO_EXEC_HDR,
       CIAO_EXEC_IMPL,
       CIAO_EXEC_IDL,
diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h
index ca64c76bdfd..46e95ec8235 100644
--- a/TAO/TAO_IDL/be_include/be_interface.h
+++ b/TAO/TAO_IDL/be_include/be_interface.h
@@ -185,24 +185,6 @@ public:
                                              be_interface *,
                                              TAO_OutStream *os);
 
-  /// Helper method passed to the template method to generate code for the
-  /// skeletons in the header and inline files.
-  static int gen_skel_helper (be_interface *,
-                              be_interface *,
-                              TAO_OutStream *);
-
-  /// Helper method passed to the template method to generate code for the
-  /// collocated functions in the header file.
-  static int gen_colloc_op_decl_helper (be_interface *derived,
-                                        be_interface *ancestor,
-                                        TAO_OutStream *os);
-
-  /// Helper method passed to the template method to generate code for the
-  /// collocated functions in the source file.
-  static int gen_colloc_op_defn_helper (be_interface *derived,
-                                        be_interface *ancestor,
-                                        TAO_OutStream *os);
-
   /// Helper method passed to the template method to invoke ctors of all the
   /// base classes.
   static int copy_ctor_helper (be_interface *,
@@ -247,15 +229,6 @@ public:
   /// pure virtual.
   int convert_parent_ops (be_visitor *visitor);
 
-  /// Common code called from gen_colloc_op_defn_helper().
-  static void gen_collocated_skel_body (be_interface *derived,
-                                        be_interface *ancestor,
-                                        AST_Decl *d,
-                                        const char *prefix,
-                                        bool direct,
-                                        UTL_ExceptList *list,
-                                        TAO_OutStream *os);
-
   /// Overridden from class be_type.
   virtual void gen_ostream_operator (TAO_OutStream *os,
                                      bool use_underscore);
@@ -412,6 +385,9 @@ protected:
   /// applies only to implied IDL
   be_interface *original_interface_;
 
+  /// Are we an AMH reply handler?
+  bool is_amh_rh_;
+
   /// Are we an AMI reply handler?
   bool is_ami_rh_;
 
diff --git a/TAO/TAO_IDL/be_include/be_provides.h b/TAO/TAO_IDL/be_include/be_provides.h
index 0effaf3ce33..6c32155c6b1 100644
--- a/TAO/TAO_IDL/be_include/be_provides.h
+++ b/TAO/TAO_IDL/be_include/be_provides.h
@@ -25,8 +25,8 @@ public:
   be_type *provides_type (void) const;
 
   // Common code called by visitors.
-  int gen_facet_svnt_decl (TAO_OutStream &os);
-  int gen_facet_svnt_defn (TAO_OutStream &os);
+  int gen_facet_svnt_tmpl_decl (TAO_OutStream &os);
+  int gen_facet_svnt_tmpl_defn (TAO_OutStream &os);
 
   // Narrowing.
   DEF_NARROW_FROM_DECL(be_provides);
diff --git a/TAO/TAO_IDL/be_include/be_util.h b/TAO/TAO_IDL/be_include/be_util.h
index 26f05ee0bd7..7152e910841 100644
--- a/TAO/TAO_IDL/be_include/be_util.h
+++ b/TAO/TAO_IDL/be_include/be_util.h
@@ -63,7 +63,14 @@ public:
 
   /// Called from various places.
   static const char *
-  get_output_path (bool for_anyop, bool for_skel);
+  get_output_path (bool for_anyop, bool for_skel, bool for_exec);
+
+  static const char *
+  get_complete_file_name (bool for_exec);
+
+  /// Called from various places.
+  static bool
+  overwrite_ciao_exec_files (void);
 
   // Called by each node upon construction.
   static void set_arg_seen_bit (be_type *);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component.h b/TAO/TAO_IDL/be_include/be_visitor_component.h
index deb945c9eab..1fd4cfdf9b1 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component.h
@@ -21,11 +21,11 @@
 
 #include "be_visitor_component/component.h"
 #include "be_visitor_component/component_svh.h"
-#include "be_visitor_component/facet_svh.h"
+#include "be_visitor_component/facet_svth.h"
 #include "be_visitor_component/context_svh.h"
 #include "be_visitor_component/servant_svh.h"
 #include "be_visitor_component/component_svs.h"
-#include "be_visitor_component/facet_svs.h"
+#include "be_visitor_component/facet_svts.h"
 #include "be_visitor_component/context_svs.h"
 #include "be_visitor_component/servant_svs.h"
 #include "be_visitor_component/component_ex_idl.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/facet_svh.h b/TAO/TAO_IDL/be_include/be_visitor_component/facet_svth.h
index 93d83b4eb57..819e0dc8161 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/facet_svh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/facet_svth.h
@@ -1,7 +1,7 @@
 /* -*- c++ -*- */
 //=============================================================================
 /**
- *  @file    facet_svh.h
+ *  @file    facet_svth.h
  *
  *  $Id$
  *
@@ -18,20 +18,22 @@
 #define _BE_COMPONENT_FACET_SVH_H_
 
 /**
- * @class be_visitor_facet_svh
+ * @class be_visitor_facet_svth
  *
- * @brief be_visitor_facet_svh
+ * @brief be_visitor_facet_svth
  *
  * This is a concrete visitor to generate the facet servant decl
  * for a component.
  */
-class be_visitor_facet_svh : public be_visitor_component_scope
+class be_visitor_facet_svth : public be_visitor_component_scope
 {
 public:
-  be_visitor_facet_svh (be_visitor_context *ctx);
+  be_visitor_facet_svth (be_visitor_context *ctx);
 
-  ~be_visitor_facet_svh (void);
+  ~be_visitor_facet_svth (void);
 
+  virtual int visit_connector (be_connector *node);
+  virtual int visit_component (be_component *node);
   virtual int visit_provides (be_provides *node);
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/facet_svs.h b/TAO/TAO_IDL/be_include/be_visitor_component/facet_svts.h
index 46658f60257..771fd5c74df 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/facet_svs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/facet_svts.h
@@ -1,7 +1,7 @@
 /* -*- c++ -*- */
 //=============================================================================
 /**
- *  @file    facet_svs.h
+ *  @file    facet_svts.h
  *
  *  $Id$
  *
@@ -18,20 +18,22 @@
 #define _BE_COMPONENT_FACET_SVS_H_
 
 /**
- * @class be_visitor_facet_svs
+ * @class be_visitor_facet_svts
  *
- * @brief be_visitor_facet_svs
+ * @brief be_visitor_facet_svts
  *
  * This is a concrete visitor to generate the facet servant defn
  * for a component.
  */
-class be_visitor_facet_svs : public be_visitor_component_scope
+class be_visitor_facet_svts : public be_visitor_component_scope
 {
 public:
-  be_visitor_facet_svs (be_visitor_context *ctx);
+  be_visitor_facet_svts (be_visitor_context *ctx);
 
-  ~be_visitor_facet_svs (void);
+  ~be_visitor_facet_svts (void);
 
+  virtual int visit_connector (be_connector *node);
+  virtual int visit_component (be_component *node);
   virtual int visit_provides (be_provides *node);
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface.h b/TAO/TAO_IDL/be_include/be_visitor_interface.h
index 740fa08dcae..a9334086554 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface.h
@@ -27,7 +27,6 @@
 #include "be_visitor_interface/interface_cs.h"
 #include "be_visitor_interface/interface_sh.h"
 #include "be_visitor_interface/interface_ih.h"
-#include "be_visitor_interface/interface_si.h"
 #include "be_visitor_interface/interface_ss.h"
 #include "be_visitor_interface/interface_is.h"
 #include "be_visitor_interface/interface_ex_idl.h"
@@ -54,7 +53,6 @@
 // AMH
 #include "be_visitor_interface/amh_ch.h"
 #include "be_visitor_interface/amh_sh.h"
-#include "be_visitor_interface/amh_si.h"
 #include "be_visitor_interface/amh_ss.h"
 #include "be_visitor_interface/amh_rh_sh.h"
 #include "be_visitor_interface/amh_rh_ss.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_si.h b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_si.h
deleted file mode 100644
index 77eb09dc377..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_si.h
+++ /dev/null
@@ -1,31 +0,0 @@
-//=============================================================================
-/**
- *  @file   amh_si.h
- *
- *  $Id$
- *
- *  Specialized interface visitor for AMH
- *
- *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef AMH_SH_I_
-#define AMH_SH_I_
-
-class be_visitor_amh_interface_si : public be_visitor_interface_si
-{
-public:
-  be_visitor_amh_interface_si (be_visitor_context *ctx);
-  ~be_visitor_amh_interface_si (void);
-
-  int visit_interface (be_interface *node);
-
-  // Helper method passed to the template method to generate code for the
-  // AMH skeletons in the inline files.
-  static int gen_skel_helper (be_interface *,
-                              be_interface *,
-                              TAO_OutStream *);
-};
-
-#endif /* AMH_SH_I_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ss.h
index c65578519df..d14fdf2ba03 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ss.h
@@ -31,8 +31,6 @@ protected:
   virtual void this_method (be_interface *node);
   virtual void dispatch_method (be_interface *node);
 
-  virtual void generate_send_reply (TAO_OutStream * os);
-
   virtual int generate_amh_classes (be_interface *node);
   virtual int generate_proxy_classes (be_interface *node);
 //   virtual int generate_downcast_implementation (be_interface *node,
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_si.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_si.h
deleted file mode 100644
index cbf85d0f780..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_si.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    interface_si.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Interface node.
- *  This provides for code generation in the server inline
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
-#ifndef _BE_INTERFACE_INTERFACE_SI_H_
-#define _BE_INTERFACE_INTERFACE_SI_H_
-
-/**
- * @class be_visitor_interface_si
- *
- * @brief be_visitor_interface_si
- *
- * This is a concrete visitor to generate the server inline for interface
- */
-class be_visitor_interface_si : public be_visitor_interface
-{
-public:
-  be_visitor_interface_si (be_visitor_context *ctx);
-  ~be_visitor_interface_si (void);
-
-  virtual int visit_interface (be_interface *node);
-  virtual int visit_component (be_component *node);
-  virtual int visit_connector (be_connector *node);
-
-protected:
-  virtual int generate_amh_classes (be_interface *node);
-};
-
-#endif /* _BE_INTERFACE_INTERFACE_SI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h
index f86a68aa722..440aceef479 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h
@@ -46,13 +46,6 @@ protected:
   virtual void this_method (be_interface *node);
   virtual void dispatch_method (be_interface *node);
 
-  // Some AMH skeletons must explicitly send the reply, for regular
-  // classes the following function is empty, for AMH code it
-  // generates the explicit call.
-  virtual void generate_send_reply (TAO_OutStream * os);
-
-///   virtual int generate_downcast_implementation (be_interface *node,
-///                                                 TAO_OutStream *os);
   virtual int generate_amh_classes (be_interface *node);
   virtual int generate_proxy_classes (be_interface *node);
   virtual int generate_copy_ctor (be_interface *node,
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root.h b/TAO/TAO_IDL/be_include/be_visitor_root.h
index 7cd109881cb..03bb3e7722a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root.h
@@ -24,13 +24,14 @@
 #include "be_visitor_root/root_ci.h"
 #include "be_visitor_root/root_cs.h"
 #include "be_visitor_root/root_sh.h"
-#include "be_visitor_root/root_si.h"
 #include "be_visitor_root/root_ss.h"
 #include "be_visitor_root/root_sth.h"
 #include "be_visitor_root/root_is.h"
 #include "be_visitor_root/root_ih.h"
 #include "be_visitor_root/root_svh.h"
 #include "be_visitor_root/root_svs.h"
+#include "be_visitor_root/root_svth.h"
+#include "be_visitor_root/root_svts.h"
 #include "be_visitor_root/root_ex_idl.h"
 #include "be_visitor_root/root_exh.h"
 #include "be_visitor_root/root_exs.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_si.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_si.h
deleted file mode 100644
index f89c54e951d..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_si.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    root_si.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Root class
- *  This one provides code generation for elements of the Root node in the
- *  server inline.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
-#ifndef _BE_VISITOR_ROOT_ROOT_SI_H_
-#define _BE_VISITOR_ROOT_ROOT_SI_H_
-
-/**
- * @class be_visitor_root_si
- *
- * @brief be_visitor_root_si
- *
- * This is a concrete visitor to generate the server inline for root
- */
-class be_visitor_root_si : public be_visitor_root
-{
-public:
-  be_visitor_root_si (be_visitor_context *ctx);
-
-  ~be_visitor_root_si (void);
-
-  virtual int visit_root (be_root *node);
-
-private:
-  /// Open file and initialize stream.
-  int init (void);
-};
-
-#endif /* _BE_VISITOR_ROOT_ROOT_SI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_svth.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_svth.h
new file mode 100644
index 00000000000..c871779a766
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_svth.h
@@ -0,0 +1,43 @@
+/* -*- c++ -*- */
+
+//=============================================================================
+/**
+ *  @file    root_svth.h
+ *
+ *  $Id$
+ *
+ *  Concrete visitor for the Root class
+ *  This one provides code generation for elements of the Root node in the
+ *  CIAO servant header.
+ *
+ *
+ *  @author Marcel Smit
+ */
+//=============================================================================
+
+#ifndef _BE_VISITOR_ROOT_ROOT_SVTH_H_
+#define _BE_VISITOR_ROOT_ROOT_SVTH_H_
+
+/**
+ * @class be_visitor_root_svth
+ *
+ * @brief be_visitor_root_svth
+ *
+ * This is a concrete visitor to generate the CIAO template servant
+ * header for root
+ */
+class be_visitor_root_svth : public be_visitor_root
+{
+public:
+  be_visitor_root_svth (be_visitor_context *ctx);
+
+  ~be_visitor_root_svth (void);
+
+  virtual int visit_root (be_root *node);
+
+private:
+  /// Open file and initialize stream.
+  int init (void);
+};
+
+#endif /* _BE_VISITOR_ROOT_ROOT_SVTH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_svts.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_svts.h
new file mode 100644
index 00000000000..28dcf4909a3
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_svts.h
@@ -0,0 +1,43 @@
+/* -*- c++ -*- */
+
+//=============================================================================
+/**
+ *  @file    root_svts.h
+ *
+ *  $Id$
+ *
+ *  Concrete visitor for the Root class
+ *  This one provides code generation for elements of the Root node in the
+ *  CIAO servant source.
+ *
+ *
+ *  @author Marcel Smit
+ */
+//=============================================================================
+
+#ifndef _BE_VISITOR_ROOT_ROOT_SVTS_H_
+#define _BE_VISITOR_ROOT_ROOT_SVTS_H_
+
+/**
+ * @class be_visitor_root_svts
+ *
+ * @brief be_visitor_root_svts
+ *
+ * This is a concrete visitor to generate the CIAO template servant
+ * source for root
+ */
+class be_visitor_root_svts : public be_visitor_root
+{
+public:
+  be_visitor_root_svts (be_visitor_context *ctx);
+
+  ~be_visitor_root_svts (void);
+
+  virtual int visit_root (be_root *node);
+
+private:
+  /// Set the right context and make a visitor.
+  int init (void);
+};
+
+#endif /* _BE_VISITOR_ROOT_ROOT_SVTS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype.h
index d2b8edfb80e..a8a73cc1846 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype.h
@@ -26,7 +26,6 @@
 #include "be_visitor_valuetype/valuetype_ci.h"
 #include "be_visitor_valuetype/valuetype_cs.h"
 #include "be_visitor_valuetype/valuetype_sh.h"
-#include "be_visitor_valuetype/valuetype_si.h"
 #include "be_visitor_valuetype/valuetype_ss.h"
 #include "be_visitor_valuetype/any_op_ch.h"
 #include "be_visitor_valuetype/any_op_cs.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_si.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_si.h
deleted file mode 100644
index 698c702d03e..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_si.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    valuetype_si.h
- *
- *  $Id$
- *
- *  Concrete visitor for the valuetype node.
- *  This provides for code generation in the server inline
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef _BE_VALUETYPE_VALUETYPE_SI_H_
-#define _BE_VALUETYPE_VALUETYPE_SI_H_
-
-/**
- * @class be_visitor_valuetype_si
- *
- * @brief be_visitor_valuetype_si
- *
- * This is a concrete visitor to generate the server inline for valuetype
- */
-class be_visitor_valuetype_si : public be_visitor_valuetype
-{
-public:
-  /// constructor
-  be_visitor_valuetype_si (be_visitor_context *ctx);
-
-  /// destructor
-  ~be_visitor_valuetype_si (void);
-
-  virtual int visit_valuetype (be_valuetype *node);
-  virtual int visit_eventtype (be_eventtype *node);
-};
-
-#endif /* _BE_VALUETYPE_VALUETYPE_SI_H_ */
diff --git a/TAO/TAO_IDL/util/utl_stack.cpp b/TAO/TAO_IDL/util/utl_stack.cpp
index aac41c094af..70c0168fe62 100644
--- a/TAO/TAO_IDL/util/utl_stack.cpp
+++ b/TAO/TAO_IDL/util/utl_stack.cpp
@@ -129,9 +129,11 @@ UTL_ScopeStack::pop (void)
       return;
     }
 
+  UTL_Scope *current = this->top ();
+
   // If our top scope has a #pragma prefix associated with it,
   // it goes away with the scope.
-  if (this->top_non_null ()->has_prefix ())
+  if (current != 0 && current->has_prefix ())
     {
       char *trash = 0;
       idl_global->pragma_prefixes ().pop (trash);
diff --git a/TAO/VERSION b/TAO/VERSION
index 766b958c9ec..2326855913d 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION
@@ -1,4 +1,4 @@
-This is TAO version 2.0.5, released Mon Oct 10 08:48:51 CEST 2011
+This is TAO version 2.0.6, released Sun Dec 04 11:51:30 CET 2011
 
 If you have any problems with or questions about TAO, please send
 e-mail to the TAO mailing list (tao-bugs@list.isis.vanderbilt.edu),
diff --git a/TAO/bin/tao_orb_tests.lst b/TAO/bin/tao_orb_tests.lst
index 260dbb7cd5f..a2c2e659dab 100644
--- a/TAO/bin/tao_orb_tests.lst
+++ b/TAO/bin/tao_orb_tests.lst
@@ -29,6 +29,7 @@ TAO/tests/Param_Test/run_test_dii.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !
 TAO/tests/AMI/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/AMI/run_test.pl -exclusive: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/AMI/run_mt_noupcall.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/tests/AMI/run_exclusive_rw.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/AMI_Timeouts/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
 TAO/tests/AMH_Exceptions/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO
 TAO/tests/AMH_Oneway/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_ToFix_LynxOS_x86 !ACE_FOR_TAO
@@ -130,7 +131,7 @@ TAO/tests/Bug_2935_Regression/run_test.pl:
 TAO/tests/Bug_2936_Regression/run_test.pl: !ST !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !LynxOS !STATIC
 TAO/tests/Bug_2953_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
 TAO/tests/Bug_2966_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/tests/Bug_3000_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !FIXED_BUGS_ONLY
+TAO/tests/Bug_3000_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/Bug_3042_Regression/run_test.pl:
 TAO/tests/Bug_3068_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_BIDIR !ST
 TAO/tests/Bug_3108_Regression/run_test.pl: !ST
@@ -267,6 +268,7 @@ TAO/tests/Smart_Proxies/run_test.pl:
 TAO/tests/Smart_Proxies/dtor/run_test.pl:
 TAO/tests/Stack_Recursion/run_test.pl: !ST !DISABLE_ToFix_LynxOS_PPC !QUICK
 TAO/tests/Stack_Recursion/run_test.pl -quick : !ST !DISABLE_ToFix_LynxOS_PPC QUICK
+TAO/tests/Skeleton_Inheritance/run_test.pl:
 TAO/tests/Faults/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !OpenVMS_IA64Crash
 TAO/tests/Faults/run_test_pp.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST !OpenVMS_IA64Crash
 TAO/tests/CallbackTest/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
@@ -275,6 +277,8 @@ TAO/tests/CallbackTest/run_test_mixed_ip.pl: IPV6 !MINIMUM !CORBA_E_COMPACT !COR
 TAO/tests/Crashed_Callback/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !OpenVMS_IA64Crash
 # Disabled Crash On Write on Win32, see bugzilla 959 why !LabVIEW_RT !WinCE
 TAO/tests/Crash_On_Write/run_test.pl: !ST !Win32
+TAO/tests/Mixed_Sync_ASync_Events/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/tests/Mixed_Sync_ASync_Events/run_exclusive_rw.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/MT_NoUpcall_Client_Leader/run_test.pl: !ST !CORBA_E_MICRO !NO_MESSAGING
 TAO/tests/Nested_Upcall_Crash/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !OpenVMS_IA64Crash !QUICK
 TAO/tests/Nested_Upcall_Crash/run_test.pl -quick: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !OpenVMS_IA64Crash QUICK
@@ -312,11 +316,11 @@ TAO/tests/POA/Default_Servant2/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_M
 TAO/tests/POA/Explicit_Activation/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
 TAO/tests/POA/FindPOA/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/POA/NewPOA/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
-TAO/tests/POA/On_Demand_Act_Direct_Coll/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !ACE_FOR_TAO
+TAO/tests/POA/On_Demand_Act_Direct_Coll/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
 TAO/tests/POA/On_Demand_Activation/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !ACE_FOR_TAO
-TAO/tests/POA/On_Demand_Loading/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !KCC_Linux !ACE_FOR_TAO
+TAO/tests/POA/On_Demand_Loading/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !ACE_FOR_TAO
 TAO/tests/POA/Reference_Counted_Servant/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO
-TAO/tests/POA/Loader/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !KCC_Linux !ACE_FOR_TAO
+TAO/tests/POA/Loader/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !ACE_FOR_TAO
 TAO/tests/POA/RootPOA/run_test.pl:
 TAO/tests/DiffServ/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/tests/IORManipulation/run_test.pl:
diff --git a/TAO/bin/tao_other_tests.lst b/TAO/bin/tao_other_tests.lst
index b72c4809398..c1ee7bdb412 100644
--- a/TAO/bin/tao_other_tests.lst
+++ b/TAO/bin/tao_other_tests.lst
@@ -185,6 +185,7 @@ TAO/orbsvcs/tests/Security/Crash_Test/run_test.pl -quick: SSL QUICK !STATIC !DIS
 TAO/orbsvcs/tests/Security/InsecureReferences/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/orbsvcs/tests/Security/EndpointPolicy/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
 TAO/orbsvcs/tests/Security/Null_Cipher/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO
+TAO/orbsvcs/tests/Security/MT_BiDir_SSL/run_test.pl: SSL !STATIC !DISABLE_INTERCEPTORS !ACE_FOR_TAO !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !GIOP10 !DISABLE_BIDIR !LynxOS
 TAO/orbsvcs/tests/Miop/McastHello/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !STATIC !NO_MCAST
 # The following 2 tests use dynamic loading to change the default reactor on Windows !VxWorks !VxWorks_RTP !LabVIEW_RT
 TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS !STATIC !ACE_FOR_TAO !LynxOS !ST
diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html
index 40995028e39..bf2f01eca8a 100644
--- a/TAO/docs/Options.html
+++ b/TAO/docs/Options.html
@@ -1550,27 +1550,31 @@ of multiple threads with a single Reactor. </p>
 instead of waiting in the Reactor using the Leader/Followers
 pattern. The <em>RW</em> strategy only works when the application
 does not have to worry about new request showing up when waiting for a
-response. Further, this strategy cannot be used with Asynchronous
-Method Invocation (AMI) calls and when using BiDIR GIOP.
-Therefore, this strategy is appropriate
-only for "pure" synchronous clients. Note that applications that
-require nested upcalls are not "pure" synchronous clients. Also note that this
-strategy will only affect two way calls, since there is no waiting for
-one way calls. This strategy can also be used in an application that
-is both a client and a server if the server side is handled by a
-separate thread and the client threads are "pure" clients. When this strategy
-is set to RW, then also the -ORBFlushingStrategy (which is part of the
-Resource_Factory) has to be set to <code>blocking</code>.</p> <p>
-        <CODE>MT_NOUPCALL</CODE> <b>(EXPERIMENTAL!)</b> means use a client connection handler that
+response. Further, this strategy cannot be used with BiDIR GIOP.
+Note that applications that require nested upcalls are not compatible
+with this strategy. Also note that this strategy will only affect synchronous
+two way calls, since there is no waiting for one way calls or AMI requests
+(at least not in the same sense as for synchronous two way calls).
+This strategy can also be used in an application that
+is both a client and a server where the server side is handled by a
+separate thread and the client threads are "pure" clients.
+Use in single threaded applications with both client and server roles is
+also possible but in these cases special care has to be taken to avoid
+deadlocks because of nested synchronous calls. Mixing in AMI requests and/or
+other asynchronous reactor (timer/notification) events might help solve
+such issues.
+When this strategy is set to RW, then also the -ORBFlushingStrategy
+(which is part of the Resource_Factory) has to be set to <code>blocking</code>.</p>
+<p>
+        <CODE>MT_NOUPCALL</CODE> means use a client connection handler that
         participates in the leader-follower model like MT, but, like
-        RW, does not allow handling of nested upcalls within the
-        waiting thread.  Note that with this strategy it is possible
+        RW, does not allow handling of nested CORBA upcalls within the
+        waiting thread. It does allow handling of other non CORBA (ACE reactor events)
+        like timers and ACE notification queue events. Note that with
+        this strategy it is possible
         to "run out of threads" in a thread pool, and that TAO doesn't
         grow thread pools.  Unlike RW, this does not require  <a
         href="#ORBTransportMuxStrategy">-ORBTransportMuxStrategy&nbsp;<em>EXCLUSIVE</em></a>.
-<!--
-I'm not sure what the affect of AMI on this option is.
--->
 </p>
         <p>Default for this option is <em>MT</em>. </p>
         </td>
@@ -1584,7 +1588,7 @@ I'm not sure what the affect of AMI on this option is.
         handlers setup for sending messages need to  be cleaned up
         when errors occur. This option has an  effect only for
         <em> -ORBClientConnectionHandler RW </em>. Rest of  the
-        options for <em> -ORBCleintConnectionHandler </em> have been
+        options for <em> -ORBClientConnectionHandler </em> have been
         automatically set up for cleaning the connection
         handlers. Setting the option to <em> 1 </em> has a side
         effect of registering and unregistering the connection
diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html
index 604920dad12..a9afc4c9c24 100644
--- a/TAO/docs/compiler.html
+++ b/TAO/docs/compiler.html
@@ -53,7 +53,7 @@ these files:) <P>
   <LI> <B><EM>Client stubs</EM></B>, <EM>i.e.</EM>, <tt>*C.h</tt>,
       <tt>*C.inl</tt>, and <tt>*C.cpp</tt>.  Pure client applications
       only need to <code>#include</code> and link with these files.
-  <LI> <B><EM>Server skeletons</EM></B>, <EM>i.e.</EM>,  <tt>*S.h</tt>, <tt>*S.inl</tt>, and
+  <LI> <B><EM>Server skeletons</EM></B>, <EM>i.e.</EM>,  <tt>*S.h</tt>, and
       <tt>*S.cpp</tt>.  Servers need to <code>#include</code> and link
       with these files. Generation of these files may be suppressed with the <tt>-SS</tt> option.
   <LI> <B><EM>Server skeleton templates</EM></B>, <EM>i.e.</EM>, <tt>*S_T.h</tt>, <tt>S_T.inl</tt>,
@@ -681,6 +681,21 @@ also receives other options that are specific to it.<p>
     <td>Default is value of -o option or current directory&nbsp;</td>
   </tr>
 
+  <tr><a name="oE">
+    <td><tt>-oE </tt><i>path</i></td>
+
+    <td>Same as -o option but applies only to generated *_exec.* files&nbsp;</td>
+    <td>Default is value of -o option or current directory&nbsp;</td>
+  </tr>
+
+  <tr><a name="oN">
+    <td><tt>-oN </tt><i>path</i></td>
+
+    <td>Do not overwrite *_exec.* files&nbsp;</td>
+    <td>When -Gex option is used, executor implementation files shouldn't be overwritten
+      if they are already in the output directory.&nbsp;</td>
+  </tr>
+
   <tr><a name="hc">
     <td><tt>-hc</tt></td>
 
@@ -730,13 +745,6 @@ also receives other options that are specific to it.<p>
     <td>&nbsp;</td>
   </tr>
 
-  <tr><a name="si">
-    <td><tt>-si</tt></td>
-
-    <td>Server inline skeleton file name ending. Default is "S.inl".</td>
-    <td>&nbsp;</td>
-  </tr>
-
   <tr><a name="t">
     <td><tt>-t</tt></td>
 
diff --git a/TAO/docs/tutorials/Quoter/Simple/Client/index.html b/TAO/docs/tutorials/Quoter/Simple/Client/index.html
index 26adb26483b..33a8cca7092 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Client/index.html
+++ b/TAO/docs/tutorials/Quoter/Simple/Client/index.html
@@ -105,7 +105,7 @@ $ $ACE_ROOT/TAO/TAO_IDL/tao_idl Quoter.idl
       generated from <CODE>QuoterC.cpp</CODE>.
     </P>
     <P>
-      Similarly, <CODE>QuoterS.h</CODE>, <CODE>QuoterS.inl</CODE>
+      Similarly, <CODE>QuoterS.h</CODE>,
       and <CODE>QuoterS.cpp</CODE> contain the server-side
       <EM>skeletons</EM>. Servers must link the object files generated
       from <CODE>QuoterS.cpp</CODE> <STRONG>and</STRONG> <CODE>QuoterC.cpp</CODE>.
@@ -149,9 +149,9 @@ int main (int argc, char* argv[])
                        "" /* the ORB name, it can be anything! */);
 </PRE>
     <P>IDL supports variable-length types whose sizes are not known
-      at compile time, hence they must be dynamically allocated at run 
+      at compile time, hence they must be dynamically allocated at run
       time. <CODE>_var</CODE> types relieve us of the explicit memory
-      management of the variable-length types and thus hide the 
+      management of the variable-length types and thus hide the
       differences between fixed and variable-length structured types.
     </P>
     <P>Since the ORB initialization can fail, and in fact, any CORBA
@@ -225,9 +225,9 @@ int main (int argc, char* argv[])
     Quoter::Stock_Factory_var factory =
       Quoter::Stock_Factory::_narrow (factory_object.in ());
 </PRE>
-    <P>The <CODE>_narrow()</CODE> is used to test if a reference 
-      is of the specified type. If the reference is of the specified 
-      type, it returns a non-nil reference, else it returns a nil. 
+    <P>The <CODE>_narrow()</CODE> is used to test if a reference
+      is of the specified type. If the reference is of the specified
+      type, it returns a non-nil reference, else it returns a nil.
     </P>
     <P>There are a few interesting things about TAO:  First, it supports
       the <CODE>file:</CODE> scheme for object references, so the first
diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.cpp b/TAO/examples/AMH/Sink_Server/Base_Server.cpp
index 1d75f403db2..f4c2a9f81d9 100644
--- a/TAO/examples/AMH/Sink_Server/Base_Server.cpp
+++ b/TAO/examples/AMH/Sink_Server/Base_Server.cpp
@@ -22,17 +22,6 @@ Base_Server::Base_Server (int &argc, ACE_TCHAR **argv)
 
 Base_Server::~Base_Server (void)
 {
-  try
-    {
-      this->root_poa_->destroy (1, 1);
-
-      this->orb_->destroy ();
-    }
-  catch (const CORBA::Exception& ex)
-    {
-      ex._tao_print_exception (
-        "Exception caught while destroying Base_Server\n");
-    }
 }
 
 int
@@ -103,6 +92,28 @@ Base_Server::try_RT_scheduling (void)
 }
 
 int
+Base_Server::shutdown_orb_and_poa (void)
+{
+  try
+    {
+      this->root_poa_->destroy (1, 1);
+      this->root_poa_ = PortableServer::POA::_nil ();
+
+      this->orb_->destroy ();
+      this->orb_ = CORBA::ORB::_nil ();
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Exception raised shutting down ORB or POA");
+      return -1;
+    }
+
+  // If we have got to this point, everything has gone well.  return
+  // normally
+  return 1;
+}
+
+int
 Base_Server::start_orb_and_poa (void)
 {
   try
@@ -123,7 +134,6 @@ Base_Server::start_orb_and_poa (void)
         this->root_poa_->the_POAManager ();
 
       poa_manager->activate ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.h b/TAO/examples/AMH/Sink_Server/Base_Server.h
index ab0055f94aa..ef22b3a62c7 100644
--- a/TAO/examples/AMH/Sink_Server/Base_Server.h
+++ b/TAO/examples/AMH/Sink_Server/Base_Server.h
@@ -59,6 +59,8 @@ public:
   /// ORB inititalisation stuff
   int start_orb_and_poa (void);
 
+  int shutdown_orb_and_poa (void);
+
   /// register the servant with the poa
   virtual void register_servant (AMH_Servant *servant);
 
diff --git a/TAO/examples/AMH/Sink_Server/Client_Task.cpp b/TAO/examples/AMH/Sink_Server/Client_Task.cpp
index bbbf8f7a0fb..810db72ea71 100644
--- a/TAO/examples/AMH/Sink_Server/Client_Task.cpp
+++ b/TAO/examples/AMH/Sink_Server/Client_Task.cpp
@@ -127,7 +127,6 @@ Client_Task::run_test (void)
       this->roundtrip_->end_test ();
 
       test_end = ACE_OS::gethrtime ();
-
     }
   catch (const CORBA::Exception&)
     {
diff --git a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp
index a7111fcc335..ac39d9958d4 100644
--- a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp
+++ b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp
@@ -30,7 +30,7 @@ MT_AMH_Server::usage (const char *message)
   //    something we normally do.
   //
   // Mayur: Seems cleaner to me this way.
-  ACE_ERROR ((LM_ERROR, "%s : %s", message, usage));
+  ACE_ERROR ((LM_ERROR, "%C : %C", message, usage));
 }
 
 
diff --git a/TAO/examples/AMH/Sink_Server/client.cpp b/TAO/examples/AMH/Sink_Server/client.cpp
index c5d6a00e3f5..2cbdaac57a3 100644
--- a/TAO/examples/AMH/Sink_Server/client.cpp
+++ b/TAO/examples/AMH/Sink_Server/client.cpp
@@ -26,6 +26,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
 
       task.run_test();
+
+      orb->destroy ();
     }
   catch (const ::CORBA::Exception &ex)
     {
diff --git a/TAO/examples/AMH/Sink_Server/mt_server.cpp b/TAO/examples/AMH/Sink_Server/mt_server.cpp
index ac0c2174eda..53419811254 100644
--- a/TAO/examples/AMH/Sink_Server/mt_server.cpp
+++ b/TAO/examples/AMH/Sink_Server/mt_server.cpp
@@ -26,6 +26,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
   amh_server.register_servant (&servant);
   amh_server.start_threads ();
+  amh_server.shutdown_orb_and_poa ();
 
   return 1;
 }
diff --git a/TAO/examples/AMH/Sink_Server/run_test.pl b/TAO/examples/AMH/Sink_Server/run_test.pl
index 94bd8e83859..95642572fb5 100755
--- a/TAO/examples/AMH/Sink_Server/run_test.pl
+++ b/TAO/examples/AMH/Sink_Server/run_test.pl
@@ -76,13 +76,12 @@ if ($client->PutFile ($iorbase) == -1) {
     exit 1;
 }
 
-
 # Run client.
 print STDERR "\n     Client making $iterations calls to server: \n";
 $evt_per_sec = 1000/$delay_time/1000;
 print STDERR "\n(Expect less than $evt_per_sec Events/sec) \n\n";
 
-$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 285);
+$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 60);
 
 if ($client_status != 0) {
     print STDERR "ERROR: client returned $client_status\n";
diff --git a/TAO/examples/AMH/Sink_Server/st_server.cpp b/TAO/examples/AMH/Sink_Server/st_server.cpp
index 74a5fbffa15..bc3477c888b 100644
--- a/TAO/examples/AMH/Sink_Server/st_server.cpp
+++ b/TAO/examples/AMH/Sink_Server/st_server.cpp
@@ -41,6 +41,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
   amh_server.register_servant (&servant);
   amh_server.run_event_loop ();
+  amh_server.shutdown_orb_and_poa ();
 
   return 0;
 }
diff --git a/TAO/examples/AMI/FL_Callback/FL_Callback.mpc b/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
index b92be693ead..26dfc3111de 100644
--- a/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
+++ b/TAO/examples/AMI/FL_Callback/FL_Callback.mpc
@@ -28,7 +28,6 @@ project(*progress): taoexe, messaging, ami, portableserver, tao_flresource {
   
   Inline_Files {
     testC.inl
-    testS.inl
   }
   
   IDL_Files {
@@ -54,7 +53,6 @@ project(*peer): taoexe, strategies, messaging, ami, portableserver {
   
   Inline_Files {
     testC.inl
-    testS.inl
   }
   
   IDL_Files {
diff --git a/TAO/examples/RTScheduling/Job.mpc b/TAO/examples/RTScheduling/Job.mpc
index 103df7d95ce..8e46c315901 100644
--- a/TAO/examples/RTScheduling/Job.mpc
+++ b/TAO/examples/RTScheduling/Job.mpc
@@ -26,6 +26,5 @@ project(Job): portableserver {
 
   Inline_Files {
     JobC.inl
-    JobS.inl
   }
 }
diff --git a/TAO/examples/RTScheduling/Synch.mpc b/TAO/examples/RTScheduling/Synch.mpc
index 23920a77023..77a2ae1d681 100644
--- a/TAO/examples/RTScheduling/Synch.mpc
+++ b/TAO/examples/RTScheduling/Synch.mpc
@@ -27,6 +27,5 @@ project(RTSchedSynch): portableserver {
 
   Inline_Files {
     SynchC.inl
-    SynchS.inl
   }
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.idl b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.idl
index aa0fecbd401..03b6a55385a 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.idl
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.idl
@@ -8,7 +8,7 @@ module ImplementationRepository
 {
   interface Activator
   {
-    // Tells the activator to launch a server with the given information.
+    /// Tells the activator to launch a server with the given information.
     void start_server(in string name, in string cmdline,
       in string dir, in EnvironmentList env) raises(CannotActivate);
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.idl b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.idl
index acae98bb07f..604081c7c68 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.idl
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator.idl
@@ -1,5 +1,4 @@
 // -*- IDL -*-
-
 // $Id$
 
 #include "ImR_Activator.idl"
@@ -8,14 +7,15 @@ module ImplementationRepository
 {
   interface Locator : Administration
   {
-    // returns a token that can be used (along with activator name) to unregister the activator.
+    /// returns a token that can be used (along with activator name) to
+    /// unregister the activator.
     long register_activator (in string name, in Activator act);
 
-    // You must pass in the token returned from register_activator.
+    /// You must pass in the token returned from register_activator.
     void unregister_activator (in string name, in long token);
 
-    // The ImR_Activator calls this method to notify death of child
-    // process that it had started.
+    /// The ImR_Activator calls this method to notify death of child
+    /// process that it had started.
     void notify_child_death (in string name);
   };
 };
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index b8204ebca0e..79d217939cf 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// // $Id$
 
 #include "ImR_Locator_i.h"
 #include "utils.h"
@@ -23,10 +23,11 @@ static const int DEFAULT_START_LIMIT = 1;
 static const int PING_RETRY_SCHEDULE[] = {0, 10, 100, 500, 1000, 1000, 1000, 1000, 5000, 5000};
 
 static const ACE_Time_Value DEFAULT_SERVER_TIMEOUT (0, 10 * 1000); // 10ms
-// We want to give shutdown a little more time to work, so that we
-// can guarantee to the tao_imr utility that it has shutdown. The tao_imr
-// utility prints a different message depending on whether shutdown succeeds
-// or times out.
+
+/// We want to give shutdown a little more time to work, so that we
+/// can guarantee to the tao_imr utility that it has shutdown. The tao_imr
+/// utility prints a different message depending on whether shutdown succeeds
+/// or times out.
 static const ACE_Time_Value DEFAULT_SHUTDOWN_TIMEOUT (0, 5000 * 1000);
 
 static PortableServer::POA_ptr
@@ -111,7 +112,7 @@ ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts)
   obj = this->imr_poa_->id_to_reference (id.in ());
   if (startup_timeout_ > ACE_Time_Value::zero)
     {
-      obj = set_timeout_policy (obj.in (), startup_timeout_);
+      obj = this->set_timeout_policy (obj.in (), startup_timeout_);
     }
   waiter_ = ImplementationRepository::AsyncStartupWaiter::_narrow (obj.in ());
 
@@ -761,8 +762,9 @@ ImR_Locator_i::set_timeout_policy (CORBA::Object_ptr obj, const ACE_Time_Value&
 }
 
 void
-ImR_Locator_i::add_or_update_server (const char* server,
-                                const ImplementationRepository::StartupOptions &options)
+ImR_Locator_i::add_or_update_server (
+    const char* server,
+    const ImplementationRepository::StartupOptions &options)
 {
   ACE_ASSERT (server != 0);
 
@@ -853,7 +855,7 @@ ImR_Locator_i::remove_server (const char* name)
   if (this->read_only_)
     {
       ACE_ERROR ((LM_ERROR,
-                  "ImR: Can't remove server <%s> due to locked database.\n", name));
+                  "ImR: Can't remove server <%C> due to locked database.\n", name));
       throw CORBA::NO_PERMISSION (
         CORBA::SystemException::_tao_minor_code (
           TAO_IMPLREPO_MINOR_CODE,
@@ -922,7 +924,7 @@ ImR_Locator_i::shutdown_server (const char* server)
       throw ImplementationRepository::NotFound ();
     }
 
-  connect_server (*info);
+  this->connect_server (*info);
 
   if (CORBA::is_nil (info->server.in ()))
     {
@@ -933,7 +935,7 @@ ImR_Locator_i::shutdown_server (const char* server)
 
   try
     {
-      CORBA::Object_var obj = set_timeout_policy (info->server.in (), DEFAULT_SHUTDOWN_TIMEOUT);
+      CORBA::Object_var obj = this->set_timeout_policy (info->server.in (), DEFAULT_SHUTDOWN_TIMEOUT);
       ImplementationRepository::ServerObject_var server =
         ImplementationRepository::ServerObject::_unchecked_narrow (obj.in ());
       server->shutdown ();
@@ -1086,7 +1088,7 @@ ImR_Locator_i::server_is_shutting_down (const char* server)
 
   info->reset ();
 
-  int err = this->repository_.update_server (*info);
+  int const err = this->repository_.update_server (*info);
   ACE_ASSERT (err == 0);
   ACE_UNUSED_ARG (err);
 }
@@ -1109,7 +1111,7 @@ ImR_Locator_i::find (const char* server,
     {
       ACE_NEW_THROW_EX (imr_info, ImplementationRepository::ServerInformation, CORBA::NO_MEMORY ());
       imr_info->startup.activation= ImplementationRepository::NORMAL;
-      if (debug_ > 1)
+      if (this->debug_ > 1)
         ACE_DEBUG ((LM_DEBUG, "ImR: Cannot find server <%C>\n", server));
     }
 }
@@ -1213,7 +1215,7 @@ ImR_Locator_i::connect_activator (Activator_Info& info)
 
       if (startup_timeout_ > ACE_Time_Value::zero)
         {
-          obj = set_timeout_policy (obj.in (), startup_timeout_);
+          obj = this->set_timeout_policy (obj.in (), startup_timeout_);
         }
 
       info.activator =
@@ -1298,7 +1300,7 @@ ImR_Locator_i::connect_server (Server_Info& info)
           return;
         }
 
-      obj = set_timeout_policy (obj.in (), DEFAULT_SERVER_TIMEOUT);
+      obj = this->set_timeout_policy (obj.in (), DEFAULT_SERVER_TIMEOUT);
 
       info.server =
         ImplementationRepository::ServerObject::_unchecked_narrow (obj.in ());
@@ -1413,7 +1415,7 @@ ImR_Locator_i::is_alive_i (Server_Info& info)
       return 1;
     }
 
-  connect_server (info);
+  this->connect_server (info);
 
   if (CORBA::is_nil (info.server.in ()))
     {
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
index 7d6ecadacb3..fc26f46433e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
@@ -29,10 +29,10 @@ ACE_END_VERSIONED_NAMESPACE_DECL
 
 class INS_Locator;
 
-// Gets a request from a client and depending on the POA name,
-// requests an activator to take care of activating the
-// corresponding server and raises a forward exception to the
-// client pointing to the correct server.
+/// Gets a request from a client and depending on the POA name,
+/// requests an activator to take care of activating the
+/// corresponding server and raises a forward exception to the
+/// client pointing to the correct server.
 class Locator_Export ImR_Locator_i
   : public virtual POA_ImplementationRepository::Locator
 {
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
index 50af16887ac..6f041cfdd71 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
@@ -109,10 +109,10 @@ private:
   int load_registry_options();
 private:
 
-  // xml, heap, or registry
+  /// xml, heap, or registry
   RepoMode repo_mode_;
 
-  // do we clear out the repository on load
+  /// Do we clear out the repository on load
   bool erase_repo_;
 
   /// Debug level.
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
index 9b83c9acb41..5833e0f4e98 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
@@ -211,7 +211,7 @@ static void saveAsXML (const ACE_CString& fname, Locator_Repository& repo)
   FILE* fp = ACE_OS::fopen (fname.c_str (), "w");
   if (fp == 0)
     {
-      ACE_ERROR ((LM_ERROR, "Couldn't write to file %s\n", fname.c_str()));
+      ACE_ERROR ((LM_ERROR, "Couldn't write to file %C\n", fname.c_str()));
       return;
     }
   ACE_OS::fprintf (fp,"<?xml version=\"1.0\"?>\n");
@@ -362,7 +362,7 @@ Locator_Repository::unregister_if_address_reused (
   if (this->debug_ > 0)
   {
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t)ImR: checking reuse address ")
-      ACE_TEXT ("for server \"%s %s\" ior \"%s\"\n"),
+      ACE_TEXT ("for server \"%C %C\" ior \"%C\"\n"),
       server_id.c_str(), name.c_str (), partial_ior));
   }
 
@@ -377,7 +377,7 @@ Locator_Repository::unregister_if_address_reused (
     if (this->debug_)
     {
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t)ImR: iterating - registered server")
-        ACE_TEXT ("\"%s %s\" ior \"%s\"\n"), info->server_id.c_str(),
+        ACE_TEXT ("\"%C %C\" ior \"%C\"\n"), info->server_id.c_str(),
         info->name.c_str (), info->partial_ior.c_str ()));
     }
 
@@ -387,8 +387,8 @@ Locator_Repository::unregister_if_address_reused (
     {
       if (this->debug_)
       {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t)ImR: reuse address %s so remove")
-          ACE_TEXT ("server %s \n"), info->partial_ior.c_str (), info->name.c_str ()));
+        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t)ImR: reuse address %C so remove")
+          ACE_TEXT ("server %C \n"), info->partial_ior.c_str (), info->name.c_str ()));
       }
       if (! info->name.empty ())
       {
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h
index b41e75d4426..7d7092769bc 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h
@@ -103,15 +103,15 @@ public:
   const char* repo_mode();
 
 private:
-  // Type mechanism to use for persistence.
+  /// Type mechanism to use for persistence.
   Options::RepoMode rmode_;
-  // The in-memory list of the server information.
+  /// The in-memory list of the server information.
   SIMap server_infos_;
-  // The in-memory list of the activator information.
+  /// The in-memory list of the activator information.
   AIMap activator_infos_;
-  // Several rmode_ values require this.
+  /// Several rmode_ values require this.
   ACE_Auto_Ptr<ACE_Configuration> config_;
-  // XML requires the file name
+  /// XML requires the file name
   ACE_CString fname_;
 
   unsigned int debug_;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
index 94a37c57b05..d87476130f8 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
@@ -13,8 +13,7 @@ Server_Info::Server_Info
  int limit,
  const ACE_CString& partial_ior,
  const ACE_CString& server_ior,
- ImplementationRepository::ServerObject_ptr svrobj
- )
+ ImplementationRepository::ServerObject_ptr svrobj)
  : server_id (serverId)
  , name (server_name)
  , activator (aname)
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
index 3c80579dd5f..674a60b437a 100644
--- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
@@ -211,9 +211,9 @@ TAO_IMR_Op::display_server_information (const ImplementationRepository::ServerIn
     "  Activator: %s\n"
     "  Command Line: %s\n"
     "  Working Directory: %s\n"
-    "  Activation Mode: %s\n"
+    "  Activation Mode: %C\n"
     "  Number of retries: %d\n"
-    "%s",
+    "%C",
     info.startup.activator.in (),
     info.startup.command_line.in (),
     info.startup.working_directory.in (),
diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
index 8c1cce3a75e..f22d6d23160 100644
--- a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
@@ -63,7 +63,6 @@ project(CosConcurrency_Skel): orbsvcslib, orbsvcs_output, install, concurrency,
   }
 
   Inline_Files {
-    CosConcurrencyControlS.inl
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
index af96ca992fe..80efa635a0a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
@@ -71,8 +71,6 @@ project (CosEvent_Skel) : orbsvcslib, orbsvcs_output, install, avoids_minimum_co
   }
 
   Inline_Files {
-    CosEventCommS.inl
-    CosEventChannelAdminS.inl
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h
index e4e0257a061..7c2e2fba7d4 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h
@@ -23,22 +23,21 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+/**
+ * DSI TAO_CEC_DynamicImplementationServer implementation
+ *
+ * Implements the DSI impl object
+ */
 class TAO_CEC_DynamicImplementationServer : public TAO_DynamicImplementation
 {
-  // = TITLE
-  //   DSI TAO_CEC_DynamicImplementationServer implementation
-  //
-  // = DESCRIPTION
-  //   Implements the DSI impl object
-  //
 public:
 
-  // Constructure
+  /// Constructor
   TAO_CEC_DynamicImplementationServer (PortableServer::POA_ptr poa,
                                        TAO_CEC_TypedProxyPushConsumer *typed_pp_consumer,
                                        TAO_CEC_TypedEventChannel *typed_event_channel);
 
-  //Destructor
+  /// Destructor
   virtual ~TAO_CEC_DynamicImplementationServer (void);
 
   // = The DynamicImplementation methods.
@@ -50,20 +49,20 @@ public:
 
   virtual PortableServer::POA_ptr _default_POA (void);
 
-  // Handles the _is_a call
+  /// Handles the _is_a call
   virtual void is_a (CORBA::ServerRequest_ptr request);
 
 private:
-  // The POA
+  /// The POA
   PortableServer::POA_var poa_;
 
-  // The Typed Proxy Push Consumer Implementation
+  /// The Typed Proxy Push Consumer Implementation
   TAO_CEC_TypedProxyPushConsumer *typed_pp_consumer_;
 
-  // The Typed Event Channel Implementation
+  /// The Typed Event Channel Implementation
   TAO_CEC_TypedEventChannel *typed_event_channel_;
 
-  // The RepositoryId
+  /// The RepositoryId
   CORBA::RepositoryId repository_id_;
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
index 31720a9b33e..52af1d8541a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
@@ -32,7 +32,6 @@ class TAO_CEC_TypedEvent;
 class TAO_CEC_TypedEventChannel;
 class TAO_CEC_DynamicImplementationServer;
 
-//Class TAO_CEC_TypedProxyPushConsumer
 class TAO_Event_Serv_Export TAO_CEC_TypedProxyPushConsumer
   : public virtual POA_CosTypedEventChannelAdmin::TypedProxyPushConsumer
 {
@@ -40,13 +39,12 @@ public:
   typedef CosTypedEventChannelAdmin::TypedProxyPushConsumer_ptr _ptr_type;
   typedef CosTypedEventChannelAdmin::TypedProxyPushConsumer_var _var_type;
 
-  //Constructor
+  /// Constructor
   TAO_CEC_TypedProxyPushConsumer (
       TAO_CEC_TypedEventChannel* typed_event_channel,
-      const ACE_Time_Value &timeout
-    );
+      const ACE_Time_Value &timeout);
 
-  //Destructor
+  /// Destructor
   virtual ~TAO_CEC_TypedProxyPushConsumer (void);
 
   /// Activate in the POA
@@ -81,8 +79,7 @@ public:
   virtual void disconnect_push_consumer (void);
 
   // = The CosTypedEventComm::TypedPushConsumer methods (abstract overloads)...
-  virtual CORBA::Object_ptr get_typed_consumer (
-    );
+  virtual CORBA::Object_ptr get_typed_consumer (void);
 
   // = The Servant methods
   virtual PortableServer::POA_ptr _default_POA (void);
@@ -90,7 +87,7 @@ public:
   virtual void _remove_ref (void);
 
 protected:
-  // The guard needs access to the following protected methods.
+  /// The guard needs access to the following protected methods.
   friend class TAO_CEC_TypedProxyPushConsumer_Guard;
 
   /// The private version (without locking) of is_connected().
diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
index debd95904d2..1820a1ecc27 100644
--- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
@@ -67,8 +67,6 @@ project(CosLifeCycle_Skel) : orbsvcslib, orbsvcs_output, install, lifecycle, por
   }
 
   Inline_Files {
-    CosLifeCycleS.inl
-    LifeCycleServiceS.inl
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc b/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc
index 30a30181bac..f7b411099d9 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc
@@ -19,7 +19,6 @@ project(CosNaming_Skel) : orbsvcslib, orbsvcs_output, install, naming, portables
   }
 
   Inline_Files {
-    CosNamingS.inl
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
index 74027108963..142088974dd 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
@@ -95,12 +95,6 @@ project(CosNotification_Skel) : orbsvcslib, orbsvcs_output, install, notificatio
   }
 
   Inline_Files {
-    CosNotificationS.inl
-    CosNotifyCommS.inl
-    CosNotifyFilterS.inl
-    CosNotifyChannelAdminS.inl
-    NotifyExtS.inl
-    Event_ForwarderS.inl
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.mpc b/TAO/orbsvcs/orbsvcs/CosProperty.mpc
index feabcd709f0..1a6d99258fe 100644
--- a/TAO/orbsvcs/orbsvcs/CosProperty.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosProperty.mpc
@@ -62,7 +62,6 @@ project(CosProperty_Skel) : orbsvcslib, orbsvcs_output, install, property, porta
   }
 
   Inline_Files {
-    CosPropertyS.inl
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/CosTime.mpc b/TAO/orbsvcs/orbsvcs/CosTime.mpc
index 803b03e131f..712e71e15f2 100644
--- a/TAO/orbsvcs/orbsvcs/CosTime.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTime.mpc
@@ -61,7 +61,6 @@ project(CosTime_Skel) : orbsvcslib, orbsvcs_output, install, time, portableserve
   }
 
   Inline_Files {
-    TimeServiceS.inl
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
index 870470e0a30..bd69cd8d01d 100644
--- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
@@ -77,9 +77,6 @@ project(CosTrading_Skel) : orbsvcslib, orbsvcs_output, install, trading, portabl
   }
 
   Inline_Files {
-    CosTradingS.inl
-    CosTradingReposS.inl
-    CosTradingDynamicS.inl
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
index 7b0769e0dd6..657348872be 100644
--- a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
@@ -63,7 +63,6 @@ project(DsEventLogAdmin_Skel) : orbsvcslib, orbsvcs_output, install, dseventloga
   }
 
   Inline_Files {
-    DsEventLogAdminS.inl
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
index aeaa96fab09..8e21e951446 100644
--- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
@@ -70,8 +70,6 @@ project(DsLogAdmin_Skel) : orbsvcslib, orbsvcs_output, install, dslogadmin, port
   }
 
   Inline_Files {
-    DsLogAdminS.inl
-    DsLogNotificationS.inl
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
index 03174af7e38..940016b3e03 100644
--- a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
@@ -64,7 +64,6 @@ project(DsNotifyLogAdmin_Skel) : orbsvcslib, orbsvcs_output, install, dsnotifylo
   }
 
   Inline_Files {
-    DsNotifyLogAdminS.inl
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h
index 5fae591d76b..4a0406d2692 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h
@@ -104,7 +104,7 @@ namespace TAO
       virtual int send_message (TAO_OutputCDR &stream,
                                 TAO_Stub *stub = 0,
                                 TAO_Message_Semantics message_semantics =
-                                TAO_TWOWAY_REQUEST,
+                                  TAO_Message_Semantics (),
                                 ACE_Time_Value *max_time_wait = 0);
 
       virtual int tear_listen_point_list (TAO_InputCDR &cdr);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
index 3a485b98b72..a6f831160ca 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
@@ -87,7 +87,8 @@ public:
 
   virtual int send_message (TAO_OutputCDR &stream,
                             TAO_Stub *stub = 0,
-                            TAO_Message_Semantics message_semantics = TAO_TWOWAY_REQUEST,
+                            TAO_Message_Semantics message_semantics =
+                              TAO_Message_Semantics (),
                             ACE_Time_Value *max_time_wait = 0);
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
index 0b914a84235..38d39c17e91 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
@@ -35,7 +35,8 @@ TAO_UIPMC_Wait_Never::can_process_upcalls (void) const
 }
 
 int
-TAO_UIPMC_Wait_Never::sending_request (TAO_ORB_Core *, int)
+TAO_UIPMC_Wait_Never::sending_request (TAO_ORB_Core *,
+                                       TAO_Message_Semantics )
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h
index ff56a990894..06958186f7c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h
@@ -43,7 +43,7 @@ public:
 
   // = Documented in TAO_Wait_Strategy.
   virtual int sending_request (TAO_ORB_Core *orb_core,
-                               int two_way);
+                               TAO_Message_Semantics msg_semantics);
   virtual int wait (ACE_Time_Value *max_wait_time,
                     TAO_Synch_Reply_Dispatcher &rd);
   virtual int register_handler (void);
diff --git a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
index ac0f8b9fbb3..5ccb28ebc3b 100644
--- a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
@@ -62,7 +62,6 @@ project(RTEventLogAdmin_Skel) : orbsvcslib, orbsvcs_output, install, rteventloga
   }
 
   Inline_Files {
-    RTEventLogAdminS.inl
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc b/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc
index e2fa2a25037..e9f5730760b 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc
@@ -29,10 +29,6 @@ project(RTEvent_Skel) : orbsvcslib, orbsvcs_output, install, rtevent, portablese
   }
 
   Inline_Files {
-    RtecDefaultEventDataS.inl
-    RtecEventCommS.inl
-    RtecEventChannelAdminS.inl
-    RtecUDPAdminS.inl
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
index d6d908922b3..4752e20c531 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -483,12 +483,14 @@ TAO::SSLIOP::Connector::ssliop_connect (
     }
 
   // Check the Cache first for connections
-  size_t busy_count = 0; //not used but needed for the call
-  if (this->orb_core ()->lane_resources ().transport_cache ().find_transport (
+  size_t busy_count = 0;
+  TAO::Transport_Cache_Manager::Find_Result found =
+    this->orb_core ()->lane_resources ().transport_cache ().find_transport (
         desc,
         transport,
-        busy_count)
-        == TAO::Transport_Cache_Manager::CACHE_FOUND_AVAILABLE)
+        busy_count);
+
+  if (found == TAO::Transport_Cache_Manager::CACHE_FOUND_AVAILABLE)
     {
       // ...eliminate svc_handle memory leak...
       ACE_Event_Handler_var
@@ -517,223 +519,238 @@ TAO::SSLIOP::Connector::ssliop_connect (
     }
   else
     {
-      if (TAO_debug_level > 4)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) - SSLIOP_Connector::ssliop_connect, ")
-                    ACE_TEXT ("making a new connection\n")));
-
-      // Purge connections (if necessary)
-      this->orb_core ()->lane_resources ().transport_cache ().purge ();
-
-      // The svc_handler is created beforehand so that we can get
-      // access to the underlying ACE_SSL_SOCK_Stream (the peer) and
-      // its SSL pointer member prior to descending into the
-      // ACE_Strategy_Connector (the "base_connector_").  This is
-      // thread-safe and reentrant, hence no synchronization is
-      // necessary.
-      if (svc_handler == 0 &&
-          this->base_connector_.creation_strategy ()->make_svc_handler (
-               svc_handler) != 0)
+
+      bool make_new_connection =
+        (found == TAO::Transport_Cache_Manager::CACHE_FOUND_NONE) ||
+        (found == TAO::Transport_Cache_Manager::CACHE_FOUND_BUSY
+            && this->new_connection_is_ok (busy_count));
+
+      if (make_new_connection)
         {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_ERROR,
-                        ACE_TEXT ("TAO (%P|%t) Unable to create SSLIOP ")
-                        ACE_TEXT ("service handler.\n")));
 
-          return 0;
-        }
+          if (TAO_debug_level > 4)
+            ACE_DEBUG ((LM_DEBUG,
+                        ACE_TEXT ("TAO (%P|%t) - SSLIOP_Connector::ssliop_connect, ")
+                        ACE_TEXT ("making a new connection\n")));
+
+          // Purge connections (if necessary)
+          this->orb_core ()->lane_resources ().transport_cache ().purge ();
+
+          // The svc_handler is created beforehand so that we can get
+          // access to the underlying ACE_SSL_SOCK_Stream (the peer) and
+          // its SSL pointer member prior to descending into the
+          // ACE_Strategy_Connector (the "base_connector_").  This is
+          // thread-safe and reentrant, hence no synchronization is
+          // necessary.
+          if (svc_handler == 0 &&
+              this->base_connector_.creation_strategy ()->make_svc_handler (
+                   svc_handler) != 0)
+            {
+              if (TAO_debug_level > 0)
+                ACE_DEBUG ((LM_ERROR,
+                            ACE_TEXT ("TAO (%P|%t) Unable to create SSLIOP ")
+                            ACE_TEXT ("service handler.\n")));
 
-      ACE_Event_Handler_var
-        safe_handler (svc_handler);
+              return 0;
+            }
 
-      // Setup the establishment of trust connection properties, if
-      // any.
-      int verify_mode = 0;
-
-      // On the server side, "trust_in_client" requires that a peer
-      // (client) certificate exist.  Fail if one doesn't exist.
-      //
-      // In SSLIOP's case, trust_in_client also implies
-      // trust_in_target.
-      if (trust.trust_in_client)
-        verify_mode = SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT;
-
-      // Require verification of the target's certificate.
-      else if (trust.trust_in_target)
-        verify_mode = SSL_VERIFY_PEER;
-
-      // Trust in neither the client nor the target is explicitly
-      // specified.  Use the default setting.
-      else
-        verify_mode = ACE_SSL_Context::instance ()->default_verify_mode ();
-
-      ::SSL_set_verify (svc_handler->peer ().ssl (), verify_mode, 0);
-
-      // The "eNULL" cipher disables encryption but still uses a
-      // secure hash (e.g. SHA1 or MD5) to ensure integrity.  (Try the
-      // command "openssl ciphers -v eNULL".)
-      //
-      // Note that it is not possible to completely disable protection
-      // here.
-      if ((qop == ::Security::SecQOPNoProtection
-          || qop == ::Security::SecQOPIntegrity)
-          && ::SSL_set_cipher_list (svc_handler->peer ().ssl (),
-                                    "eNULL") == 0)
-        {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_ERROR,
-                        ACE_TEXT ("(%P|%t) Unable to set eNULL ")
-                        ACE_TEXT ("SSL cipher.\n")));
+          ACE_Event_Handler_var
+            safe_handler (svc_handler);
 
-          throw CORBA::INV_POLICY ();
-        }
+          // Setup the establishment of trust connection properties, if
+          // any.
+          int verify_mode = 0;
 
-      // svc_handler is never reset..it still has the value
-      (void)safe_handler.release ();
+          // On the server side, "trust_in_client" requires that a peer
+          // (client) certificate exist.  Fail if one doesn't exist.
+          //
+          // In SSLIOP's case, trust_in_client also implies
+          // trust_in_target.
+          if (trust.trust_in_client)
+            verify_mode = SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT;
 
-      // Get the right synch options
-      ACE_Synch_Options synch_options;
+          // Require verification of the target's certificate.
+          else if (trust.trust_in_target)
+            verify_mode = SSL_VERIFY_PEER;
 
-      this->active_connect_strategy_->synch_options (max_wait_time,
-                                                     synch_options);
+          // Trust in neither the client nor the target is explicitly
+          // specified.  Use the default setting.
+          else
+            verify_mode = ACE_SSL_Context::instance ()->default_verify_mode ();
+
+          ::SSL_set_verify (svc_handler->peer ().ssl (), verify_mode, 0);
+
+          // The "eNULL" cipher disables encryption but still uses a
+          // secure hash (e.g. SHA1 or MD5) to ensure integrity.  (Try the
+          // command "openssl ciphers -v eNULL".)
+          //
+          // Note that it is not possible to completely disable protection
+          // here.
+          if ((qop == ::Security::SecQOPNoProtection
+              || qop == ::Security::SecQOPIntegrity)
+              && ::SSL_set_cipher_list (svc_handler->peer ().ssl (),
+                                        "eNULL") == 0)
+            {
+              if (TAO_debug_level > 0)
+                ACE_DEBUG ((LM_ERROR,
+                            ACE_TEXT ("(%P|%t) Unable to set eNULL ")
+                            ACE_TEXT ("SSL cipher.\n")));
 
-      // The code used to set the timeout to zero, with the intent of
-      // polling the reactor for connection completion. However, the side-effect
-      // was to cause the connection to timeout immediately.
+              throw CORBA::INV_POLICY ();
+            }
 
-      // We obtain the transport in the <svc_handler> variable.  As we
-      // know now that the connection is not available in Cache we can
-      // make a new connection
-      result = this->base_connector_.connect (svc_handler,
-                                              remote_address,
-                                              synch_options);
+          // svc_handler is never reset..it still has the value
+          (void)safe_handler.release ();
 
-      // Make sure that we always do a remove_reference
-      ACE_Event_Handler_var svc_handler_auto_ptr (svc_handler);
+          // Get the right synch options
+          ACE_Synch_Options synch_options;
 
-      transport =
-        svc_handler->transport ();
+          this->active_connect_strategy_->synch_options (max_wait_time,
+                                                         synch_options);
 
-      if (result == -1)
-        {
-          // No immediate result, wait for completion
-          if (errno == EWOULDBLOCK)
+          // The code used to set the timeout to zero, with the intent of
+          // polling the reactor for connection completion. However, the side-effect
+          // was to cause the connection to timeout immediately.
+
+          // We obtain the transport in the <svc_handler> variable.  As we
+          // know now that the connection is not available in Cache we can
+          // make a new connection
+          result = this->base_connector_.connect (svc_handler,
+                                                  remote_address,
+                                                  synch_options);
+
+          // Make sure that we always do a remove_reference
+          ACE_Event_Handler_var svc_handler_auto_ptr (svc_handler);
+
+          transport =
+            svc_handler->transport ();
+
+          if (result == -1)
             {
-              // Try to wait until connection completion. Incase we block, then we
-              // get a connected transport or not. In case of non block we get
-              // a connected or not connected transport
-              if (!this->wait_for_connection_completion (resolver,
-                                                         *desc,
-                                                         transport,
-                                                         max_wait_time))
+              // No immediate result, wait for completion
+              if (errno == EWOULDBLOCK)
+                {
+                  // Try to wait until connection completion. Incase we block, then we
+                  // get a connected transport or not. In case of non block we get
+                  // a connected or not connected transport
+                  if (!this->wait_for_connection_completion (resolver,
+                                                             *desc,
+                                                             transport,
+                                                             max_wait_time))
+                    {
+                      if (TAO_debug_level > 2)
+                        ACE_ERROR ((LM_ERROR, "TAO (%P|%t) - SSLIOP_Connector::"
+                                              "ssliop_connect, "
+                                              "wait for completion failed\n"));
+                    }
+                }
+              else
                 {
-                  if (TAO_debug_level > 2)
-                    ACE_ERROR ((LM_ERROR, "TAO (%P|%t) - SSLIOP_Connector::"
-                                          "ssliop_connect, "
-                                          "wait for completion failed\n"));
+                  // Transport is not usable
+                  transport = 0;
                 }
             }
-          else
+
+          // In case of errors transport is zero
+          if (transport == 0)
             {
-              // Transport is not usable
-              transport = 0;
+              // Give users a clue to the problem.
+              if (TAO_debug_level)
+                {
+                  char buffer [MAXHOSTNAMELEN + 6 + 1];
+                  ssl_endpoint->addr_to_string (buffer,
+                                                sizeof (buffer) - 1);
+                  ACE_DEBUG ((LM_ERROR,
+                              ACE_TEXT ("TAO (%P|%t) - SSL connection to ")
+                              ACE_TEXT ("<%s:%d> failed (%p)\n"),
+                              buffer,
+                              remote_address.get_port_number (),
+                              ACE_TEXT ("errno")));
+                }
+
+              return 0;
             }
-        }
 
-      // In case of errors transport is zero
-      if (transport == 0)
-        {
-          // Give users a clue to the problem.
-          if (TAO_debug_level)
+          // fix for bug 2654
+          if (svc_handler->keep_waiting ())
             {
-              char buffer [MAXHOSTNAMELEN + 6 + 1];
-              ssl_endpoint->addr_to_string (buffer,
-                                            sizeof (buffer) - 1);
-              ACE_DEBUG ((LM_ERROR,
-                          ACE_TEXT ("TAO (%P|%t) - SSL connection to ")
-                          ACE_TEXT ("<%s:%d> failed (%p)\n"),
-                          buffer,
-                          remote_address.get_port_number (),
-                          ACE_TEXT ("errno")));
+              svc_handler->connection_pending ();
             }
 
-          return 0;
-        }
+          // fix for bug 2654
+          if (svc_handler->error_detected ())
+            {
+              svc_handler->cancel_pending_connection ();
+            }
 
-      // fix for bug 2654
-      if (svc_handler->keep_waiting ())
-        {
-          svc_handler->connection_pending ();
-        }
+          // At this point, the connection has be successfully connected.
+          // #REFCOUNT# is one.
+          if (TAO_debug_level > 2)
+            ACE_DEBUG ((LM_DEBUG,
+                        "TAO (%P|%t) - SSLIOP_Connector::ssliop_connect, "
+                        "new SSL connection to port %d on transport[%d]\n",
+                        remote_address.get_port_number (),
+                        svc_handler->peer ().get_handle ()));
+
+          // Add the handler to Cache
+          int retval =
+            this->orb_core ()->
+              lane_resources ().transport_cache ().cache_transport (desc,
+                                                                    transport);
+
+          // Failure in adding to cache.
+        if (retval == -1)
+            {
+              // Close the handler.
+              svc_handler->close ();
 
-      // fix for bug 2654
-      if (svc_handler->error_detected ())
-        {
-          svc_handler->cancel_pending_connection ();
-        }
+              if (TAO_debug_level > 0)
+                {
+                  ACE_ERROR ((LM_ERROR,
+                              "TAO (%P|%t) - SLIIOP_Connector::ssliop_connect, "
+                              "could not add the new connection to cache\n"));
+                }
 
-      // At this point, the connection has be successfully connected.
-      // #REFCOUNT# is one.
-      if (TAO_debug_level > 2)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - SSLIOP_Connector::ssliop_connect, "
-                    "new SSL connection to port %d on transport[%d]\n",
-                    remote_address.get_port_number (),
-                    svc_handler->peer ().get_handle ()));
-
-      // Add the handler to Cache
-      int retval =
-        this->orb_core ()->
-          lane_resources ().transport_cache ().cache_transport (desc,
-                                                                transport);
-
-      // Failure in adding to cache.
-      if (retval == -1)
-        {
-          // Close the handler.
-          svc_handler->close ();
+              return 0;
+            }
 
-          if (TAO_debug_level > 0)
+          // fix for bug 2654
+          if (svc_handler->error_detected ())
             {
-              ACE_ERROR ((LM_ERROR,
-                          "TAO (%P|%t) - SLIIOP_Connector::ssliop_connect, "
-                          "could not add the new connection to cache\n"));
+              svc_handler->cancel_pending_connection ();
+              transport->purge_entry();
+              return 0;
             }
 
-          return 0;
-        }
+          if (transport->is_connected () &&
+              transport->wait_strategy ()->register_handler () != 0)
+            {
+              // Registration failures.
 
-      // fix for bug 2654
-      if (svc_handler->error_detected ())
-        {
-          svc_handler->cancel_pending_connection ();
-          transport->purge_entry();
-          return 0;
-        }
+              // Purge from the connection cache, if we are not in the cache, this
+              // just does nothing.
+              (void) transport->purge_entry ();
 
-      if (transport->is_connected () &&
-          transport->wait_strategy ()->register_handler () != 0)
-        {
-          // Registration failures.
+              // Close the handler.
+              (void) transport->close_connection ();
 
-          // Purge from the connection cache, if we are not in the cache, this
-          // just does nothing.
-          (void) transport->purge_entry ();
+              if (TAO_debug_level > 0)
+                ACE_ERROR ((LM_ERROR,
+                            "TAO (%P|%t) - SSLIOP_Connector [%d]::ssliop_connect, "
+                            "could not register the transport "
+                            "in the reactor.\n",
+                            transport->id ()));
 
-          // Close the handler.
-          (void) transport->close_connection ();
+              return 0;
+            }
 
-          if (TAO_debug_level > 0)
-            ACE_ERROR ((LM_ERROR,
-                        "TAO (%P|%t) - SSLIOP_Connector [%d]::ssliop_connect, "
-                        "could not register the transport "
-                        "in the reactor.\n",
-                        transport->id ()));
+          svc_handler_auto_ptr.release ();
 
-          return 0;
         }
-
-      svc_handler_auto_ptr.release ();
+      else // not making new connection
+        {
+          (void) this->wait_for_transport (resolver, transport, max_wait_time, true);
+        }
     }
 
   return transport;
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
index 50f2fc551f1..10b2f901539 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
@@ -108,7 +108,7 @@ namespace TAO
       virtual int send_message (TAO_OutputCDR &stream,
                                 TAO_Stub *stub = 0,
                                 TAO_Message_Semantics message_semantics =
-                                  TAO_TWOWAY_REQUEST,
+                                  TAO_Message_Semantics (),
                                 ACE_Time_Value *max_time_wait = 0);
 
       /// Open teh service context list and process it.
diff --git a/TAO/orbsvcs/orbsvcs/ec_typed_events_skel.mpb b/TAO/orbsvcs/orbsvcs/ec_typed_events_skel.mpb
index b5316d32dab..5eec5e72e58 100644
--- a/TAO/orbsvcs/orbsvcs/ec_typed_events_skel.mpb
+++ b/TAO/orbsvcs/orbsvcs/ec_typed_events_skel.mpb
@@ -18,8 +18,6 @@ feature(ec_typed_events) {
   }
 
   Inline_Files {
-    CosTypedEventCommS.inl
-    CosTypedEventChannelAdminS.inl
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h
index cc6550dd4f6..7d7b6642a99 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/Roundtrip.h
@@ -28,7 +28,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h
index cc6550dd4f6..7d7b6642a99 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h
@@ -28,7 +28,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h
index 19c09b07e45..92dce8ce091 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Roundtrip.h
@@ -23,7 +23,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl
index ddfff9c21e6..fffd0bf4161 100755
--- a/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl
+++ b/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl
@@ -10,7 +10,7 @@ use PerlACE::TestTarget;
 
 $status = 0;
 
-my @generated_files = ("testC.h", "testC.cpp", "testC.inl", "testS.h", "testS.cpp", "testS.inl");
+my @generated_files = ("testC.h", "testC.cpp", "testC.inl", "testS.h", "testS.cpp");
 
 # The location of the IFR_Service binary
 my $ifr_service_bin = "../../IFR_Service";
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
index 8814ead3a6c..8414a6d3d2c 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
@@ -3,10 +3,8 @@
 //
 #include "Hello.h"
 
-
-
 CORBA::Boolean
-Hello::ids_differ_ = 1;
+Hello::ids_differ_ = true;
 
 Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id)
   : orb_ (CORBA::ORB::_duplicate (orb)),
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h
index b4d9a3cca92..ce818b72c04 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h
@@ -39,7 +39,7 @@ public:
   static CORBA::Boolean ids_differ_;
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
index 8f46138e1ef..1c3a986f0c3 100644
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
+++ b/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
@@ -154,9 +154,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
           result = 1;
           ACE_DEBUG ((LM_ERROR, "Error: REGRESSION identified by server %u. Test Failed !!\n", last_server));
         }
-      catch (const CORBA::COMM_FAILURE& my_ex)
+      catch (const CORBA::COMM_FAILURE&)
         {
-          ACE_UNUSED_ARG (my_ex);
           // We can't use the word exception for fear of upsetting the build log parser
           ACE_DEBUG ((LM_DEBUG, "Client caught one of those things that is normally used to indicate a problem ("
                       "although it doesn't in this case) and which we cannot name because the autobuild "
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h
index 28bb6597705..6202345bde1 100644
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h
@@ -29,7 +29,7 @@ public:
   virtual void throw_location_forward (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h
index c2257a266f1..ca2bdccf0e6 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h
@@ -29,7 +29,7 @@ public:
   virtual CORBA::Boolean has_ft_request_service_context (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.h b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.h
index c6cf90e02be..00a7f2ce48b 100644
--- a/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.h
+++ b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.h
@@ -19,7 +19,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.h
index 047a405a5fa..00d76318ae6 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/Hello.h
@@ -24,7 +24,7 @@ public:
   virtual void throw_location_forward ();
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.h
index 44b5353a49d..e605dee88f8 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/Hello.h
@@ -33,7 +33,7 @@ public:
   static CORBA::Boolean extended_context_ok_;
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.h
index 782b1b2f573..af231fe1540 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown ();
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.h
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.h b/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.h
index c6cf90e02be..00a7f2ce48b 100644
--- a/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.h
+++ b/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.h
@@ -19,7 +19,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h
index 1d5e27d075f..3a25039b7ab 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h
@@ -23,7 +23,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h
index 0afa1750f24..a6c492ee005 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h
@@ -27,7 +27,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h
index 37e56f48233..cb35c06c610 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h
@@ -28,7 +28,7 @@ public:
   virtual ::Test::GoodDay::RoughWeek * this_week (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp
new file mode 100644
index 00000000000..24d1baf9ead
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp
@@ -0,0 +1,34 @@
+//
+// $Id$
+//
+
+#include "Client_Task.h"
+
+Client_Task::Client_Task (CORBA::ORB_ptr orb,
+                          ACE_Thread_Manager *thr_mgr)
+  : ACE_Task_Base (thr_mgr)
+  , orb_ (CORBA::ORB::_duplicate (orb))
+ {
+}
+
+int
+Client_Task::svc (void)
+{
+  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n"));
+
+  // Wait for 2 minutes...
+  ACE_Time_Value tv (60,0);
+
+  try
+    {
+      this->orb_->run (tv);
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("(%P|%t) Client_Task::svc exception!!!\n");
+
+    }
+
+  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n"));
+  return 0;
+}
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.h b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.h
new file mode 100644
index 00000000000..4b8f586e00a
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.h
@@ -0,0 +1,35 @@
+//
+// $Id$
+//
+
+#ifndef MT_BIDIR__CLIENT_TASK_H
+#define MT_BIDIR_CLIENT_TASK_H
+#include /**/ "ace/pre.h"
+
+#include "ace/Task.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/ORB.h"
+
+
+/// Implement a Task to run the experiments using multiple threads.
+class Client_Task : public ACE_Task_Base
+{
+public:
+  /// Constructor
+  Client_Task (CORBA::ORB_ptr orb,
+               ACE_Thread_Manager *thr_mgr);
+
+  /// Thread entry point
+  int svc (void);
+
+private:
+  /// Reference to the ORB
+  CORBA::ORB_var orb_;
+};
+
+#include /**/ "ace/post.h"
+#endif /* MT_BIDIR_CLIENT_TASK_H */
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/MT_BiDir_SSL.mpc b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/MT_BiDir_SSL.mpc
new file mode 100644
index 00000000000..b9de35dbb68
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/MT_BiDir_SSL.mpc
@@ -0,0 +1,43 @@
+// -*- MPC -*-
+// $Id$
+
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Receiver.idl
+    Sender.idl
+  }
+  custom_only = 1
+}
+
+project(*Server): taoserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro {
+  after += *idl
+  Source_Files {
+    Sender_i.cpp
+    Server_Task.cpp
+    server.cpp
+  }
+  Source_Files {
+    ReceiverC.cpp
+    SenderC.cpp
+    SenderS.cpp
+  }
+  IDL_Files {
+  }
+}
+
+project(*Client): taoserver, avoids_minimum_corba, bidir_giop, avoids_corba_e_micro {
+  exename = client
+  after += *idl
+  Source_Files {
+    Client_Task.cpp
+    Receiver_i.cpp
+    client.cpp
+  }
+  Source_Files {
+    ReceiverC.cpp
+    ReceiverS.cpp
+    SenderC.cpp
+  }
+  IDL_Files {
+  }
+}
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/README b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/README
new file mode 100644
index 00000000000..28e9973ebe4
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/README
@@ -0,0 +1,19 @@
+/**
+
+$Id$
+
+@page MT_BiDir_SSL Test README File
+
+      This is a stress test that exercises the birectional GIOP
+connection implementation with multiple threads in TAO using SSLIOP.
+
+To run the test use the run_test.pl script:
+
+$ ./run_test.pl
+
+the script returns 0 if the test was successful.
+
+*/
+
+
+
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver.idl b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver.idl
new file mode 100644
index 00000000000..b8e7383670e
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver.idl
@@ -0,0 +1,11 @@
+//
+// $Id$
+//
+
+interface Receiver
+{
+  typedef sequence<octet> Payload;
+
+  /// A simple remote call
+  void receive_payload (in Receiver::Payload pay);
+};
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.cpp
new file mode 100644
index 00000000000..72b6bf4f7aa
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.cpp
@@ -0,0 +1,26 @@
+//
+// $Id$
+//
+#include "Receiver_i.h"
+
+Receiver_i::Receiver_i (void)
+  :  message_count_ (0)
+  ,  byte_count_ (0)
+{
+}
+
+
+void
+Receiver_i::receive_payload (const Receiver::Payload &payload)
+{
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
+  this->message_count_++;
+  this->byte_count_ += payload.length ();
+}
+
+CORBA::Long
+Receiver_i::get_event_count (void)
+{
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
+  return this->message_count_;
+}
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.h b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.h
new file mode 100644
index 00000000000..398955cca27
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.h
@@ -0,0 +1,35 @@
+//
+// $Id$
+//
+
+#ifndef MT_BIDIR_RECEIVER_I_H
+#define MT_BIDIR_RECEIVER_I_H
+#include /**/ "ace/pre.h"
+
+#include "ReceiverS.h"
+
+/**
+ * Simply print count how many bytes were received.
+ */
+class Receiver_i
+  : public virtual POA_Receiver
+{
+public:
+  /// Constructor
+  Receiver_i (void);
+
+
+  /// Get the number of events that have been received, local method
+  CORBA::Long get_event_count (void);
+
+  // = The skeleton methods
+  virtual void receive_payload (const Receiver::Payload &payload);
+
+private:
+  TAO_SYNCH_MUTEX mutex_;
+  CORBA::ULong message_count_;
+  CORBA::ULong byte_count_;
+};
+
+#include /**/ "ace/post.h"
+#endif /* MUXING_RECEIVER_H */
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender.idl b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender.idl
new file mode 100644
index 00000000000..9aa036f3327
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender.idl
@@ -0,0 +1,14 @@
+//
+// $Id$
+//
+#include "Receiver.idl"
+
+interface Sender
+{
+
+  exception Table_Full {};
+
+  /// Receive the Receiver object and return a id for the object.
+  long receiver_object (in Receiver recv)
+    raises (Table_Full);
+};
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.cpp
new file mode 100644
index 00000000000..35f2360528c
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.cpp
@@ -0,0 +1,62 @@
+// $Id$
+
+#include "Sender_i.h"
+#include "ace/Manual_Event.h"
+
+Sender_i::Sender_i (CORBA::ULong no_clients,
+                    ACE_Manual_Event &event)
+  : event_ (event)
+  , receivers_ (0)
+  , no_clients_ (no_clients)
+  , last_index_ (0)
+  , payload_ (32768)
+{
+  ACE_NEW (this->receivers_,
+           Receiver_var [no_clients]);
+
+  // Okay to have a magic number...
+  this->payload_.length (32768);
+
+  for (CORBA::ULong j = 0; j != this->payload_.length (); ++j)
+    this->payload_[j] = (j % 256);
+}
+
+Sender_i::~Sender_i (void)
+{
+  delete []this->receivers_;
+}
+
+CORBA::Long
+Sender_i::receiver_object (Receiver_ptr recv)
+{
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
+                    ace_mon,
+                    this->mutex_,-1);
+
+  if (this->no_clients_ == this->last_index_)
+    throw Sender::Table_Full ();
+
+  this->receivers_[this->last_index_] =
+    Receiver::_duplicate (recv);
+
+  ++this->last_index_;
+
+  if (this->last_index_ == this->no_clients_)
+    {
+      this->event_.signal ();
+    }
+
+  return this->last_index_;
+}
+
+
+void
+Sender_i::send_message (void)
+{
+  // NOTE:No synchronization with purpose. Synchrnozing this is
+  // going to spoil the whole purpose of this test.
+  CORBA::ULong send_to =
+    static_cast<CORBA::ULong> (ACE_OS::rand () % this->no_clients_);
+
+  this->receivers_[send_to]->receive_payload (this->payload_);
+}
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.h b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.h
new file mode 100644
index 00000000000..79032e33f6f
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.h
@@ -0,0 +1,55 @@
+// -*- C++ -*-
+//
+// $Id$
+
+#ifndef MT_BIDIR_RECEIVER_H
+#define MT_BIDIR_RECEIVER_H
+#include /**/ "ace/pre.h"
+
+#include "SenderS.h"
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Manual_Event;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+/**
+ * Simply print count how many bytes were received.
+ */
+class Sender_i
+  : public virtual POA_Sender
+{
+public:
+  /// Constructor
+  Sender_i (CORBA::ULong no_clients,
+            ACE_Manual_Event &event);
+
+  virtual ~Sender_i (void);
+
+  // = The skeleton methods
+  virtual CORBA::Long receiver_object (Receiver *recv);
+
+  /// Public method defined locally
+  void send_message (void);
+
+private:
+  /// Synchronizing acces to this class
+  TAO_SYNCH_MUTEX mutex_;
+
+  /// An event for waking other threads
+  ACE_Manual_Event &event_;
+
+  /// An array of receiver pointers
+  Receiver_var *receivers_;
+
+  /// Size of the <this->receivers_> array
+  CORBA::ULong no_clients_;
+
+  /// Receiver index
+  CORBA::ULong last_index_;
+
+  /// Payload that is being sent
+  Receiver::Payload payload_;
+};
+
+#include /**/ "ace/post.h"
+#endif /* MUXING_RECEIVER_H */
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp
new file mode 100644
index 00000000000..d095f295801
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp
@@ -0,0 +1,75 @@
+//
+// $Id$
+//
+
+#include "Server_Task.h"
+#include "Sender_i.h"
+#include "tao/ORB_Core.h"
+#include "tao/Thread_Lane_Resources.h"
+#include "tao/Transport_Cache_Manager.h"
+#include "ace/Manual_Event.h"
+
+Server_Task::Server_Task (Sender_i *sender,
+                          ACE_Manual_Event &event,
+                          int no_iterations,
+                          CORBA::ORB_ptr orb,
+                          ACE_Thread_Manager *thr_mgr)
+  : ACE_Task_Base (thr_mgr)
+  , sender_ (sender)
+  , event_ (event)
+  , no_iterations_ (no_iterations)
+  , orb_ (CORBA::ORB::_duplicate (orb))
+{
+}
+
+int
+Server_Task::svc (void)
+{
+  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Wait for the Event\n"));
+
+  /// Wait on the event
+  /// Yes, wait on event twice. One for making sure that we have got
+  /// all the clients  come and register with us.
+  this->event_.wait ();
+
+
+
+  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Start doing some work....\n"));
+
+
+  try
+    {
+      // Before start
+      CORBA::ULong connection_no =
+        this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size ();
+
+      for (int i = 0; i != this->no_iterations_; ++i)
+        {
+          if (i%50 == 0)
+            ACE_DEBUG ((LM_DEBUG, "(%P|%t) Sending message ....\n"));
+
+          this->sender_->send_message ();
+
+          // Sanity check for connections..
+          if (connection_no <
+              this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size ())
+            {
+              // Get the latest and the greatest..
+              connection_no =
+                this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size ();
+              ACE_ERROR ((LM_DEBUG,
+                          "(%P|%t) ERROR: New connections have been created\n"));
+              ACE_ERROR ((LM_DEBUG,
+                          "(%P|%t) ERROR: We will crash now...\n"));
+              ACE_OS::abort ();
+            }
+
+        }
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Caught exception in iteration.\n");
+    }
+
+  return 0;
+}
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.h b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.h
new file mode 100644
index 00000000000..42686741b21
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.h
@@ -0,0 +1,54 @@
+// -*- C++ -*-
+//
+// $Id$
+
+#ifndef MT_BIDIR_SERVER_TASK_H
+#define MT_BIDIR_SERVER_TASK_H
+
+#include /**/ "ace/pre.h"
+
+#include "ace/Task.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/ORB.h"
+
+class Sender_i;
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class ACE_Manual_Event;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+/// Implement a Task to run the experiments using multiple threads.
+class Server_Task : public ACE_Task_Base
+{
+public:
+  /// Constructor
+  Server_Task (Sender_i *s,
+               ACE_Manual_Event &event,
+               int no_iterations,
+               CORBA::ORB_ptr orb,
+               ACE_Thread_Manager *thr_mgr);
+
+  /// Thread entry point
+  int svc (void);
+
+private:
+  /// The sender object
+  Sender_i *sender_;
+
+  /// The synchronizer
+  ACE_Manual_Event &event_;
+
+  /// Number of messages that needs to be sent
+  int no_iterations_;
+
+  /// The ORB on which we run..
+  CORBA::ORB_var orb_;
+};
+
+#include /**/ "ace/post.h"
+
+#endif /* MT_BIDIR_SERVER_TASK_H */
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.conf b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.conf
new file mode 100644
index 00000000000..13aca91454e
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.conf
@@ -0,0 +1,12 @@
+# $Id$
+
+dynamic SSLIOP_Factory Service_Object * 
+  TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() 
+  "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey 'PEM:ssl/client-key.pem' -SSLCertificate 'PEM:ssl/client-cert.pem' -SSLCAFile 'PEM:ssl/ca.pem'" 
+
+dynamic Advanced_Resource_Factory Service_Object*
+  TAO_Strategies:_make_TAO_Advanced_Resource_Factory ()
+	"-ORBProtocolFactory SSLIOP_Factory -ORBMuxedConnectionMax 1"
+
+static Client_Strategy_Factory  "-ORBConnectStrategy blocked"
+
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.conf.xml b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.conf.xml
new file mode 100644
index 00000000000..6e34a5555df
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.conf.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0'?>
+<!-- Converted from ./orbsvcs/tests/Security/MT_SSLIOP/client.conf by svcconf-convert.pl -->
+<ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
+ <dynamic id="SSLIOP_Factory" type="Service_Object">
+   <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:ssl/client-key.pem -SSLCertificate PEM:ssl/client-cert.pem -SSLCAFile PEM:ssl/ca.pem"/>
+ </dynamic>
+<dynamic id="Advanced_Resource_Factory" type="Service_Object">
+   <initializer path="TAO_Strategies" init="_make_TAO_Advanced_Resource_Factory" params="-ORBProtocolFactory SSLIOP_Factory -ORBMuxedConnectionMax 1"/>
+ </dynamic>
+ <static id="Resource_Factory" params="-ORBConnectStrategy blocked"/>
+</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp
new file mode 100644
index 00000000000..abf16e115a9
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/client.cpp
@@ -0,0 +1,152 @@
+// $Id$
+
+#include "ace/Get_Opt.h"
+#include "Receiver_i.h"
+#include "SenderC.h"
+#include "tao/BiDir_GIOP/BiDirGIOP.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "Client_Task.h"
+
+const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
+
+int
+parse_args (int argc, ACE_TCHAR *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:"));
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'k':
+        ior = get_opts.optarg;
+        break;
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-k <ior> "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates successful parsing of the command line
+  return 0;
+}
+
+int
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+{
+
+  try
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv);
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references ("RootPOA");
+
+      if (CORBA::is_nil (poa_object.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          1);
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in ());
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager ();
+
+      // Policies for the childPOA to be created.
+      CORBA::PolicyList policies (1);
+      policies.length (1);
+
+      CORBA::Any pol;
+      pol <<= BiDirPolicy::BOTH;
+      policies[0] =
+        orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
+                            pol);
+
+      // Create POA as child of RootPOA with the above policies.  This POA
+      // will receive request in the same connection in which it sent
+      // the request
+      PortableServer::POA_var child_poa =
+        root_poa->create_POA ("childPOA",
+                              poa_manager.in (),
+                              policies);
+
+      // Creation of childPOA is over. Destroy the Policy objects.
+      for (CORBA::ULong i = 0;
+           i < policies.length ();
+           ++i)
+        {
+          policies[i]->destroy ();
+        }
+
+      poa_manager->activate ();
+
+      CORBA::Object_var object =
+        orb->string_to_object (ior);
+
+      Sender_var sender =
+        Sender::_narrow (object.in ());
+
+      if (CORBA::is_nil (sender.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Object reference <%s> is nil.\n",
+                             ior),
+                            1);
+        }
+
+
+      Receiver_i *receiver;
+      ACE_NEW_RETURN (receiver,
+                      Receiver_i (),
+                      -1);
+
+      PortableServer::ServantBase_var owner_transfer (receiver);
+
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (receiver);
+
+      CORBA::Object_var object_act = root_poa->id_to_reference (id.in ());
+
+      Receiver_var receiver_obj =
+        Receiver::_narrow (object_act.in ());
+
+      // Send the calback object to the server
+      sender->receiver_object (receiver_obj.in ());
+
+      // Threads that will handle the call backs
+      Client_Task client_task (orb.in (),
+                               ACE_Thread_Manager::instance ());
+
+      if (client_task.activate (THR_NEW_LWP | THR_JOINABLE, 4, 1) == -1)
+        {
+          ACE_ERROR ((LM_ERROR, "Error activating client task\n"));
+        }
+
+      ACE_Thread_Manager::instance ()->wait ();
+
+      CORBA::Long count =
+        receiver->get_event_count ();
+
+      ACE_DEBUG ((LM_DEBUG,
+                  "(%P|%t) Number of events received.. [%d]\n",
+                  count));
+
+      root_poa->destroy (1,
+                         1);
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Caught exception:");
+      return 1;
+    }
+
+  return 0;
+}
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/run_test.pl b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/run_test.pl
new file mode 100755
index 00000000000..a6125da53b2
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/run_test.pl
@@ -0,0 +1,148 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+     & eval 'exec perl -S $0 $argv:q'
+     if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "$ENV{ACE_ROOT}/bin";
+use PerlACE::TestTarget;
+
+$status = 0;
+$debug_level = '0';
+
+foreach $i (@ARGV) {
+    if ($i eq '-debug') {
+        $debug_level = '10';
+    }
+}
+
+my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
+my $client1 = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
+my $client2 = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n";
+my $client3 = PerlACE::TestTarget::create_target (4) || die "Create target 4 failed\n";
+
+my $iorbase = "server.ior";
+my $server_iorfile = $server->LocalFile ($iorbase);
+my $client1_iorfile = $client1->LocalFile ($iorbase);
+my $client2_iorfile = $client2->LocalFile ($iorbase);
+my $client3_iorfile = $client3->LocalFile ($iorbase);
+$server->DeleteFile($iorbase);
+$client1->DeleteFile($iorbase);
+$client2->DeleteFile($iorbase);
+$client3->DeleteFile($iorbase);
+
+my $server_conf_base = "server$PerlACE::svcconf_ext";
+my $server_conf = $server->LocalFile ($server_conf_base);
+
+my $client_conf_base = "client$PerlACE::svcconf_ext";
+
+# Copy the configuration file to the target.
+if ($server->PutFile ($server_conf_base) == -1) {
+    print STDERR "ERROR: cannot set file <$server_conf>\n";
+    exit 1;
+}
+
+$SV = $server->CreateProcess ("server",
+                              "-ORBdebuglevel $debug_level -ORBSvcConf $server_conf " .
+                              "-o $server_iorfile -c 3 -i 100");
+$CL1 = $client1->CreateProcess ("client", "-ORBSvcConf $client_conf_base -k file://$client1_iorfile");
+$CL2 = $client2->CreateProcess ("client", "-ORBSvcConf $client_conf_base -k file://$client2_iorfile");
+$CL3 = $client3->CreateProcess ("client", "-ORBSvcConf $client_conf_base -k file://$client3_iorfile");
+
+$server_status = $SV->Spawn ();
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    exit 1;
+}
+
+if ($server->WaitForFileTimed ($iorbase,
+                               $server->ProcessStartWaitInterval()) == -1) {
+    print STDERR "ERROR: cannot find file <$server_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+if ($server->GetFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+if ($client1->PutFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot set file <$client1_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+if ($client2->PutFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot set file <$client2_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+if ($client3->PutFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot set file <$client3_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+$client_status = $CL1->Spawn ();
+
+if ($client_status != 0) {
+    print STDERR "ERROR: client returned $client_status\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+$client_status = $CL2->Spawn ();
+
+if ($client_status != 0) {
+    print STDERR "ERROR: client returned $client_status\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    $CL1->Kill (); $CL1->TimedWait (1);
+    exit 1;
+}
+
+$client_status = $CL3->Spawn ();
+
+if ($client_status != 0) {
+    print STDERR "ERROR: client returned $client_status\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    $CL1->Kill (); $CL1->TimedWait (1);
+    $CL2->Kill (); $CL2->TimedWait (1);
+    exit 1;
+}
+
+$client_status = $CL1->WaitKill ($client1->ProcessStopWaitInterval() + 60);
+
+if ($client_status != 0) {
+    print STDERR "ERROR: client returned $client_status\n";
+    $status = 1;
+}
+
+$client_status = $CL2->WaitKill ($client2->ProcessStopWaitInterval() + 60);
+
+if ($client_status != 0) {
+    print STDERR "ERROR: client returned $client_status\n";
+    $status = 1;
+}
+
+$client_status = $CL3->WaitKill ($client3->ProcessStopWaitInterval() + 60);
+
+if ($client_status != 0) {
+    print STDERR "ERROR: client returned $client_status\n";
+    $status = 1;
+}
+
+$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval());
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    $status = 1;
+}
+
+$server->DeleteFile($iorbase);
+$client1->DeleteFile($iorbase);
+$client2->DeleteFile($iorbase);
+$client3->DeleteFile($iorbase);
+
+exit $status;
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.conf b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.conf
new file mode 100644
index 00000000000..6453d89749c
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.conf
@@ -0,0 +1,11 @@
+# $Id$
+#
+dynamic SSLIOP_Factory Service_Object * 
+  TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() 
+    "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey 'PEM:ssl/server-key.pem' -SSLCertificate 'PEM:ssl/server-cert.pem' -SSLCAFile 'PEM:ssl/ca.pem'"
+
+dynamic Advanced_Resource_Factory Service_Object*
+  TAO_Strategies:_make_TAO_Advanced_Resource_Factory ()
+	"-ORBProtocolFactory SSLIOP_Factory -ORBMuxedConnectionMax 1"
+
+static Client_Strategy_Factory  "-ORBConnectStrategy blocked"
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.conf.xml b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.conf.xml
new file mode 100644
index 00000000000..bc593d14981
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.conf.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0'?>
+<!-- Converted from ./tests/MT_BiDir/server.conf by svcconf-convert.pl -->
+<ACE_Svc_Conf>
+ <!--  $Id$ -->
+ <!--  -->
+<dynamic id="SSLIOP_Factory" type="Service_Object">
+   <initializer path="TAO_SSLIOP" init="_make_TAO_SSLIOP_Protocol_Factory" params="-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:ssl/server-key.pem -SSLCertificate PEM:ssl/server-cert.pem -SSLCAFile PEM:ssl/ca.pem"/>
+ </dynamic>
+<dynamic id="Advanced_Resource_Factory" type="Service_Object">
+   <initializer path="TAO_Strategies" init="_make_TAO_Advanced_Resource_Factory" params="-ORBProtocolFactory SSLIOP_Factory -ORBMuxedConnectionMax 1"/>
+ </dynamic>
+ <static id="Resource_Factory" params="-ORBConnectStrategy blocked"/>
+</ACE_Svc_Conf>
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.cpp
new file mode 100644
index 00000000000..043ed95d566
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/server.cpp
@@ -0,0 +1,178 @@
+// $Id$
+
+#include "ace/Get_Opt.h"
+#include "Sender_i.h"
+#include "tao/BiDir_GIOP/BiDirGIOP.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "Server_Task.h"
+#include "tao/ORB_Core.h"
+#include "tao/Thread_Lane_Resources.h"
+#include "tao/Transport_Cache_Manager.h"
+#include "ace/Manual_Event.h"
+
+const ACE_TCHAR *ior_output_file = 0;
+static int no_iterations = 10;
+static int no_clients = 2;
+
+int
+parse_args (int argc, ACE_TCHAR *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:i:c:"));
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'o':
+        ior_output_file = get_opts.optarg;
+        break;
+      case 'c':
+        no_clients = ACE_OS::atoi (get_opts.optarg);
+        break;
+      case 'i':
+        no_iterations = ACE_OS::atoi (get_opts.optarg);
+        break;
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-o <iorfile>"
+                           "-c <no_clients>"
+                           "-i <no_iterations>"
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates successful parsing of the command line
+  return 0;
+}
+
+
+int
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+{
+  try
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv);
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references ("RootPOA");
+
+      if (CORBA::is_nil (poa_object.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          1);
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in ());
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager ();
+
+      // Policies for the childPOA to be created.
+      CORBA::PolicyList policies (1);
+      policies.length (1);
+
+      CORBA::Any pol;
+      pol <<= BiDirPolicy::BOTH;
+      policies[0] =
+        orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
+                            pol);
+
+      // Create POA as child of RootPOA with the above policies.  This POA
+      // will receive request in the same connection in which it sent
+      // the request
+      PortableServer::POA_var child_poa =
+        root_poa->create_POA ("childPOA",
+                              poa_manager.in (),
+                              policies);
+
+      // Creation of childPOA is over. Destroy the Policy objects.
+      for (CORBA::ULong i = 0;
+           i < policies.length ();
+           ++i)
+        {
+          policies[i]->destroy ();
+        }
+
+      poa_manager->activate ();
+
+      ACE_Manual_Event manual_event;
+
+      Sender_i *sender = 0;
+      ACE_NEW_RETURN (sender,
+                      Sender_i (no_clients,
+                                manual_event),
+                      -1);
+
+      PortableServer::ServantBase_var owner_transfer (sender);
+
+      PortableServer::ObjectId_var id =
+        child_poa->activate_object (sender);
+
+      CORBA::Object_var obj =
+        child_poa->id_to_reference (id.in ());
+
+      CORBA::String_var ior =
+        orb->object_to_string (obj.in ());
+
+      ACE_DEBUG ((LM_DEBUG, "Activated as <%C>\n", ior.in ()));
+
+      // If the ior_output_file exists, output the ior to it
+      if (ior_output_file != 0)
+        {
+          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          if (output_file == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Cannot open output file for writing IOR: %s",
+                               ior_output_file),
+                              1);
+          ACE_OS::fprintf (output_file, "%s", ior.in ());
+          ACE_OS::fclose (output_file);
+        }
+
+
+      // Get the main thread id..
+      ACE_thread_t thr_id = ACE_Thread::self ();
+
+      Server_Task server_task (sender,
+                               manual_event,
+                               no_iterations,
+                               orb.in (),
+                               ACE_Thread_Manager::instance ());
+
+
+      if (server_task.activate (THR_NEW_LWP | THR_JOINABLE, 4, 1) == -1)
+        {
+          ACE_ERROR ((LM_ERROR, "Error activating server task\n"));
+        }
+
+      // Only the main thread gets to run the ORB
+      if (thr_id == ACE_Thread::self ())
+        {
+          // run the ORB for at most 60 seconds...
+          ACE_Time_Value tv (60, 0);
+
+          // Call the ORB run from the main thread
+          orb->run (tv);
+
+          ACE_DEBUG ((LM_DEBUG, "(%P|%t) event loop finished\n"));
+        }
+
+      ACE_Thread_Manager::instance ()->wait ();
+
+      root_poa->destroy (1,
+                         1);
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Caught exception:");
+      return 1;
+    }
+
+  return 0;
+}
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/ca.pem b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/ca.pem
new file mode 100644
index 00000000000..f580b756820
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/ca.pem
@@ -0,0 +1,34 @@
+-----BEGIN CERTIFICATE-----
+MIICyDCCAjGgAwIBAgIJAJLBvLx9WUXKMA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3QuIExvdWlzMQwwCgYDVQQK
+EwNPQ0kxDzANBgNVBAMTBnNlcnZlcjAeFw0xMTA4MjIxNTMyMjNaFw0xMjA4MjEx
+NTMyMjNaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3Qu
+IExvdWlzMQwwCgYDVQQKEwNPQ0kxDzANBgNVBAMTBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAzqVyUomhG3Zjvn6up7p2QCtjVOWMzeVr1aWYu2Ce
+W+ts/bwhmLVnp2qiANYQbQF47sHkxtL3KYa3aQy2JFwmJqPa4k478mg/316Fy9Yc
+MxL7l9rDC3GLdSyq4M6xqtYz12RepUydFwGfphvpL7augq/iKOjYsotezpUH87Ok
+vtkCAwEAAaOBrzCBrDAdBgNVHQ4EFgQUE+ZKmmcNsspWePyp/z0dRJor4IowfQYD
+VR0jBHYwdIAUE+ZKmmcNsspWePyp/z0dRJor4IqhUaRPME0xCzAJBgNVBAYTAlVT
+MQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3QuIExvdWlzMQwwCgYDVQQKEwNPQ0kx
+DzANBgNVBAMTBnNlcnZlcoIJAJLBvLx9WUXKMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQEFBQADgYEALoJCh6ZO52X3BfO/WbuBmvLbjwoX5LQdR+P/Ckz5ZKNdVTSI
+SkDDS+DUB77DMstAq65kcfq+gFwedb2k82Uk1TkenQ0BX3dBkAO2w5M2ipqHN2ez
+3kQ//pzWh/+k8QNgbQSwxKA2UwkbXBhDc2KbT+klhqCGA2hl0KySImgX5Jk=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICyDCCAjGgAwIBAgIJAJfoN7qD0W7YMA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3QuIExvdWlzMQwwCgYDVQQK
+EwNPQ0kxDzANBgNVBAMTBmNsaWVudDAeFw0xMTA4MjIxNTMyMjRaFw0xMjA4MjEx
+NTMyMjRaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3Qu
+IExvdWlzMQwwCgYDVQQKEwNPQ0kxDzANBgNVBAMTBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA2qjlVQ1oFxHyEc6FueJf1ZgpU5TFCzW47eNTDWSg
+mZELK72neyZ9rtBHqUGmOYU4pNMDz9vqc3gZ29c0wesNgKRM9Xsc/9CXLZK3eSYY
+qiqxjrwG/2EnAXprskgK2Mrt26HdfKUBq7wdQwmLrleNtUoeKHyQyfe+eL/BTMSP
+GMMCAwEAAaOBrzCBrDAdBgNVHQ4EFgQUnO1q8yoFZPjmMm0Wu3TJT0gOFuIwfQYD
+VR0jBHYwdIAUnO1q8yoFZPjmMm0Wu3TJT0gOFuKhUaRPME0xCzAJBgNVBAYTAlVT
+MQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3QuIExvdWlzMQwwCgYDVQQKEwNPQ0kx
+DzANBgNVBAMTBmNsaWVudIIJAJfoN7qD0W7YMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQEFBQADgYEArzMbOXyqBde8fjozyOOWEQcP+MppUbOVAXfdntbDwVYEld7S
+PofHVJ9jMNFN3HR5B7/5+NcwQRX6qivudMA5CXGyBTkH8Eeuth9E76tb6QJv8nTX
+bnIkk87foDoTxjHNkeBsNV89k2lMF721084yaISR4JJAJ5tRU0xXOzNkkpw=
+-----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-cert.pem b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-cert.pem
new file mode 100644
index 00000000000..cc35017c829
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-cert.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIICyDCCAjGgAwIBAgIJAJfoN7qD0W7YMA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3QuIExvdWlzMQwwCgYDVQQK
+EwNPQ0kxDzANBgNVBAMTBmNsaWVudDAeFw0xMTA4MjIxNTMyMjRaFw0xMjA4MjEx
+NTMyMjRaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3Qu
+IExvdWlzMQwwCgYDVQQKEwNPQ0kxDzANBgNVBAMTBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA2qjlVQ1oFxHyEc6FueJf1ZgpU5TFCzW47eNTDWSg
+mZELK72neyZ9rtBHqUGmOYU4pNMDz9vqc3gZ29c0wesNgKRM9Xsc/9CXLZK3eSYY
+qiqxjrwG/2EnAXprskgK2Mrt26HdfKUBq7wdQwmLrleNtUoeKHyQyfe+eL/BTMSP
+GMMCAwEAAaOBrzCBrDAdBgNVHQ4EFgQUnO1q8yoFZPjmMm0Wu3TJT0gOFuIwfQYD
+VR0jBHYwdIAUnO1q8yoFZPjmMm0Wu3TJT0gOFuKhUaRPME0xCzAJBgNVBAYTAlVT
+MQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3QuIExvdWlzMQwwCgYDVQQKEwNPQ0kx
+DzANBgNVBAMTBmNsaWVudIIJAJfoN7qD0W7YMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQEFBQADgYEArzMbOXyqBde8fjozyOOWEQcP+MppUbOVAXfdntbDwVYEld7S
+PofHVJ9jMNFN3HR5B7/5+NcwQRX6qivudMA5CXGyBTkH8Eeuth9E76tb6QJv8nTX
+bnIkk87foDoTxjHNkeBsNV89k2lMF721084yaISR4JJAJ5tRU0xXOzNkkpw=
+-----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-key.pem b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-key.pem
new file mode 100644
index 00000000000..adfbf067d3d
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/client-key.pem
@@ -0,0 +1,32 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXgIBAAKBgQDaqOVVDWgXEfIRzoW54l/VmClTlMULNbjt41MNZKCZkQsrvad7
+Jn2u0EepQaY5hTik0wPP2+pzeBnb1zTB6w2ApEz1exz/0Jctkrd5JhiqKrGOvAb/
+YScBemuySArYyu3bod18pQGrvB1DCYuuV421Sh4ofJDJ9754v8FMxI8YwwIDAQAB
+AoGBAKVNs/olpYBzX6aYk74gZkTqwKtgN8qutXyaM6pXXZZa8bACs7/FLJTg/pv1
+dn3buiPZJvOYFNlwfVQWkNrdIRmuvtPOhdacBTcZiYWQ8GesNfwlHwBXCI9vrRq2
+FJh196mHwbRx2b8IsymilQ24TMvwkvEpFqLA02d/igdUokghAkEA8zSVZ1OOE8so
+aSAj45ZcdQJ8hPPDqabacjEHnLXj7rJCof2M1VQwLMj8krLxoMTA29fYzwWF5lpT
+3zWbgS02kwJBAOYpvSItytP2LA5PrSC03Wa+cPJdBBQBmsRaNulcP+CZKiY2e7nh
+1zXN7QOdBTXsCE/A8QXqpl+Omt3HUg1iQxECQQCcyrrDSYfgVOpxk8nvcMGcogS7
+BhiPqEVOtzNMIauX+I6itr7zzXnddZn3zaufVRls4iQhm1Lu5i8KSRo+1nJHAkBg
+lfdmlmzdUhrezpTKetvGN/jR3DLP6nR2HZ2ZhDrSF7RWYNq/AIT9cTMbJxN+s1Qx
+k7gRUY0L4J4gn3pRX4DhAkEA8Unw8+j8wbQ6gH9erqpRSlEtYZePh/cY10h3SBZ3
+eD6ZFqsYIHtAJMVqzSZFuWjBIk0e57RH7NRgfCFPl3VJew==
+-----END RSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICyDCCAjGgAwIBAgIJAJfoN7qD0W7YMA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3QuIExvdWlzMQwwCgYDVQQK
+EwNPQ0kxDzANBgNVBAMTBmNsaWVudDAeFw0xMTA4MjIxNTMyMjRaFw0xMjA4MjEx
+NTMyMjRaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3Qu
+IExvdWlzMQwwCgYDVQQKEwNPQ0kxDzANBgNVBAMTBmNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEA2qjlVQ1oFxHyEc6FueJf1ZgpU5TFCzW47eNTDWSg
+mZELK72neyZ9rtBHqUGmOYU4pNMDz9vqc3gZ29c0wesNgKRM9Xsc/9CXLZK3eSYY
+qiqxjrwG/2EnAXprskgK2Mrt26HdfKUBq7wdQwmLrleNtUoeKHyQyfe+eL/BTMSP
+GMMCAwEAAaOBrzCBrDAdBgNVHQ4EFgQUnO1q8yoFZPjmMm0Wu3TJT0gOFuIwfQYD
+VR0jBHYwdIAUnO1q8yoFZPjmMm0Wu3TJT0gOFuKhUaRPME0xCzAJBgNVBAYTAlVT
+MQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3QuIExvdWlzMQwwCgYDVQQKEwNPQ0kx
+DzANBgNVBAMTBmNsaWVudIIJAJfoN7qD0W7YMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQEFBQADgYEArzMbOXyqBde8fjozyOOWEQcP+MppUbOVAXfdntbDwVYEld7S
+PofHVJ9jMNFN3HR5B7/5+NcwQRX6qivudMA5CXGyBTkH8Eeuth9E76tb6QJv8nTX
+bnIkk87foDoTxjHNkeBsNV89k2lMF721084yaISR4JJAJ5tRU0xXOzNkkpw=
+-----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/make-client-keys b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/make-client-keys
new file mode 100755
index 00000000000..6ba5894dde9
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/make-client-keys
@@ -0,0 +1,16 @@
+#!/bin/bash -x
+
+openssl req -new -x509 -days 365 -nodes -newkey rsa:1024 \
+    -out server-cert.pem -keyout server-key.pem \
+    -subj "/C=US/ST=MO/L=St. Louis/O=OCI/CN=server"
+
+cat server-cert.pem >>server-key.pem
+cat server-cert.pem >ca.pem
+        
+openssl req -new -x509 -days 365 -nodes -newkey rsa:1024 \
+    -out client-cert.pem -keyout client-key.pem \
+    -subj "/C=US/ST=MO/L=St. Louis/O=OCI/CN=client"
+
+cat client-cert.pem >>client-key.pem
+cat client-cert.pem >>ca.pem
+        
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-cert.pem b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-cert.pem
new file mode 100644
index 00000000000..5438e2a4dda
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-cert.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIICyDCCAjGgAwIBAgIJAJLBvLx9WUXKMA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3QuIExvdWlzMQwwCgYDVQQK
+EwNPQ0kxDzANBgNVBAMTBnNlcnZlcjAeFw0xMTA4MjIxNTMyMjNaFw0xMjA4MjEx
+NTMyMjNaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3Qu
+IExvdWlzMQwwCgYDVQQKEwNPQ0kxDzANBgNVBAMTBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAzqVyUomhG3Zjvn6up7p2QCtjVOWMzeVr1aWYu2Ce
+W+ts/bwhmLVnp2qiANYQbQF47sHkxtL3KYa3aQy2JFwmJqPa4k478mg/316Fy9Yc
+MxL7l9rDC3GLdSyq4M6xqtYz12RepUydFwGfphvpL7augq/iKOjYsotezpUH87Ok
+vtkCAwEAAaOBrzCBrDAdBgNVHQ4EFgQUE+ZKmmcNsspWePyp/z0dRJor4IowfQYD
+VR0jBHYwdIAUE+ZKmmcNsspWePyp/z0dRJor4IqhUaRPME0xCzAJBgNVBAYTAlVT
+MQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3QuIExvdWlzMQwwCgYDVQQKEwNPQ0kx
+DzANBgNVBAMTBnNlcnZlcoIJAJLBvLx9WUXKMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQEFBQADgYEALoJCh6ZO52X3BfO/WbuBmvLbjwoX5LQdR+P/Ckz5ZKNdVTSI
+SkDDS+DUB77DMstAq65kcfq+gFwedb2k82Uk1TkenQ0BX3dBkAO2w5M2ipqHN2ez
+3kQ//pzWh/+k8QNgbQSwxKA2UwkbXBhDc2KbT+klhqCGA2hl0KySImgX5Jk=
+-----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-key.pem b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-key.pem
new file mode 100644
index 00000000000..673dcab56db
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/ssl/server-key.pem
@@ -0,0 +1,32 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDOpXJSiaEbdmO+fq6nunZAK2NU5YzN5WvVpZi7YJ5b62z9vCGY
+tWenaqIA1hBtAXjuweTG0vcphrdpDLYkXCYmo9riTjvyaD/fXoXL1hwzEvuX2sML
+cYt1LKrgzrGq1jPXZF6lTJ0XAZ+mG+kvtq6Cr+Io6Niyi17OlQfzs6S+2QIDAQAB
+AoGBAM3ZOZzGxNoagRnOECW9NPaPQg/b6vtfwp+8qfxeLuHaD2Ri+ASrEGpRarfy
+hcJQaStNspvso5GWRTY8F2T49nZVDa2gKstfKAVFVUXkIcDUxbBeDgE294+5bhvQ
+8wzzCaHo8N//csfK40wjZkXjKu9tMN1YO0bPnUg+jAUh5kjRAkEA6e1kzuI/TXYT
+FOJEYXe6iMxkd7tnFJH9C6OP+oLQ5EEU/fzs2Denr2N4qGP/6t70K2Dox9tlChEg
+rtfE/974dwJBAOIlEYc5B2fSPCpqP9i/Xg2WB3gN91GpjsZUM0QGE+jrShljJOrX
+QB4ZxI2QaY87Gcl42VKxm/OiISvUeL69Jy8CQFlSC+vy97jcHO0ceH++97rEUJhn
+NjTkiXqoOZGt4ZVGRH221bi5h42wraGejVlhSFpH5pppa2ssnw4j1VTeDoECQEA6
+EOlbvAuzfNz7AhkX+KlZI9Pn+4bY5jDTtx+prjvnn0roipKcAZzK6rTd/+zq9x7u
+UKKYyNcAA/XDyWs6o4cCQQCZpu6c99L3O7MfdSCkqaJyybHAURAxrt3r50VTGg+z
+52LZUCv0UD9aeHrOEkaw8RFriuEiKGRmb8iuqqhNSJ7w
+-----END RSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICyDCCAjGgAwIBAgIJAJLBvLx9WUXKMA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
+BAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3QuIExvdWlzMQwwCgYDVQQK
+EwNPQ0kxDzANBgNVBAMTBnNlcnZlcjAeFw0xMTA4MjIxNTMyMjNaFw0xMjA4MjEx
+NTMyMjNaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3Qu
+IExvdWlzMQwwCgYDVQQKEwNPQ0kxDzANBgNVBAMTBnNlcnZlcjCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAzqVyUomhG3Zjvn6up7p2QCtjVOWMzeVr1aWYu2Ce
+W+ts/bwhmLVnp2qiANYQbQF47sHkxtL3KYa3aQy2JFwmJqPa4k478mg/316Fy9Yc
+MxL7l9rDC3GLdSyq4M6xqtYz12RepUydFwGfphvpL7augq/iKOjYsotezpUH87Ok
+vtkCAwEAAaOBrzCBrDAdBgNVHQ4EFgQUE+ZKmmcNsspWePyp/z0dRJor4IowfQYD
+VR0jBHYwdIAUE+ZKmmcNsspWePyp/z0dRJor4IqhUaRPME0xCzAJBgNVBAYTAlVT
+MQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3QuIExvdWlzMQwwCgYDVQQKEwNPQ0kx
+DzANBgNVBAMTBnNlcnZlcoIJAJLBvLx9WUXKMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQEFBQADgYEALoJCh6ZO52X3BfO/WbuBmvLbjwoX5LQdR+P/Ckz5ZKNdVTSI
+SkDDS+DUB77DMstAq65kcfq+gFwedb2k82Uk1TkenQ0BX3dBkAO2w5M2ipqHN2ez
+3kQ//pzWh/+k8QNgbQSwxKA2UwkbXBhDc2KbT+klhqCGA2hl0KySImgX5Jk=
+-----END CERTIFICATE-----
diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.h b/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.h
index eb3e98763fb..f95fe94f589 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.h
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/Roundtrip.h
@@ -28,7 +28,7 @@ class Roundtrip
     void shutdown (Test::AMH_RoundtripResponseHandler_ptr _tao_rh);
 
  private:
-    /// Use an ORB reference to conver strings to objects and shutdown
+    /// Use an ORB reference to convert strings to objects and shutdown
     /// the application.
     CORBA::ORB_var orb_;
 };
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip.h b/TAO/performance-tests/Latency/AMI/Roundtrip.h
index 9ea3a22bc1c..5631b6e86d7 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip.h
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip.h
@@ -27,7 +27,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/performance-tests/Latency/Collocation/Roundtrip.h b/TAO/performance-tests/Latency/Collocation/Roundtrip.h
index 9ea3a22bc1c..5631b6e86d7 100644
--- a/TAO/performance-tests/Latency/Collocation/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Collocation/Roundtrip.h
@@ -27,7 +27,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/performance-tests/Latency/DII/Roundtrip.h b/TAO/performance-tests/Latency/DII/Roundtrip.h
index 9ea3a22bc1c..5631b6e86d7 100644
--- a/TAO/performance-tests/Latency/DII/Roundtrip.h
+++ b/TAO/performance-tests/Latency/DII/Roundtrip.h
@@ -27,7 +27,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/performance-tests/Latency/DSI/Roundtrip.h b/TAO/performance-tests/Latency/DSI/Roundtrip.h
index ecd7edb359f..e163508f1eb 100644
--- a/TAO/performance-tests/Latency/DSI/Roundtrip.h
+++ b/TAO/performance-tests/Latency/DSI/Roundtrip.h
@@ -30,7 +30,7 @@ public:
       PortableServer::POA_ptr poa);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/performance-tests/Latency/Deferred/Roundtrip.h b/TAO/performance-tests/Latency/Deferred/Roundtrip.h
index 9ea3a22bc1c..5631b6e86d7 100644
--- a/TAO/performance-tests/Latency/Deferred/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Deferred/Roundtrip.h
@@ -27,7 +27,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h
index 9ea3a22bc1c..5631b6e86d7 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h
@@ -27,7 +27,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h
index 9ea3a22bc1c..5631b6e86d7 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h
@@ -27,7 +27,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h
index 9ea3a22bc1c..5631b6e86d7 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h
@@ -27,7 +27,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/performance-tests/Memory/IORsize/Memory_Growth.h b/TAO/performance-tests/Memory/IORsize/Memory_Growth.h
index dc61170a2ba..d76ea2610fc 100644
--- a/TAO/performance-tests/Memory/IORsize/Memory_Growth.h
+++ b/TAO/performance-tests/Memory/IORsize/Memory_Growth.h
@@ -25,7 +25,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h
index acb1b388c89..1901ef7787e 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h
+++ b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.h
@@ -27,7 +27,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h
index f9b5826745d..00215bbed1e 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Roundtrip.h
@@ -54,7 +54,7 @@ public:
   void shutdown (Test::AMH_RoundtripResponseHandler_ptr _tao_rh);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h
index d640b884d81..6524b2b3399 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Roundtrip.h
@@ -44,7 +44,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h
index d640b884d81..6524b2b3399 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/DII/Roundtrip.h
@@ -44,7 +44,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.h
index ecd7edb359f..e163508f1eb 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.h
@@ -30,7 +30,7 @@ public:
       PortableServer::POA_ptr poa);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h
index d640b884d81..6524b2b3399 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Roundtrip.h
@@ -44,7 +44,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h
index d640b884d81..6524b2b3399 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Roundtrip.h
@@ -44,7 +44,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h
index 1d93a5f9f4e..bc9544cbff5 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Roundtrip.h
@@ -43,7 +43,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h
index 1d93a5f9f4e..bc9544cbff5 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Roundtrip.h
@@ -43,7 +43,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tao/Abstract_Servant_Base.h b/TAO/tao/Abstract_Servant_Base.h
index fcd601e961b..37778759279 100644
--- a/TAO/tao/Abstract_Servant_Base.h
+++ b/TAO/tao/Abstract_Servant_Base.h
@@ -36,6 +36,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_ServerRequest;
 class TAO_Stub;
 class TAO_Abstract_ServantBase;
+class TAO_ServantBase;
 
 namespace CORBA
 {
@@ -51,13 +52,17 @@ namespace CORBA
 namespace TAO
 {
   class Argument;
+
+  namespace Portable_Server
+  {
+    class Servant_Upcall;
+  }
 }
 
 typedef void (*TAO_Skeleton)(
     TAO_ServerRequest &,
-    void *,
-    void *
-  );
+    TAO::Portable_Server::Servant_Upcall *,
+    TAO_ServantBase *);
 
 typedef void (*TAO_Collocated_Skeleton)(
     TAO_Abstract_ServantBase *,
@@ -150,12 +155,9 @@ protected:
    * invokes the operation, storing the results and out parameters (if
    * any) or the exceptions thrown into @a request.
    */
-  virtual void _dispatch (TAO_ServerRequest &request,
-                          void *servant_upcall) = 0;
-
-  virtual void synchronous_upcall_dispatch (TAO_ServerRequest &req,
-                                            void *servant_upcall,
-                                            void *derived_this) = 0;
+  virtual void _dispatch (
+    TAO_ServerRequest &request,
+    TAO::Portable_Server::Servant_Upcall *servant_upcall) = 0;
 
   /// Get this interface's repository id (TAO specific).
   virtual const char *_interface_repository_id (void) const = 0;
diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode.mpc b/TAO/tao/AnyTypeCode/AnyTypeCode.mpc
index e6167b6c359..cda80b7bfb8 100644
--- a/TAO/tao/AnyTypeCode/AnyTypeCode.mpc
+++ b/TAO/tao/AnyTypeCode/AnyTypeCode.mpc
@@ -130,6 +130,7 @@ project(AnyTypeCode) : taolib, tao_output, install, extra_anytypecode, taoidldef
     OctetSeqA.h
     PI_ForwardA.h
     ParameterModeA.h
+    PolicyA.h
     Policy_CurrentA.h
     Policy_ForwardA.h
     Policy_ManagerA.h
diff --git a/TAO/tao/AnyTypeCode/PolicyA.cpp b/TAO/tao/AnyTypeCode/PolicyA.cpp
deleted file mode 100644
index 0ec8e48a7b4..00000000000
--- a/TAO/tao/AnyTypeCode/PolicyA.cpp
+++ /dev/null
@@ -1,401 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "tao/AnyTypeCode/PolicyA.h"
-#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
-#include "tao/AnyTypeCode/TypeCode_Constants.h"
-#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
-#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
-#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
-#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/AnyTypeCode/Any.h"
-#include "tao/AnyTypeCode/Any_Impl_T.h"
-#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
-
-#include "tao/AnyTypeCode/UShortSeqA.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_PolicyErrorCode (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/PolicyErrorCode:1.0",
-    "PolicyErrorCode",
-    &CORBA::_tc_short);
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyErrorCode =
-    &_tao_tc_CORBA_PolicyErrorCode;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_PolicyError[] =
-  {
-    { "reason", &CORBA::_tc_PolicyErrorCode }
-
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_PolicyError (
-    CORBA::tk_except,
-    "IDL:omg.org/CORBA/PolicyError:1.0",
-    "PolicyError",
-    _tao_fields_CORBA_PolicyError,
-    1);
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyError =
-    &_tao_tc_CORBA_PolicyError;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_InvalidPolicies[] =
-  {
-    { "indices", &CORBA::_tc_UShortSeq }
-
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_InvalidPolicies (
-    CORBA::tk_except,
-    "IDL:omg.org/CORBA/InvalidPolicies:1.0",
-    "InvalidPolicies",
-    _tao_fields_CORBA_InvalidPolicies,
-    1);
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_InvalidPolicies =
-    &_tao_tc_CORBA_InvalidPolicies;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Policy (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/Policy:1.0",
-    "Policy");
-
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Policy =
-    &_tao_tc_CORBA_Policy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<CORBA::PolicyError>::demarshal_value (
-      TAO_InputCDR & cdr
-    )
-  {
-    CORBA::String_var id;
-
-    if (!(cdr >> id.out ()))
-      {
-        return false;
-      }
-
-    try
-      {
-        this->value_->_tao_decode (cdr);
-      }
-    catch (const ::CORBA::Exception&)
-      {
-        return false;
-      }
-
-    return true;
-  }
-}
-
-#ifdef ACE_ANY_OPS_USE_NAMESPACE
-namespace CORBA
-{
-#endif
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::PolicyError &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::PolicyError>::insert_copy (
-      _tao_any,
-      CORBA::PolicyError::_tao_any_destructor,
-      CORBA::_tc_PolicyError,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PolicyError *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::PolicyError>::insert (
-      _tao_any,
-      CORBA::PolicyError::_tao_any_destructor,
-      CORBA::_tc_PolicyError,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::PolicyError *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::PolicyError *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::PolicyError *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::PolicyError>::extract (
-        _tao_any,
-        CORBA::PolicyError::_tao_any_destructor,
-        CORBA::_tc_PolicyError,
-        _tao_elem
-      );
-}
-
-#ifdef ACE_ANY_OPS_USE_NAMESPACE
-}
-#endif
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<CORBA::InvalidPolicies>::demarshal_value (
-      TAO_InputCDR & cdr
-    )
-  {
-    CORBA::String_var id;
-
-    if (!(cdr >> id.out ()))
-      {
-        return false;
-      }
-
-    try
-      {
-        this->value_->_tao_decode (cdr);
-      }
-    catch (const ::CORBA::Exception&)
-      {
-        return false;
-      }
-
-    return true;
-  }
-}
-
-#ifdef ACE_ANY_OPS_USE_NAMESPACE
-namespace CORBA
-{
-#endif
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::InvalidPolicies &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies>::insert_copy (
-      _tao_any,
-      CORBA::InvalidPolicies::_tao_any_destructor,
-      CORBA::_tc_InvalidPolicies,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::InvalidPolicies *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies>::insert (
-      _tao_any,
-      CORBA::InvalidPolicies::_tao_any_destructor,
-      CORBA::_tc_InvalidPolicies,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::InvalidPolicies *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::InvalidPolicies *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::InvalidPolicies *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies>::extract (
-        _tao_any,
-        CORBA::InvalidPolicies::_tao_any_destructor,
-        CORBA::_tc_InvalidPolicies,
-        _tao_elem
-      );
-}
-
-#ifdef ACE_ANY_OPS_USE_NAMESPACE
-}
-#endif
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::Policy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-#ifdef ACE_ANY_OPS_USE_NAMESPACE
-namespace CORBA
-{
-#endif
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Policy_ptr _tao_elem
-  )
-{
-  CORBA::Policy_ptr _tao_objptr =
-    CORBA::Policy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Policy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::Policy>::insert (
-      _tao_any,
-      CORBA::Policy::_tao_any_destructor,
-      CORBA::_tc_Policy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Policy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::Policy>::extract (
-        _tao_any,
-        CORBA::Policy::_tao_any_destructor,
-        CORBA::_tc_Policy,
-        _tao_elem
-      );
-}
-
-#ifdef ACE_ANY_OPS_USE_NAMESPACE
-}
-#endif
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/PolicyA.h b/TAO/tao/AnyTypeCode/PolicyA.h
deleted file mode 100644
index 1abfdbcdd0a..00000000000
--- a/TAO/tao/AnyTypeCode/PolicyA.h
+++ /dev/null
@@ -1,134 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_POLICYA_H_
-#define _TAO_IDL_ORIG_POLICYA_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h"
-#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
-#include "tao/PolicyC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_AnyTypeCode_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace CORBA
-{
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  extern TAO_AnyTypeCode_Export ::CORBA::TypeCode_ptr const _tc_PolicyErrorCode;
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  extern TAO_AnyTypeCode_Export ::CORBA::TypeCode_ptr const _tc_PolicyError;
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  extern TAO_AnyTypeCode_Export ::CORBA::TypeCode_ptr const _tc_InvalidPolicies;
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  extern TAO_AnyTypeCode_Export ::CORBA::TypeCode_ptr const _tc_Policy;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-#ifdef ACE_ANY_OPS_USE_NAMESPACE
-namespace CORBA
-{
-#endif
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const CORBA::PolicyError &); // copying version
-TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::PolicyError*); // noncopying version
-TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyError *&); // deprecated
-TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::PolicyError *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, const CORBA::InvalidPolicies &); // copying version
-TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::InvalidPolicies*); // noncopying version
-TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::InvalidPolicies *&); // deprecated
-TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::InvalidPolicies *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr); // copying
-TAO_AnyTypeCode_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr *); // non-copying
-TAO_AnyTypeCode_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Policy_ptr &);
-
-#ifdef ACE_ANY_OPS_USE_NAMESPACE
-}
-#endif
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp
index 668d4b7b557..3b56db02be5 100644
--- a/TAO/tao/CDR.cpp
+++ b/TAO/tao/CDR.cpp
@@ -68,7 +68,7 @@ TAO_OutputCDR::TAO_OutputCDR (size_t size,
   , more_fragments_ (false)
   , request_id_ (0)
   , stub_ (0)
-  , message_semantics_ (TAO_TWOWAY_REQUEST)
+  , message_semantics_ (TAO_Message_Semantics::TAO_TWOWAY_REQUEST)
   , timeout_ (0)
 {
   ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR1_ENTER);
@@ -104,7 +104,7 @@ TAO_OutputCDR::TAO_OutputCDR (char *data,
   , more_fragments_ (false)
   , request_id_ (0)
   , stub_ (0)
-  , message_semantics_ (TAO_TWOWAY_REQUEST)
+  , message_semantics_ (TAO_Message_Semantics::TAO_TWOWAY_REQUEST)
   , timeout_ (0)
 {
   ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR2_ENTER);
@@ -133,7 +133,7 @@ TAO_OutputCDR::TAO_OutputCDR (char *data,
   , more_fragments_ (false)
   , request_id_ (0)
   , stub_ (0)
-  , message_semantics_ (TAO_TWOWAY_REQUEST)
+  , message_semantics_ (TAO_Message_Semantics::TAO_TWOWAY_REQUEST)
   , timeout_ (0)
 {
   ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR3_ENTER);
@@ -153,7 +153,7 @@ TAO_OutputCDR::TAO_OutputCDR (ACE_Message_Block *data,
   , more_fragments_ (false)
   , request_id_ (0)
   , stub_ (0)
-  , message_semantics_ (TAO_TWOWAY_REQUEST)
+  , message_semantics_ (TAO_Message_Semantics::TAO_TWOWAY_REQUEST)
   , timeout_ (0)
 {
   ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR4_ENTER);
@@ -176,7 +176,7 @@ TAO_OutputCDR::TAO_OutputCDR (ACE_Data_Block *data_block,
   , more_fragments_ (false)
   , request_id_ (0)
   , stub_ (0)
-  , message_semantics_ (TAO_TWOWAY_REQUEST)
+  , message_semantics_ (TAO_Message_Semantics::TAO_TWOWAY_REQUEST)
   , timeout_ (0)
 {
   ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR5_ENTER);
diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp
index df33e5462b9..fa6a549f8de 100644
--- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp
+++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp
@@ -69,12 +69,13 @@ TAO::CSD::FW_Server_Request_Wrapper::~FW_Server_Request_Wrapper()
 
 // Assumes that the servant argument is not a NULL pointer.
 void
-TAO::CSD::FW_Server_Request_Wrapper::dispatch
-                                            (PortableServer::Servant servant)
+TAO::CSD::FW_Server_Request_Wrapper::dispatch (
+  PortableServer::Servant servant,
+  TAO::Portable_Server::Servant_Upcall *servant_upcall)
 {
   try
     {
-      servant->_dispatch(*this->request_, 0);
+      servant->_dispatch(*this->request_, servant_upcall);
     }
   // Only CORBA exceptions are caught here.
   catch (const ::CORBA::Exception& ex)
diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h
index e01357d3e10..53efc1959bf 100644
--- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h
+++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h
@@ -71,12 +71,13 @@ namespace TAO
       void clone();
 
       /// Dispatch the request to the servant.
-      void dispatch(PortableServer::Servant servant);
+      void dispatch(
+        PortableServer::Servant servant,
+        TAO::Portable_Server::Servant_Upcall *servant_upcall);
 
       /// Cancel the request.
       void cancel();
 
-
     private:
 
       /// Create a deep copy of the request_ object.
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl b/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl
index 7e42abe17f6..377e2358591 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl
@@ -66,7 +66,7 @@ TAO::CSD::Strategy_Base::dispatch_request
       case DISPATCH_DEFERRED:
         // Perform the "default" dispatching strategy logic for this request
         // right now, using the current thread.
-        upcall.servant()->_dispatch(server_request, (void*)&upcall);
+        upcall.servant()->_dispatch(server_request, &upcall);
         break;
 
       default:
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl
index 8977b973f4c..60389dc82a6 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl
@@ -26,7 +26,7 @@ TAO::CSD::Strategy_Proxy::dispatch_request
   if (this->strategy_impl_ == 0)
     {
       // This is the "default" strategy implementation.
-      upcall.servant()->_dispatch(server_request, (void*)&upcall);
+      upcall.servant()->_dispatch(server_request, &upcall);
     }
   else
     {
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h
index bcf4b289d33..1aa09d7e948 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h
@@ -73,9 +73,7 @@ namespace TAO
       /// Delegate to the FW_Server_Request_Wrapper cancel() method.
       void do_cancel();
 
-
     private:
-
       /// The ObjectId for the target servant.
       PortableServer::ObjectId object_id_;
 
@@ -88,7 +86,6 @@ namespace TAO
       /// The TAO_ServerRequest object wrapper.
       FW_Server_Request_Wrapper server_request_;
     };
-
   }
 }
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl
index 4334a281140..586f76af3bb 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl
@@ -31,7 +31,9 @@ ACE_INLINE
 void
 TAO::CSD::TP_Corba_Request::do_dispatch(void)
 {
-  this->server_request_.dispatch(this->servant());
+  // Pass 0 for the upcall wrapper. If we have it here, we can change the
+  // upcall wrapper to a reference in the full TAO Core
+  this->server_request_.dispatch(this->servant(), 0);
 }
 
 ACE_INLINE
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
index a9495f3b888..1da6a6dd03f 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
@@ -112,8 +112,9 @@ TAO_DynamicImplementation::_create_stub (void)
 }
 
 void
-TAO_DynamicImplementation::_dispatch (TAO_ServerRequest &request,
-                                      void * /* context */)
+TAO_DynamicImplementation::_dispatch (
+  TAO_ServerRequest &request,
+  TAO::Portable_Server::Servant_Upcall * /* context */)
 {
   // No need to do any of this if the client isn't waiting.
   if (request.response_expected ())
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.h b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
index 0d15ec38c3d..1bed495fce9 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.h
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
@@ -85,7 +85,9 @@ protected:
   virtual TAO_Stub *_create_stub (void);
 
   /// Turns around and calls invoke.
-  virtual void _dispatch (TAO_ServerRequest &request, void *context);
+  virtual void _dispatch (
+    TAO_ServerRequest &request,
+    TAO::Portable_Server::Servant_Upcall *context);
 
 private:
   /// Encapsulates code common to _is_a(), _get_interface() and _create_stub().
diff --git a/TAO/tao/Exclusive_TMS.cpp b/TAO/tao/Exclusive_TMS.cpp
index 4a95529e3d1..b2ea77be367 100644
--- a/TAO/tao/Exclusive_TMS.cpp
+++ b/TAO/tao/Exclusive_TMS.cpp
@@ -129,7 +129,23 @@ TAO_Exclusive_TMS::reply_timed_out (CORBA::ULong request_id)
 bool
 TAO_Exclusive_TMS::idle_after_send (void)
 {
-  return false;
+  // if there is no reply dispatcher (possible in case of AMI requests)
+  // release the transport now
+  if (this->rd_ != 0)
+    {
+      return false;
+    }
+  else
+    {
+      if (this->transport_ != 0)
+        {
+          // let WS know we're finished
+          this->transport_->wait_strategy ()->finished_request ();
+
+          (void) this->transport_->make_idle ();
+        }
+      return true;
+    }
 }
 
 bool
@@ -139,7 +155,12 @@ TAO_Exclusive_TMS::idle_after_reply (void)
   // return true. If *this* class is not successful in idling the
   // transport no one can.
   if (this->transport_ != 0)
+  {
+    // let WS know we're finished
+    this->transport_->wait_strategy ()->finished_request ();
+
     (void) this->transport_->make_idle ();
+  }
 
   return true;
 }
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index bae56ecbf68..35b83c76230 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -1012,7 +1012,7 @@ TAO_GIOP_Message_Base::process_request (
 
           output.message_attributes (request_id,
                                      0,
-                                     TAO_REPLY,
+                                     TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY),
                                      0);
 
           // Make the GIOP header and Reply header
@@ -1032,7 +1032,7 @@ TAO_GIOP_Message_Base::process_request (
 
           int const result = transport->send_message (output,
                                                       0,
-                                                      TAO_REPLY);
+                                                      TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY));
           if (result == -1)
             {
               if (TAO_debug_level > 0)
@@ -1285,7 +1285,7 @@ TAO_GIOP_Message_Base::make_send_locate_reply (TAO_Transport *transport,
   // Send the message
   int const result = transport->send_message (output,
                                               0,
-                                              TAO_REPLY);
+                                              TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY));
 
   // Print out message if there is an error
   if (result == -1)
@@ -1502,7 +1502,7 @@ TAO_GIOP_Message_Base::send_reply_exception (
 
   output.more_fragments (false);
 
-  return transport->send_message (output, 0, TAO_REPLY);
+  return transport->send_message (output, 0, TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY));
 }
 
 void
diff --git a/TAO/tao/IFR_Client/IFR_Client.mpc b/TAO/tao/IFR_Client/IFR_Client.mpc
index 1d50a825948..84c7d98cf6e 100644
--- a/TAO/tao/IFR_Client/IFR_Client.mpc
+++ b/TAO/tao/IFR_Client/IFR_Client.mpc
@@ -83,10 +83,6 @@ project(IFR_Client_skel) : ifr_client, taolib, tao_output, install, anytypecode,
   }
 
   Inline_Files {
-    IFR_BaseS.inl
-    IFR_BasicS.inl
-    IFR_ComponentsS.inl
-    IFR_ExtendedS.inl
   }
 
   specific {
diff --git a/TAO/tao/IIOP_Transport.h b/TAO/tao/IIOP_Transport.h
index a908ed36d87..b61559b0399 100644
--- a/TAO/tao/IIOP_Transport.h
+++ b/TAO/tao/IIOP_Transport.h
@@ -109,7 +109,7 @@ public:
 
   virtual int send_message (TAO_OutputCDR &stream,
                             TAO_Stub *stub = 0,
-                            TAO_Message_Semantics message_semantics = TAO_TWOWAY_REQUEST,
+                            TAO_Message_Semantics message_semantics = TAO_Message_Semantics (),
                             ACE_Time_Value *max_time_wait = 0);
 
   virtual int tear_listen_point_list (TAO_InputCDR &cdr);
diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp
index f0cd9e424de..010b938b876 100644
--- a/TAO/tao/ImR_Client/ImR_Client.cpp
+++ b/TAO/tao/ImR_Client/ImR_Client.cpp
@@ -121,13 +121,13 @@ namespace TAO
           ACE_CString serverId = poa->orb_core ().server_id ();
           ACE_CString name;
           if (serverId.empty ())
-          {
-            name = poa->name();
-          }
+            {
+              name = poa->name();
+            }
           else
-          {
-            name = serverId + ":" + poa->name();
-          }
+            {
+              name = serverId + ":" + poa->name();
+            }
 
           imr_locator->server_is_running (name.c_str (),
                                           partial_ior.c_str(),
@@ -216,7 +216,7 @@ namespace TAO
 
           root_poa->deactivate_object_i (id.in());
 
-          server_object_ = 0;
+          this->server_object_ = 0;
         }
     }
 
diff --git a/TAO/tao/ImR_Client/ImR_Client.mpc b/TAO/tao/ImR_Client/ImR_Client.mpc
index 6412aa51688..26d5027ea46 100644
--- a/TAO/tao/ImR_Client/ImR_Client.mpc
+++ b/TAO/tao/ImR_Client/ImR_Client.mpc
@@ -2,7 +2,7 @@
 project(*idl) : tao_versioning_idl_defaults, install {
   custom_only = 1
   IDL_Files {
-    idlflags += -Gp -Ssi -Gd -Sorb -GA \
+    idlflags += -Gp -Gd -Sorb -GA \
                 -Wb,export_macro=TAO_IMR_Client_Export \
                 -Wb,export_include=tao/ImR_Client/imr_client_export.h \
                 -iC tao/ImR_Client
@@ -11,7 +11,7 @@ project(*idl) : tao_versioning_idl_defaults, install {
   }
 
   IDL_Files {
-    idlflags += -Gp -Ssi -Gd -Sorb -GX \
+    idlflags += -Gp -Gd -Sorb -GX \
                 -Wb,export_macro=TAO_IMR_Client_Export \
                 -Wb,export_include=tao/ImR_Client/imr_client_export.h \
                 -iC tao/ImR_Client
diff --git a/TAO/tao/ImR_Client/ImplRepo.pidl b/TAO/tao/ImR_Client/ImplRepo.pidl
index 383d7dcef23..d713d44bbca 100644
--- a/TAO/tao/ImR_Client/ImplRepo.pidl
+++ b/TAO/tao/ImR_Client/ImplRepo.pidl
@@ -103,7 +103,7 @@ module ImplementationRepository
     */
   interface Administration
   {
-    /// Activate server that is named <server>.
+    /// Activate server that is named @a server.
     ///
     /// The <NotFound> exception is raised when <server> is not found
     /// in the Implementation Repository.  The <CannotActivate> exception
@@ -112,37 +112,37 @@ module ImplementationRepository
     void activate_server (in string server)
       raises (NotFound, CannotActivate);
 
-    /// Add/Update the the <server>
+    /// Add/Update the the @a server.
     /// The <NotFound> exception is raised when the activator specified
     /// in the options is not registered.
     void add_or_update_server (in string server, in StartupOptions options)
       raises(NotFound);
 
-    /// Remove <server> from the Implementation Repository.
+    /// Remove @a server from the Implementation Repository.
     ///
-    /// The <NotFound> exception is raised when <server> is not found
+    /// The <NotFound> exception is raised when @a server is not found
     /// in the Implementation Repository.
     void remove_server (in string server)
       raises (NotFound);
 
     /// Tries to shutdown the server, first gracefully, then ungracefully.
     ///
-    /// The <NotFound> exception is raised when <server> is not found
+    /// The <NotFound> exception is raised when @a server is not found
     /// in the Implementation Repository.
     void shutdown_server (in string server)
       raises (NotFound);
 
-    /// Used to notify the Implementation Repository that <server> is alive
-    /// and well at <partial_ior>.
+    /// Used to notify the Implementation Repository that @a server is alive
+    /// and well at @a partial_ior.
     ///
-    /// The <NotFound> exception is raised when <server> is not found
+    /// The <NotFound> exception is raised when @a server is not found
     /// in the Implementation Repository.
     void server_is_running (in string server,
                             in string partial_ior,
                             in ServerObject server_object)
       raises (NotFound);
 
-    /// Used to tell the Implementation Repository that <server> is shutting
+    /// Used to tell the Implementation Repository that @a server is shutting
     /// down.
     ///
     /// The <NotFound> exception is raised when <server> is not found
@@ -151,14 +151,14 @@ module ImplementationRepository
     void server_is_shutting_down (in string server)
       raises (NotFound);
 
-    /// Returns the startup information for a given <server>.
+    /// Returns the startup information for a given @a server.
     void find (in string server, out ServerInformation info);
 
-    /// Returns at most <how_many> servers in <server_list>.  If there
+    /// Returns at most @a how_many servers in @a server_list.  If there
     /// are additional servers, they can be received through the
-    /// <server_iterator>.  If there are no more servers, then
-    /// <server_iterator> is null.
-    /// If how_many == 0, then returns all servers.
+    /// @a server_iterator.  If there are no more servers, then
+    /// @a server_iterator is null.
+    /// If @a how_many == 0, then returns all servers.
     void list (in unsigned long how_many,
                out ServerInformationList server_list,
                out ServerInformationIterator server_iterator);
diff --git a/TAO/tao/LocateRequest_Invocation.cpp b/TAO/tao/LocateRequest_Invocation.cpp
index b5e08d87471..db8f26c7910 100644
--- a/TAO/tao/LocateRequest_Invocation.cpp
+++ b/TAO/tao/LocateRequest_Invocation.cpp
@@ -117,7 +117,7 @@ namespace TAO
 
       countdown.update ();
 
-      s = this->send_message (cdr, TAO_TWOWAY_REQUEST, max_wait_time);
+      s = this->send_message (cdr, TAO_Message_Semantics (), max_wait_time);
     }
 
     if (s != TAO_INVOKE_SUCCESS)
diff --git a/TAO/tao/Message_Semantics.h b/TAO/tao/Message_Semantics.h
index 1a838a2966c..59abacfd2d1 100644
--- a/TAO/tao/Message_Semantics.h
+++ b/TAO/tao/Message_Semantics.h
@@ -23,11 +23,33 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-enum TAO_Message_Semantics
+struct TAO_Message_Semantics
   {
-    TAO_ONEWAY_REQUEST = 0,
-    TAO_TWOWAY_REQUEST = 1,
-    TAO_REPLY
+    enum Type
+      {
+        TAO_ONEWAY_REQUEST = 0,
+        TAO_TWOWAY_REQUEST = 1,
+        TAO_REPLY
+      };
+
+    enum Mode
+      {
+        TAO_SYNCH_MODE,
+        TAO_ASYNCH_CALLBACK,
+        TAO_ASYNCH_POLL
+      };
+
+    TAO_Message_Semantics ()
+      : type_ (TAO_TWOWAY_REQUEST), mode_ (TAO_SYNCH_MODE) {}
+    TAO_Message_Semantics (Type type)
+      : type_ (type), mode_ (TAO_SYNCH_MODE) {}
+    TAO_Message_Semantics (Type type, Mode mode)
+      : type_ (type), mode_ (mode) {}
+    TAO_Message_Semantics (const TAO_Message_Semantics& ms)
+      : type_ (ms.type_), mode_ (ms.mode_) {}
+
+    Type type_;
+    Mode mode_;
   };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/AMH_Response_Handler.cpp b/TAO/tao/Messaging/AMH_Response_Handler.cpp
index 65e1103bcde..76d617628e5 100644
--- a/TAO/tao/Messaging/AMH_Response_Handler.cpp
+++ b/TAO/tao/Messaging/AMH_Response_Handler.cpp
@@ -147,7 +147,7 @@ TAO_AMH_Response_Handler::_tao_rh_send_reply (void)
   // Send the message.
   int result = this->transport_->send_message (this->_tao_out,
                                                0,
-                                               TAO_REPLY);
+                                               TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY));
 
   if (result == -1)
     {
@@ -212,7 +212,7 @@ TAO_AMH_Response_Handler::_tao_rh_send_exception (const CORBA::Exception &ex)
   // Send the Exception
   if (this->transport_->send_message (this->_tao_out,
                                       0,
-                                      TAO_REPLY) == -1)
+                                      TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY)) == -1)
     {
       if (TAO_debug_level > 0)
         ACE_ERROR ((LM_ERROR,
@@ -278,7 +278,7 @@ TAO_AMH_Response_Handler::_tao_rh_send_location_forward (CORBA::Object_ptr fwd,
   // Send the Exception
   if (this->transport_->send_message (this->_tao_out,
                                       0,
-                                      TAO_REPLY) == -1)
+                                      TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY)) == -1)
     {
       if (TAO_debug_level > 0)
         ACE_ERROR ((LM_ERROR,
diff --git a/TAO/tao/Messaging/AMH_Response_Handler.h b/TAO/tao/Messaging/AMH_Response_Handler.h
index 416ab8f0962..df4fd4b836c 100644
--- a/TAO/tao/Messaging/AMH_Response_Handler.h
+++ b/TAO/tao/Messaging/AMH_Response_Handler.h
@@ -57,7 +57,7 @@ typedef ACE_Allocator TAO_AMH_BUFFER_ALLOCATOR;
  *
  * One RH is created for every client request and the RH can be used
  * only once i.e.,  the asynchronous method can be called only once.
- * This class also encapsulates various initialisation and
+ * This class also encapsulates various initialization and
  * response-sending functionality that is common to all RHs (generated
  * by the IDL compiler). Thus the IDL-compiler has to generate less
  * code which in turn reduces the overall code size for an
diff --git a/TAO/tao/Messaging/AMH_Skeletons.cpp b/TAO/tao/Messaging/AMH_Skeletons.cpp
new file mode 100644
index 00000000000..3afeb52af8a
--- /dev/null
+++ b/TAO/tao/Messaging/AMH_Skeletons.cpp
@@ -0,0 +1,269 @@
+// -*- C++ -*-
+// $Id$
+
+#include "tao/Messaging/AMH_Skeletons.h"
+
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/DynamicC.h"
+
+#include "tao/PortableServer/Servant_Base.h"
+#include "tao/PortableServer/SArg_Traits_T.h"
+#include "tao/PortableServer/Basic_SArguments.h"
+#include "tao/PortableServer/Special_Basic_SArguments.h"
+#include "tao/PortableServer/Fixed_Size_SArgument_T.h"
+#include "tao/PortableServer/Var_Size_SArgument_T.h"
+#include "tao/PortableServer/Object_SArg_Traits.h"
+#include "tao/PortableServer/UB_String_SArguments.h"
+#include "tao/PortableServer/get_arg.h"
+#include "tao/Object.h"
+
+#include "tao/PortableInterceptor.h"
+#include "tao/PortableServer/SUpcall_commands.h"
+#include "tao/ORB_Core.h"
+
+#include "tao/TAO_Server_Request.h"
+
+void
+_is_a_amh_Upcall_Command::execute (void)
+{
+  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
+    TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
+      this->operation_details_,
+      this->args_);
+
+  TAO::SArg_Traits< char *>::in_arg_type arg_1 =
+    TAO::Portable_Server::get_in_arg< char *> (
+      this->operation_details_,
+      this->args_,
+      1);
+
+  retval =
+    this->servant_-> _is_a (
+      arg_1);
+}
+
+void
+TAO_AMH_Skeletons::_is_a_amh_skel (TAO_ServerRequest & server_request,
+                                  TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall),
+                                  TAO_ServantBase *servant)
+{
+#if TAO_HAS_INTERCEPTORS == 1
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+
+  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
+  TAO::SArg_Traits< char *>::in_arg_val _tao_repository_id;
+
+  TAO::Argument * const args[] =
+    {
+      &retval,
+      &_tao_repository_id
+    };
+
+  static size_t const nargs = 2;
+
+  _is_a_amh_Upcall_Command command (
+    servant,
+    server_request.operation_details (),
+    args);
+
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         );
+  server_request.tao_send_reply ();
+}
+
+
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+void
+_non_existent_amh_Upcall_Command::execute (void)
+{
+  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
+    TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
+      this->operation_details_,
+      this->args_);
+
+  retval =
+    this->servant_-> _non_existent ();
+}
+
+void TAO_AMH_Skeletons::_non_existent_amh_skel (TAO_ServerRequest & server_request,
+                                                TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall),
+                                                TAO_ServantBase *servant)
+{
+#if TAO_HAS_INTERCEPTORS == 1
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+
+  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
+
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+
+  static size_t const nargs = 1;
+
+  _non_existent_amh_Upcall_Command command (
+    servant,
+    server_request.operation_details (),
+    args);
+
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         );
+  server_request.tao_send_reply ();
+}
+
+
+# if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+void
+TAO_AMH_Skeletons::_interface_amh_skel (TAO_ServerRequest & server_request,
+                                        TAO::Portable_Server::Servant_Upcall* /* servant_upcall */,
+                                        TAO_ServantBase *servant)
+{
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ());
+
+  if (!_tao_adapter)
+    {
+      throw ::CORBA::INTF_REPOS (::CORBA::OMGVMCID | 1, ::CORBA::COMPLETED_NO);
+    }
+
+  ::CORBA::InterfaceDef_ptr _tao_retval = servant->_get_interface ();
+  server_request.init_reply ();
+  TAO_OutputCDR &_tao_out = *server_request.outgoing ();
+
+  ::CORBA::Boolean const _tao_result =
+    _tao_adapter->interfacedef_cdr_insert (_tao_out, _tao_retval);
+
+  _tao_adapter->dispose (_tao_retval);
+
+  if (!_tao_result)
+    {
+      throw ::CORBA::MARSHAL ();
+    }
+}
+
+void
+_get_component_amh_Upcall_Command::execute (void)
+{
+  TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
+    TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
+      this->operation_details_,
+      this->args_);
+
+  retval =
+    this->servant_-> _get_component ();
+}
+
+void
+TAO_AMH_Skeletons::_component_amh_skel (TAO_ServerRequest & server_request,
+                                        TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall),
+                                        TAO_ServantBase *servant)
+{
+#if TAO_HAS_INTERCEPTORS == 1
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+
+  TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
+
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+
+  static size_t const nargs = 1;
+
+  _get_component_amh_Upcall_Command command (
+    servant,
+    server_request.operation_details (),
+    args);
+
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         );
+}
+# endif /* !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */
+
+
+void
+_repository_id_amh_Upcall_Command::execute (void)
+{
+  TAO::SArg_Traits< char *>::ret_arg_type retval =
+    TAO::Portable_Server::get_ret_arg< char *> (
+      this->operation_details_,
+      this->args_);
+
+  retval =
+    this->servant_-> _repository_id ();
+}
+
+void
+TAO_AMH_Skeletons::_repository_id_amh_skel (TAO_ServerRequest & server_request,
+                                            TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall),
+                                            TAO_ServantBase *servant)
+{
+#if TAO_HAS_INTERCEPTORS == 1
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+
+  TAO::SArg_Traits< char *>::ret_val retval;
+
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+
+  static size_t const nargs = 1;
+
+  _repository_id_amh_Upcall_Command command (
+    servant,
+    server_request.operation_details (),
+    args);
+
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                 );
+  server_request.tao_send_reply ();
+}
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
+
diff --git a/TAO/tao/Messaging/AMH_Skeletons.h b/TAO/tao/Messaging/AMH_Skeletons.h
new file mode 100644
index 00000000000..05bdba0fc7f
--- /dev/null
+++ b/TAO/tao/Messaging/AMH_Skeletons.h
@@ -0,0 +1,199 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    AMH_Skeletons.h
+ *
+ *  $Id$
+ *
+ *  @author  Marcel Smit <msmit@remedy.nl>
+ *
+ *  @brief Upcall command exection classes for static AMH skeleton methods
+ *
+ * This file contains the classes needed to perform an upcall command for
+ * the following static AMH methods.
+ * - _is_a_skel
+ * - _non_existent_skel
+ * - _component_skel
+ * - _repository_id_skel
+ * - _interface_skel
+ * These are the same methods as in PortableServer but placed here since
+ * these methods do contain an invocation to tao_send_reply.
+ * Since we don't want to bother the regular core with AMH stuff,
+ * we put these methods and classes here.
+ *
+ */
+//=============================================================================
+
+#ifndef AMH_SKELETONS_H
+#define AMH_SKELETONS_H
+
+#include /**/ "ace/pre.h"
+
+#include "tao/PortableServer/Upcall_Command.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/Messaging/messaging_export.h"
+
+#include "tao/PortableServer/Upcall_Wrapper.h"
+#include "tao/operation_details.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+class TAO_ServerRequest;
+class TAO_ServantBase;
+
+/**
+ * @class _is_a_amh_Upcall_Command
+ *
+ * @brief Execution class for _is_a_skel.
+ *
+ *
+ */
+class _is_a_amh_Upcall_Command
+  : public TAO::Upcall_Command
+{
+public:
+  inline _is_a_amh_Upcall_Command (
+    TAO_ServantBase * servant,
+    TAO_Operation_Details const * operation_details,
+    TAO::Argument * const args[])
+    : servant_ (servant)
+    , operation_details_ (operation_details)
+    , args_ (args)
+  {}
+
+  virtual void execute (void);
+
+private:
+  TAO_ServantBase * const servant_;
+  TAO_Operation_Details const * const operation_details_;
+  TAO::Argument * const * const args_;
+};
+
+/**
+ * @class _non_existent_amh_Upcall_Command
+ *
+ * @brief Execution class for _non_existent_skel.
+ *
+ *
+ */
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+class _non_existent_amh_Upcall_Command
+  : public TAO::Upcall_Command
+{
+public:
+  inline _non_existent_amh_Upcall_Command (
+    TAO_ServantBase * servant,
+    TAO_Operation_Details const * operation_details,
+    TAO::Argument * const args[])
+    : servant_ (servant)
+    , operation_details_ (operation_details)
+    , args_ (args)
+  {
+  }
+
+  virtual void execute (void);
+private:
+  TAO_ServantBase * const servant_;
+  TAO_Operation_Details const * const operation_details_;
+  TAO::Argument * const * const args_;
+};
+
+# if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+/**
+ * @class _get_component_amh_Upcall_Command
+ *
+ * @brief Execution class for _component_skel.
+ *
+ *
+ */
+class _get_component_amh_Upcall_Command
+  : public TAO::Upcall_Command
+{
+public:
+  inline _get_component_amh_Upcall_Command (
+    TAO_ServantBase * servant,
+    TAO_Operation_Details const * operation_details,
+    TAO::Argument * const args[])
+    : servant_ (servant)
+    , operation_details_ (operation_details)
+    , args_ (args)
+  {
+  }
+
+  virtual void execute (void);
+
+private:
+  TAO_ServantBase * const servant_;
+  TAO_Operation_Details const * const operation_details_;
+  TAO::Argument * const * const args_;
+};
+# endif /* !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */
+
+/**
+ * @class _repository_id_amh_Upcall_Command
+ *
+ * @brief Execution class for _repository_id_skel
+ *
+ *
+ */
+class _repository_id_amh_Upcall_Command
+  : public TAO::Upcall_Command
+{
+public:
+  inline _repository_id_amh_Upcall_Command (
+    TAO_ServantBase * servant,
+    TAO_Operation_Details const * operation_details,
+    TAO::Argument * const args[])
+    : servant_ (servant)
+    , operation_details_ (operation_details)
+    , args_ (args)
+  {
+  }
+
+  virtual void execute (void);
+
+private:
+  TAO_ServantBase * const servant_;
+  TAO_Operation_Details const * const operation_details_;
+  TAO::Argument * const * const args_;
+};
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
+
+class TAO_Messaging_Export TAO_AMH_Skeletons
+{
+public:
+  static void _is_a_amh_skel (TAO_ServerRequest & server_request,
+                              TAO::Portable_Server::Servant_Upcall* servant_upcall,
+                              TAO_ServantBase *servant);
+
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+  static void _non_existent_amh_skel (TAO_ServerRequest & server_request,
+                                      TAO::Portable_Server::Servant_Upcall* servant_upcall,
+                                      TAO_ServantBase *servant);
+
+# if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+  static void _interface_amh_skel (TAO_ServerRequest & server_request,
+                                  TAO::Portable_Server::Servant_Upcall* servant_upcall,
+                                  TAO_ServantBase *servant);
+
+  static void _component_amh_skel (TAO_ServerRequest & server_request,
+                                   TAO::Portable_Server::Servant_Upcall* servant_upcall,
+                                   TAO_ServantBase *servant);
+# endif /* !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */
+  static void _repository_id_amh_skel (TAO_ServerRequest & server_request,
+                                      TAO::Portable_Server::Servant_Upcall* servant_upcall,
+                                      TAO_ServantBase *servant);
+#endif /* TAO_HAS_MINIMUM_CORBA */
+};
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#include /**/ "ace/post.h"
+
+#endif /* AMH_SKELETONS_H */
diff --git a/TAO/tao/Messaging/Asynch_Invocation.cpp b/TAO/tao/Messaging/Asynch_Invocation.cpp
index 642d4a4f10c..db7a892ab72 100644
--- a/TAO/tao/Messaging/Asynch_Invocation.cpp
+++ b/TAO/tao/Messaging/Asynch_Invocation.cpp
@@ -72,7 +72,8 @@ namespace TAO
         // call.
         cdr.message_attributes (this->details_.request_id (),
                                 this->resolver_.stub (),
-                                TAO_ONEWAY_REQUEST,
+                                TAO_Message_Semantics (TAO_Message_Semantics::TAO_ONEWAY_REQUEST,
+                                                       TAO_Message_Semantics::TAO_ASYNCH_CALLBACK),
                                 max_wait_time);
 
         this->write_header (cdr);
@@ -107,7 +108,8 @@ namespace TAO
         // paraphernalia within the ORB to fire, like buffering if
         // send blocks etc.
         s = this->send_message (cdr,
-                                TAO_ONEWAY_REQUEST,
+                                TAO_Message_Semantics (TAO_Message_Semantics::TAO_ONEWAY_REQUEST,
+                                                       TAO_Message_Semantics::TAO_ASYNCH_CALLBACK),
                                 max_wait_time);
 
         ace_mon.release();
@@ -138,10 +140,12 @@ namespace TAO
         if (s != TAO_INVOKE_SUCCESS)
           return s;
 
-        // NOTE: Not sure how things are handles with exclusive muxed
-        // strategy.
-        if (transport->idle_after_send ())
-          (void) this->resolver_.transport_released ();
+        // transport strategy takes care of idling transport or not
+        transport->idle_after_send ();
+        // release transport from resolver in any case since we don't
+        // want the resolver to make the transport idle if the strategy
+        // told it not to
+        this->resolver_.transport_released ();
 
 #if TAO_HAS_INTERCEPTORS == 1
       }
diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
index 90a1c4223a7..1f1c099cb99 100644
--- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
+++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
@@ -6,6 +6,7 @@
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
 #include "tao/Transport.h"
+#include "tao/Transport_Mux_Strategy.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -42,6 +43,13 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply (TAO_Pluggable_Reply_Params &params)
       // AMI Timeout Handling End
     }
 
+  // With Asynch requests the invocation handler can't call idle_after_reply ()
+  // since it does not handle the reply.
+  // So we have to do that here in case f.i. the Exclusive TMS left the transport
+  // busy after the send
+  if (this->transport_ != 0)
+    this->transport_->tms ()->idle_after_reply ();
+
   if (!params.input_cdr_)
     return -1;
 
@@ -67,7 +75,7 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply (TAO_Pluggable_Reply_Params &params)
     }
 
   // See whether we need to delete the data block by checking the
-  // flags. We cannot be happy that we initally allocated the
+  // flags. We cannot be happy that we initially allocated the
   // datablocks of the stack. If this method is called twice, as is in
   // some cases where the same invocation object is used to make two
   // invocations like forwarding, the release becomes essential.
@@ -203,6 +211,13 @@ TAO_Asynch_Reply_Dispatcher::reply_timed_out (void)
           this->timeout_handler_ = 0;
         }
 
+      // With Asynch requests the invocation handler can't call idle_after_reply ()
+      // since it does not handle the reply.
+      // So we have to do that here in case f.i. the Exclusive TMS left the transport
+      // busy after the send
+      if (this->transport_ != 0)
+        this->transport_->tms ()->idle_after_reply ();
+
       // This is okay here... Everything relies on our refcount being
       // held by the timeout handler, whose refcount in turn is held
       // by the reactor.
diff --git a/TAO/tao/Messaging/Messaging.mpc b/TAO/tao/Messaging/Messaging.mpc
index 557d5dc7327..06d2cc6ddc2 100644
--- a/TAO/tao/Messaging/Messaging.mpc
+++ b/TAO/tao/Messaging/Messaging.mpc
@@ -51,7 +51,7 @@ project(*idl) : tao_versioning_idl_defaults, install {
   }
 
   IDL_Files {
-    idlflags += -Ssi -GA -Gp -Gd -Sorb -Sal \
+    idlflags += -GA -Gp -Gd -Sorb -Sal \
                 -Wb,export_macro=TAO_Messaging_Export \
                 -Wb,export_include=tao/Messaging/messaging_export.h \
                 -Wb,include_guard=TAO_MESSAGING_SAFE_INCLUDE \
diff --git a/TAO/tao/Monitor/Monitor.mpc b/TAO/tao/Monitor/Monitor.mpc
index c4e7f7c083d..7b8f3cb270d 100644
--- a/TAO/tao/Monitor/Monitor.mpc
+++ b/TAO/tao/Monitor/Monitor.mpc
@@ -12,7 +12,7 @@ project (*idl): tao_versioning_idl_defaults, install {
 
   IDL_Files {
    idlflags += -Wb,include_guard=TAO_MONITOR_SAFE_INCLUDE \
-     -Wb,safe_include=tao/Monitor/Monitor.h -Ssi
+     -Wb,safe_include=tao/Monitor/Monitor.h
     Monitor.pidl
   }
 
diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
index e4782a7d1ec..59bfa480e95 100644
--- a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
+++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
@@ -27,7 +27,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point (
   TAO_ServerRequest &server_request,
   TAO::Argument * const args[],
   size_t nargs,
-  void * servant_upcall,
+  TAO::Portable_Server::Servant_Upcall *servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
   CORBA::ULong nexceptions,
   CORBA::OctetSeq_out oc)
@@ -94,7 +94,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
   TAO_ServerRequest &server_request,
   TAO::Argument * const args[],
   size_t nargs,
-  void * servant_upcall,
+  TAO::Portable_Server::Servant_Upcall *servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
   CORBA::ULong nexceptions)
 {
@@ -167,7 +167,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
   TAO_ServerRequest &server_request,
   TAO::Argument * const args[],
   size_t nargs,
-  void * servant_upcall,
+  TAO::Portable_Server::Servant_Upcall *servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
   CORBA::ULong nexceptions)
 {
@@ -229,7 +229,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request (
   TAO_ServerRequest &server_request,
   TAO::Argument * const args[],
   size_t nargs,
-  void * servant_upcall,
+  TAO::Portable_Server::Servant_Upcall *servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
   CORBA::ULong nexceptions
   )
@@ -297,7 +297,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_reply (
   TAO_ServerRequest &server_request,
   TAO::Argument * const args[],
   size_t nargs,
-  void * servant_upcall,
+  TAO::Portable_Server::Servant_Upcall *servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
   CORBA::ULong nexceptions)
 {
@@ -347,14 +347,13 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception (
   TAO_ServerRequest &server_request,
   TAO::Argument * const args[],
   size_t nargs,
-  void * servant_upcall,
+  TAO::Portable_Server::Servant_Upcall *servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
   CORBA::ULong nexceptions)
 {
   // This is an "ending" server side interception point so we only
   // process the interceptors pushed on to the flow stack.
-
-  bool is_remote_request = !server_request.collocated ();
+  bool const is_remote_request = !server_request.collocated ();
 
   // Notice that the interceptors are processed in the opposite order
   // they were pushed onto the stack since this is an "ending" server
@@ -439,14 +438,13 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other (
   TAO_ServerRequest &server_request,
   TAO::Argument * const args[],
   size_t nargs,
-  void * servant_upcall,
+  TAO::Portable_Server::Servant_Upcall *servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
   CORBA::ULong nexceptions)
 {
   // This is an "ending" server side interception point so we only
   // process the interceptors pushed on to the flow stack.
-
-  bool is_remote_request = !server_request.collocated ();
+  bool const is_remote_request = !server_request.collocated ();
 
   TAO::ServerRequestInfo request_info (server_request,
                                        args,
diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.h b/TAO/tao/PI_Server/ServerInterceptorAdapter.h
index ad9893d4ba5..f13ad01b93e 100644
--- a/TAO/tao/PI_Server/ServerInterceptorAdapter.h
+++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.h
@@ -87,7 +87,7 @@ namespace TAO
         TAO_ServerRequest &server_request,
         TAO::Argument * const args[],
         size_t nargs,
-        void * servant_upcall,
+        TAO::Portable_Server::Servant_Upcall *servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
         CORBA::ULong nexceptions,
         CORBA::OctetSeq_out oc);
@@ -104,7 +104,7 @@ namespace TAO
         TAO_ServerRequest &server_request,
         TAO::Argument * const args[],
         size_t nargs,
-        void * servant_upcall,
+        TAO::Portable_Server::Servant_Upcall *servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
         CORBA::ULong nexceptions);
 
@@ -113,7 +113,7 @@ namespace TAO
         TAO_ServerRequest &server_request,
         TAO::Argument * const args[],
         size_t nargs,
-        void * servant_upcall,
+        TAO::Portable_Server::Servant_Upcall *servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
         CORBA::ULong nexceptions);
 
@@ -123,7 +123,7 @@ namespace TAO
         TAO_ServerRequest &server_request,
         TAO::Argument * const args[],
         size_t nargs,
-        void * servant_upcall,
+        TAO::Portable_Server::Servant_Upcall *servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
         CORBA::ULong nexceptions);
 
@@ -133,7 +133,7 @@ namespace TAO
         TAO_ServerRequest &server_request,
         TAO::Argument * const args[],
         size_t nargs,
-        void * servant_upcall,
+        TAO::Portable_Server::Servant_Upcall *servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
         CORBA::ULong nexceptions);
 
@@ -143,15 +143,14 @@ namespace TAO
         TAO_ServerRequest &server_request,
         TAO::Argument * const args[],
         size_t nargs,
-        void * servant_upcall,
+        TAO::Portable_Server::Servant_Upcall *servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
         CORBA::ULong nexceptions);
     //@}
 
     /// Register an interceptor.
     virtual void add_interceptor (
-      PortableInterceptor::ServerRequestInterceptor_ptr interceptor
-     );
+      PortableInterceptor::ServerRequestInterceptor_ptr interceptor);
 
     virtual void add_interceptor (
       PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.h b/TAO/tao/PI_Server/ServerRequestInfo.h
index 5087b5efccc..1806a0e4237 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.h
+++ b/TAO/tao/PI_Server/ServerRequestInfo.h
@@ -77,7 +77,7 @@ namespace TAO
     ServerRequestInfo (TAO_ServerRequest & server_request,
                        TAO::Argument * const * args,
                        size_t nargs,
-                       void * servant_upcall,
+                       TAO::Portable_Server::Servant_Upcall *servant_upcall,
                        CORBA::TypeCode_ptr const * exceptions,
                        CORBA::ULong nexceptions);
 
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.inl b/TAO/tao/PI_Server/ServerRequestInfo.inl
index 981df1cbdff..dff439df6ca 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.inl
+++ b/TAO/tao/PI_Server/ServerRequestInfo.inl
@@ -12,14 +12,13 @@ TAO::ServerRequestInfo::ServerRequestInfo (
   TAO_ServerRequest & server_request,
   TAO::Argument * const * args,
   size_t nargs,
-  void * servant_upcall,
+  TAO::Portable_Server::Servant_Upcall *servant_upcall,
   CORBA::TypeCode_ptr const * exceptions,
   CORBA::ULong nexceptions)
   : server_request_ (server_request)
   , args_ (args)
   , nargs_ (nargs)
-  , servant_upcall_ (
-      static_cast<TAO::Portable_Server::Servant_Upcall *> (servant_upcall))
+  , servant_upcall_ (servant_upcall)
   , exceptions_ (exceptions)
   , nexceptions_ (nexceptions)
 {
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
deleted file mode 100644
index 58b400fc979..00000000000
--- a/TAO/tao/PolicyC.cpp
+++ /dev/null
@@ -1,683 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "tao/PolicyC.h"
-#include "tao/CDR.h"
-#include "tao/SystemException.h"
-#include "tao/Invocation_Adapter.h"
-#include "tao/Object_T.h"
-#include "tao/Basic_Arguments.h"
-#include "ace/OS_NS_string.h"
-#include "tao/AnyTypeCode_Adapter.h"
-#include "ace/Dynamic_Service.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/PolicyC.inl"
-#endif /* !defined INLINE */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:70
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// TAO specific stuff.
-namespace CORBA
-{
-  class Policy;
-  typedef Policy *Policy_ptr;
-  typedef TAO_Objref_Var_T<Policy> Policy_var;
-  typedef TAO_Objref_Out_T<Policy> Policy_out;
-}
-
-namespace TAO
-{
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/exception_cs.cpp:63
-
-CORBA::PolicyError::PolicyError (void)
-  : CORBA::UserException (
-        "IDL:omg.org/CORBA/PolicyError:1.0",
-        "PolicyError"
-      )
-{
-}
-
-CORBA::PolicyError::~PolicyError (void)
-{
-}
-
-CORBA::PolicyError::PolicyError (const ::CORBA::PolicyError &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-  this->reason = _tao_excp.reason;
-}
-
-CORBA::PolicyError&
-CORBA::PolicyError::operator= (const ::CORBA::PolicyError &_tao_excp)
-{
-  this->::CORBA::UserException::operator= (_tao_excp);
-  this->reason = _tao_excp.reason;
-  return *this;
-}
-
-void CORBA::PolicyError::_tao_any_destructor (void *_tao_void_pointer)
-{
-  PolicyError *_tao_tmp_pointer =
-    static_cast<PolicyError *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-CORBA::PolicyError *
-CORBA::PolicyError::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<PolicyError *> (_tao_excp);
-}
-
-const CORBA::PolicyError *
-CORBA::PolicyError::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const PolicyError *> (_tao_excp);
-}
-
-CORBA::Exception *CORBA::PolicyError::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::CORBA::PolicyError, 0);
-  return retval;
-}
-
-CORBA::Exception *
-CORBA::PolicyError::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::CORBA::PolicyError (*this),
-      0
-    );
-  return result;
-}
-
-void CORBA::PolicyError::_raise (void) const
-{
-  throw *this;
-}
-
-void CORBA::PolicyError::_tao_encode (
-    TAO_OutputCDR &cdr
-
-  ) const
-{
-  if (cdr << *this)
-    {
-      return;
-    }
-
-  throw ::CORBA::MARSHAL ();
-}
-
-void CORBA::PolicyError::_tao_decode (
-    TAO_InputCDR &cdr
-
-  )
-{
-  if (cdr >> *this)
-    {
-      return;
-    }
-
-  throw ::CORBA::MARSHAL ();
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/exception_ctor.cpp:66
-
-CORBA::PolicyError::PolicyError (
-    CORBA::PolicyErrorCode _tao_reason
-  )
-  : CORBA::UserException (
-        "IDL:omg.org/CORBA/PolicyError:1.0",
-        "PolicyError"
-      )
-{
-  this->reason = _tao_reason;
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr CORBA::PolicyError::_tao_type (void) const
-{
-  TAO_AnyTypeCode_Adapter *adapter =
-    ACE_Dynamic_Service<TAO_AnyTypeCode_Adapter>::instance (
-        "AnyTypeCode_Adapter"
-      );
-  if (adapter != 0)
-    return adapter->_tao_type_PolicyError ();
-  else
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("(%P|%t) %p\n"),
-                  ACE_TEXT ("Unable to find the ")
-                  ACE_TEXT ("AnyTypeCode Adapter instance")));
-      return 0;
-    }
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/exception_cs.cpp:63
-
-CORBA::InvalidPolicies::InvalidPolicies (void)
-  : CORBA::UserException (
-        "IDL:omg.org/CORBA/InvalidPolicies:1.0",
-        "InvalidPolicies"
-      )
-{
-}
-
-CORBA::InvalidPolicies::~InvalidPolicies (void)
-{
-}
-
-CORBA::InvalidPolicies::InvalidPolicies (const ::CORBA::InvalidPolicies &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-  this->indices = _tao_excp.indices;
-}
-
-CORBA::InvalidPolicies&
-CORBA::InvalidPolicies::operator= (const ::CORBA::InvalidPolicies &_tao_excp)
-{
-  this->::CORBA::UserException::operator= (_tao_excp);
-  this->indices = _tao_excp.indices;
-  return *this;
-}
-
-void CORBA::InvalidPolicies::_tao_any_destructor (void *_tao_void_pointer)
-{
-  InvalidPolicies *_tao_tmp_pointer =
-    static_cast<InvalidPolicies *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-CORBA::InvalidPolicies *
-CORBA::InvalidPolicies::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<InvalidPolicies *> (_tao_excp);
-}
-
-const CORBA::InvalidPolicies *
-CORBA::InvalidPolicies::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const InvalidPolicies *> (_tao_excp);
-}
-
-CORBA::Exception *CORBA::InvalidPolicies::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::CORBA::InvalidPolicies, 0);
-  return retval;
-}
-
-CORBA::Exception *
-CORBA::InvalidPolicies::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::CORBA::InvalidPolicies (*this),
-      0
-    );
-  return result;
-}
-
-void CORBA::InvalidPolicies::_raise (void) const
-{
-  throw *this;
-}
-
-void CORBA::InvalidPolicies::_tao_encode (TAO_OutputCDR &cdr) const
-{
-  if (cdr << *this)
-    {
-      return;
-    }
-
-  throw ::CORBA::MARSHAL ();
-}
-
-void CORBA::InvalidPolicies::_tao_decode (TAO_InputCDR &cdr)
-{
-  if (cdr >> *this)
-    {
-      return;
-    }
-
-  throw ::CORBA::MARSHAL ();
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/exception_ctor.cpp:66
-
-CORBA::InvalidPolicies::InvalidPolicies (
-    const CORBA::UShortSeq & _tao_indices
-  )
-  : CORBA::UserException (
-        "IDL:omg.org/CORBA/InvalidPolicies:1.0",
-        "InvalidPolicies"
-      )
-{
-  this->indices = _tao_indices;
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr CORBA::InvalidPolicies::_tao_type (void) const
-{
-  TAO_AnyTypeCode_Adapter *adapter =
-    ACE_Dynamic_Service<TAO_AnyTypeCode_Adapter>::instance (
-        "AnyTypeCode_Adapter"
-      );
-  if (adapter != 0)
-    return adapter->_tao_type_InvalidPolicies ();
-  else
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("(%P|%t) %p\n"),
-                  ACE_TEXT ("Unable to find the ")
-                  ACE_TEXT ("AnyTypeCode Adapter instance")));
-      return 0;
-    }
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CORBA::Policy.
-
-CORBA::Policy_ptr
-TAO::Objref_Traits<CORBA::Policy>::duplicate (
-    CORBA::Policy_ptr p
-  )
-{
-  return CORBA::Policy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CORBA::Policy>::release (
-    CORBA::Policy_ptr p
-  )
-{
-  ::CORBA::release (p);
-}
-
-CORBA::Policy_ptr
-TAO::Objref_Traits<CORBA::Policy>::nil (void)
-{
-  return CORBA::Policy::_nil ();
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<CORBA::Policy>::marshal (
-    const CORBA::Policy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-CORBA::PolicyType CORBA::Policy::policy_type (
-
-  )
-{
-  if (!this->is_evaluated ())
-    {
-      ::CORBA::Object::tao_object_initialize (this);
-    }
-
-  TAO::Arg_Traits< ::CORBA::PolicyType>::ret_val _tao_retval;
-
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "_get_policy_type",
-      16,
-      TAO::TAO_CO_NONE | TAO::TAO_CO_DIRECT_STRATEGY | TAO::TAO_CO_THRU_POA_STRATEGY
-    );
-
-  _tao_call.invoke (0, 0);
-
-  return _tao_retval.retn ();
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-::CORBA::Policy_ptr CORBA::Policy::copy (
-
-  )
-{
-  if (!this->is_evaluated ())
-    {
-      ::CORBA::Object::tao_object_initialize (this);
-    }
-
-  TAO::Arg_Traits< ::CORBA::Policy>::ret_val _tao_retval;
-
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "copy",
-      4,
-      TAO::TAO_CO_NONE | TAO::TAO_CO_DIRECT_STRATEGY | TAO::TAO_CO_THRU_POA_STRATEGY
-    );
-
-  _tao_call.invoke (0, 0);
-
-  return _tao_retval.retn ();
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-void CORBA::Policy::destroy (
-
-  )
-{
-  if (!this->is_evaluated ())
-    {
-      ::CORBA::Object::tao_object_initialize (this);
-    }
-
-  TAO::Arg_Traits< void>::ret_val _tao_retval;
-
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "destroy",
-      7,
-      TAO::TAO_CO_NONE | TAO::TAO_CO_DIRECT_STRATEGY | TAO::TAO_CO_THRU_POA_STRATEGY
-    );
-
-  _tao_call.invoke (0, 0);
-}
-
-CORBA::Policy::Policy (void)
-{
-}
-
-CORBA::Policy::~Policy (void)
-{}
-
-void
-CORBA::Policy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Policy *_tao_tmp_pointer =
-    static_cast<Policy *> (_tao_void_pointer);
-  ::CORBA::release (_tao_tmp_pointer);
-}
-
-CORBA::Policy_ptr
-CORBA::Policy::_narrow (CORBA::Object_ptr _tao_objref)
-{
-  return
-    TAO::Narrow_Utils<Policy>::narrow (
-        _tao_objref,
-        "IDL:omg.org/CORBA/Policy:1.0");
-}
-
-CORBA::Policy_ptr
-CORBA::Policy::_unchecked_narrow (CORBA::Object_ptr _tao_objref)
-{
-  return
-    TAO::Narrow_Utils<Policy>::unchecked_narrow (_tao_objref);
-}
-
-CORBA::Policy_ptr
-CORBA::Policy::_duplicate (Policy_ptr obj)
-{
-  if (! ::CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-void
-CORBA::Policy::_tao_release (Policy_ptr obj)
-{
-  ::CORBA::release (obj);
-}
-
-CORBA::Boolean
-CORBA::Policy::_is_a (
-    const char *value
-
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    )
-    {
-      return true; // success using local knowledge
-    }
-  else
-    {
-      return this->::CORBA::Object::_is_a (
-          value
-
-        );
-    }
-}
-
-const char* CORBA::Policy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/Policy:1.0";
-}
-
-CORBA::Boolean
-CORBA::Policy::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_cs.cpp:60
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::PolicyError &_tao_aggregate
-  )
-{
-  // First marshal the repository ID.
-  if (strm << _tao_aggregate._rep_id ())
-    {
-      // Now marshal the members (if any).
-      return (
-        (strm << _tao_aggregate.reason)
-       );
-    }
-  else
-    {
-      return false;
-    }
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::PolicyError &_tao_aggregate
-  )
-{
-  // Demarshal the members.
-  return (
-    (strm >> _tao_aggregate.reason)
-  );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_cs.cpp:60
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::InvalidPolicies &_tao_aggregate
-  )
-{
-  // First marshal the repository ID.
-  if (strm << _tao_aggregate._rep_id ())
-    {
-      // Now marshal the members (if any).
-      return (
-        (strm << _tao_aggregate.indices)
-       );
-    }
-  else
-    {
-      return false;
-    }
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::InvalidPolicies &_tao_aggregate
-  )
-{
-  // Demarshal the members.
-  return (
-    (strm >> _tao_aggregate.indices)
-  );
-}
-
-// Hand crafted.
-//
-// ****************************************************************
-CORBA::Boolean
-CORBA::Policy::_tao_encode (TAO_OutputCDR &)
-{
-  return false;
-}
-
-CORBA::Boolean
-CORBA::Policy::_tao_decode (TAO_InputCDR &)
-{
-  return false;
-}
-
-TAO_Cached_Policy_Type
-CORBA::Policy::_tao_cached_type (void) const
-{
-  return TAO_CACHED_POLICY_UNCACHED;
-}
-
-TAO_Policy_Scope
-CORBA::Policy::_tao_scope (void) const
-{
-  return TAO_POLICY_DEFAULT_SCOPE;
-}
-// ****************************************************************
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::Policy_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::Policy_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-
-  if (!(strm >> obj.inout ()))
-    {
-      return false;
-    }
-
-  typedef ::CORBA::Policy RHS_SCOPED_NAME;
-
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in ());
-
-  return 1;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
deleted file mode 100644
index c37bfeb1cfd..00000000000
--- a/TAO/tao/PolicyC.h
+++ /dev/null
@@ -1,414 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_POLICYC_H_
-#define _TAO_IDL_ORIG_POLICYC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/UShortSeqC.h"
-#include "tao/CurrentC.h"
-#include "tao/Policy_ForwardC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// TAO_IDL - Generated from
-// be\be_visitor_root/root_ch.cpp:62
-
-namespace TAO
-{
-  template<typename T> class Narrow_Utils;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-
-  typedef CORBA::Short PolicyErrorCode;
-  typedef CORBA::Short_out PolicyErrorCode_out;
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-
-  const CORBA::PolicyErrorCode BAD_POLICY = 0;
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-
-  const CORBA::PolicyErrorCode UNSUPPORTED_POLICY = 1;
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-
-  const CORBA::PolicyErrorCode BAD_POLICY_TYPE = 2;
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-
-  const CORBA::PolicyErrorCode BAD_POLICY_VALUE = 3;
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-
-  const CORBA::PolicyErrorCode UNSUPPORTED_POLICY_VALUE = 4;
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:53
-
-#if !defined (_CORBA_POLICYERROR_CH_)
-#define _CORBA_POLICYERROR_CH_
-
-  class TAO_Export PolicyError : public CORBA::UserException
-  {
-  public:
-
-    CORBA::PolicyErrorCode reason;
-    PolicyError (void);
-    PolicyError (const PolicyError &);
-    ~PolicyError (void);
-
-    PolicyError &operator= (const PolicyError &);
-
-    static void _tao_any_destructor (void *);
-
-    static PolicyError *_downcast (CORBA::Exception *);
-    static const PolicyError *_downcast (CORBA::Exception const *);
-
-    static CORBA::Exception *_alloc (void);
-
-    virtual CORBA::Exception *_tao_duplicate (void) const;
-
-    virtual void _raise (void) const;
-
-    virtual void _tao_encode (
-        TAO_OutputCDR &
-
-      ) const;
-
-    virtual void _tao_decode (
-        TAO_InputCDR &
-
-      );
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ctor.cpp:66
-
-    PolicyError (
-        ::CORBA::PolicyErrorCode _tao_reason
-      );
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:129
-
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:53
-
-#if !defined (_CORBA_INVALIDPOLICIES_CH_)
-#define _CORBA_INVALIDPOLICIES_CH_
-
-  class TAO_Export InvalidPolicies : public CORBA::UserException
-  {
-  public:
-
-    CORBA::UShortSeq indices;
-    InvalidPolicies (void);
-    InvalidPolicies (const InvalidPolicies &);
-    ~InvalidPolicies (void);
-
-    InvalidPolicies &operator= (const InvalidPolicies &);
-
-    static void _tao_any_destructor (void *);
-
-    static InvalidPolicies *_downcast (CORBA::Exception *);
-    static const InvalidPolicies *_downcast (CORBA::Exception const *);
-
-    static CORBA::Exception *_alloc (void);
-
-    virtual CORBA::Exception *_tao_duplicate (void) const;
-
-    virtual void _raise (void) const;
-
-    virtual void _tao_encode (
-        TAO_OutputCDR &
-
-      ) const;
-
-    virtual void _tao_decode (
-        TAO_InputCDR &
-
-      );
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ctor.cpp:66
-
-    InvalidPolicies (
-        const ::CORBA::UShortSeq & _tao_indices
-      );
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:129
-
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:598
-
-#if !defined (_CORBA_POLICY__VAR_OUT_CH_)
-#define _CORBA_POLICY__VAR_OUT_CH_
-
-  class Policy;
-  typedef Policy *Policy_ptr;
-
-  typedef
-    TAO_Objref_Var_T<
-        Policy
-      >
-    Policy_var;
-
-  typedef
-    TAO_Objref_Out_T<
-        Policy
-      >
-    Policy_out;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CORBA_POLICY_CH_)
-#define _CORBA_POLICY_CH_
-
-  class TAO_Export Policy
-    : public virtual CORBA::Object
-  {
-  public:
-    friend class TAO::Narrow_Utils<Policy>;
-    typedef Policy_ptr _ptr_type;
-    typedef Policy_var _var_type;
-    typedef Policy_out _out_type;
-
-    // The static operations.
-    static Policy_ptr _duplicate (Policy_ptr obj);
-
-    static void _tao_release (Policy_ptr obj);
-
-    static Policy_ptr _narrow (
-        CORBA::Object_ptr obj
-
-      );
-
-    static Policy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-
-      );
-
-    static Policy_ptr _nil (void)
-    {
-      return static_cast<Policy_ptr> (0);
-    }
-
-    static void _tao_any_destructor (void *);
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::PolicyType policy_type (
-        void
-      );
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::CORBA::Policy_ptr copy (
-        void
-      );
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void destroy (
-        void
-      );
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-
-    virtual CORBA::Boolean _is_a (
-        const char *type_id
-
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
-    // Handcrafted
-    // ****************************************************************
-    virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &);
-    virtual CORBA::Boolean _tao_decode (TAO_InputCDR &);
-    virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
-    virtual TAO_Policy_Scope _tao_scope (void) const;
-    // ****************************************************************
-
-  protected:
-    // Concrete interface only.
-    Policy (void);
-
-    // Concrete non-local interface only.
-    Policy (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core
-      );
-
-    // Non-local interface only.
-    Policy (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = false,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-
-    virtual ~Policy (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    Policy (const Policy &);
-
-    void operator= (const Policy &);
-  };
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_CORBA_POLICY__TRAITS_)
-#define _CORBA_POLICY__TRAITS_
-
-  template<>
-  struct TAO_Export Objref_Traits< ::CORBA::Policy>
-  {
-    static ::CORBA::Policy_ptr duplicate (
-        ::CORBA::Policy_ptr
-      );
-    static void release (
-        ::CORBA::Policy_ptr
-      );
-    static ::CORBA::Policy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        const ::CORBA::Policy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_ch.cpp:52
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::PolicyError &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::PolicyError &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_ch.cpp:52
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::InvalidPolicies &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::InvalidPolicies &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Policy_ptr );
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Policy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-#include "tao/PolicyC.inl"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/PolicyC.inl b/TAO/tao/PolicyC.inl
deleted file mode 100644
index 05a60494650..00000000000
--- a/TAO/tao/PolicyC.inl
+++ /dev/null
@@ -1,57 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-#if !defined (_CORBA_POLICY___CI_)
-#define _CORBA_POLICY___CI_
-
-ACE_INLINE
-CORBA::Policy::Policy (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc)
-  : ::CORBA::Object (objref, _tao_collocated, servant, oc)
-{
-}
-
-ACE_INLINE
-CORBA::Policy::Policy (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc)
-  : ::CORBA::Object (ior, oc)
-{
-}
-
-#endif /* end #if !defined */
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PolicyS.h b/TAO/tao/PolicyS.h
index 46912353c2e..6730d925b57 100644
--- a/TAO/tao/PolicyS.h
+++ b/TAO/tao/PolicyS.h
@@ -20,5 +20,4 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
 #endif /* TAO_PIDL_POLICY_S_H*/
diff --git a/TAO/tao/PortableServer/Adapter_Activator.h b/TAO/tao/PortableServer/Adapter_Activator.h
index 199896689d4..c5edd4ef3c4 100644
--- a/TAO/tao/PortableServer/Adapter_Activator.h
+++ b/TAO/tao/PortableServer/Adapter_Activator.h
@@ -47,7 +47,6 @@ namespace TAO
                                       const char *name);
 
     protected:
-
       /// POA Manager
       PortableServer::POAManager_var poa_manager_;
     };
diff --git a/TAO/tao/PortableServer/Local_Servant_Base.cpp b/TAO/tao/PortableServer/Local_Servant_Base.cpp
deleted file mode 100644
index f63bb146c87..00000000000
--- a/TAO/tao/PortableServer/Local_Servant_Base.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// $Id$
-
-#include "tao/PortableServer/Local_Servant_Base.h"
-#include "tao/SystemException.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/PortableServer/Local_Servant_Base.inl"
-#endif /* ! __ACE_INLINE__ */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-void
-TAO_Local_ServantBase::_dispatch (TAO_ServerRequest &, void *)
-{
-  throw ::CORBA::BAD_OPERATION ();
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Local_Servant_Base.h b/TAO/tao/PortableServer/Local_Servant_Base.h
deleted file mode 100644
index 50931390395..00000000000
--- a/TAO/tao/PortableServer/Local_Servant_Base.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Local_Servant_Base.h
- *
- *  $Id$
- *
- *  @author  Irfan Pyarali <irfan@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_LOCAL_SERVANT_BASE_H
-#define TAO_LOCAL_SERVANT_BASE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PortableServer/portableserver_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableServer/Servant_Base.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class TAO_Local_ServantBase
- *
- * @brief Base class for local servants.
- *
- * This servant does not register with the POA and does not
- * produce a valid stub, i.e., object references of this servant
- * cannot be exported.  The (collocated) stubs of these servants
- * will always be direct, i.e., call directly to the servant and
- * don't call through the POA since this servant is not
- * registered with the POA.
- */
-class TAO_PortableServer_Export TAO_Local_ServantBase
-  : public virtual TAO_ServantBase
-{
-protected:
-  /// This is an auxiliary method for _this().  Make sure *not* to
-  /// register with the default POA.
-  TAO_Stub *_create_stub (void);
-
-  /// Throws CORBA::BAD_OPERATION exception.
-  void _dispatch (TAO_ServerRequest &request, void *servant_upcall);
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "tao/PortableServer/Local_Servant_Base.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_LOCAL_SERVANT_BASE_H */
diff --git a/TAO/tao/PortableServer/Local_Servant_Base.inl b/TAO/tao/PortableServer/Local_Servant_Base.inl
deleted file mode 100644
index 20eaf3f2e55..00000000000
--- a/TAO/tao/PortableServer/Local_Servant_Base.inl
+++ /dev/null
@@ -1,13 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE TAO_Stub *
-TAO_Local_ServantBase::_create_stub (void)
-{
-  return 0;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Operation_Table.h b/TAO/tao/PortableServer/Operation_Table.h
index 9a11e5f1b5a..c0dc04faba3 100644
--- a/TAO/tao/PortableServer/Operation_Table.h
+++ b/TAO/tao/PortableServer/Operation_Table.h
@@ -28,11 +28,20 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_ServerRequest;
 class TAO_Abstract_ServantBase;
+class TAO_ServantBase;
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class Servant_Upcall;
+  }
+}
 
 typedef void (*TAO_Skeleton)(
     TAO_ServerRequest &,
-    void *,
-    void *);
+    TAO::Portable_Server::Servant_Upcall *,
+    TAO_ServantBase *);
 
 typedef void (*TAO_Collocated_Skeleton)(
     TAO_Abstract_ServantBase *,
diff --git a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp
index eae26a71e4e..918c6f5e765 100644
--- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp
@@ -74,8 +74,7 @@ int
 TAO_Dynamic_Hash_OpTable::bind (const char *opname,
                                 const TAO::Operation_Skeletons skel_ptr)
 {
-  return this->hash_.bind (CORBA::string_dup (opname),
-                           skel_ptr);
+  return this->hash_.bind (CORBA::string_dup (opname), skel_ptr);
 }
 
 int
@@ -86,9 +85,7 @@ TAO_Dynamic_Hash_OpTable::find (const char *opname,
   ACE_FUNCTION_TIMEPROBE (TAO_DYNAMIC_HASH_OPTABLE_FIND_START);
   TAO::Operation_Skeletons s;
 
-  int retval =
-    this->hash_.find ((const char *)opname,
-                      s);
+  int const retval = this->hash_.find (opname, s);
 
   if (retval != -1)
     {
@@ -108,8 +105,7 @@ TAO_Dynamic_Hash_OpTable::find (const char *opname,
 
   TAO::Operation_Skeletons skel;
 
-  int retval =
-    this->hash_.find ((const char *)opname, skel);
+  int const retval = this->hash_.find (opname, skel);
 
   if (retval != -1)
     {
diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
index da100f9802e..53444157d75 100644
--- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
+++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp
@@ -65,8 +65,7 @@ TAO_Perfect_Hash_OpTable::find (const char *opname,
 {
   ACE_FUNCTION_TIMEPROBE (TAO_PERFECT_HASH_OPTABLE_FIND_START);
 
-  TAO_operation_db_entry const * const entry = lookup (opname,
-                                                       length);
+  TAO_operation_db_entry const * const entry = lookup (opname, length);
   if (entry == 0)
     {
       skelfunc = 0; // insure that somebody can't call a wrong function!
diff --git a/TAO/tao/PortableServer/PS_ForwardC.h b/TAO/tao/PortableServer/PS_ForwardC.h
index 592be9ab1e9..6f45d439eeb 100644
--- a/TAO/tao/PortableServer/PS_ForwardC.h
+++ b/TAO/tao/PortableServer/PS_ForwardC.h
@@ -69,7 +69,6 @@ namespace PortableServer
     typedef Servant_var<TAO_ServantBase> ServantBase_var;
     typedef ServantBase *Servant;
 
-    typedef TAO_Local_ServantBase LocalServantBase;
     typedef TAO_DynamicImplementation DynamicImplementation;
 
   // TAO_IDL - Generated from
diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp
deleted file mode 100644
index 6a533af379a..00000000000
--- a/TAO/tao/PortableServer/PolicyS.cpp
+++ /dev/null
@@ -1,928 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:599
-
-#ifndef _TAO_IDL_ORIG_POLICYS_CPP_
-#define _TAO_IDL_ORIG_POLICYS_CPP_
-
-
-#include "tao/AnyTypeCode/TypeCode.h"
-#include "tao/AnyTypeCode/Any.h"
-#include "tao/PortableServer/PolicyS.h"
-#include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
-#include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h"
-#include "tao/PortableServer/Upcall_Command.h"
-#include "tao/PortableServer/Upcall_Wrapper.h"
-#include "tao/PortableServer/Basic_SArguments.h"
-#include "tao/PortableServer/Object_SArgument_T.h"
-#include "tao/PortableServer/Special_Basic_SArguments.h"
-#include "tao/PortableServer/UB_String_SArguments.h"
-#include "tao/PortableServer/TypeCode_SArg_Traits.h"
-#include "tao/PortableServer/Object_SArg_Traits.h"
-#include "tao/PortableServer/get_arg.h"
-#include "tao/Special_Basic_Arguments.h"
-#include "tao/UB_String_Arguments.h"
-#include "tao/TAO_Server_Request.h"
-#include "tao/ORB_Core.h"
-#include "tao/Profile.h"
-#include "tao/Stub.h"
-#include "tao/IFR_Client_Adapter.h"
-#include "tao/Object_T.h"
-#include "tao/CDR.h"
-#include "tao/operation_details.h"
-#include "tao/PortableInterceptor.h"
-#include "tao/Basic_Arguments.h"
-#include "tao/Object_Argument_T.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Malloc_Allocator.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// Arg traits specializations.
-namespace TAO
-{
-
-#if !defined (_CORBA_POLICY__SARG_TRAITS_SS_)
-#define _CORBA_POLICY__SARG_TRAITS_SS_
-/*
-  template<>
-  class  SArg_Traits<CORBA::Policy>
-    : public
-        Object_SArg_Traits_T<
-            CORBA::Policy_ptr,
-            CORBA::Policy_var,
-            CORBA::Policy_out,
-            TAO::Any_Insert_Policy_Stream
-          >
-  {
-  };
-  */
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be\be_interface.cpp:1455
-
-class TAO_CORBA_Policy_Perfect_Hash_OpTable
-  : public TAO_Perfect_Hash_OpTable
-{
-private:
-  unsigned int hash (const char *str, unsigned int len);
-
-public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-};
-
-/* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ACE\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_Policy_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_CORBA_Policy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-#if defined (ACE_MVS)
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22,  0,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22,  0,
-     22,  0,  0,  5, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22,  0, 22, 22, 22, 22,  0, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22,
-#else
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22,  0, 22,  0, 22,  0,
-      0,  5, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22,  0, 22, 22, 22,
-     22,  0, 22, 22, 22, 22, 22, 22,
-#endif /* ACE_MVS */
-    };
-  return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]];
-}
-
-const TAO_operation_db_entry *
-TAO_CORBA_Policy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 7,
-      MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 16,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 21,
-      HASH_VALUE_RANGE = 18,
-      DUPLICATES = 0,
-      WORDLIST_SIZE = 11
-    };
-
-  static const TAO_operation_db_entry  wordlist[] =
-    {
-      {"",0,0},{"",0,0},{"",0,0},{"",0,0},
-      {"copy", &POA_CORBA::Policy::copy_skel, &POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy},
-      {"_is_a", &POA_CORBA::Policy::_is_a_skel, 0},
-      {"",0,0},
-      {"destroy", &POA_CORBA::Policy::destroy_skel, &POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy},
-      {"",0,0},{"",0,0},
-      {"_component", &POA_CORBA::Policy::_component_skel, 0},
-      {"",0,0},{"",0,0},
-      {"_non_existent", &POA_CORBA::Policy::_non_existent_skel, 0},
-      {"",0,0},
-      {"_interface", &POA_CORBA::Policy::_interface_skel, 0},
-      {"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0},
-      {"_get_policy_type", &POA_CORBA::Policy::_get_policy_type_skel, &POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_get_policy_type},
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      unsigned int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-        {
-          const char *s = wordlist[key].opname;
-
-          if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-
-static TAO_CORBA_Policy_Perfect_Hash_OpTable tao_CORBA_Policy_optable;
-
-///////////////////////////////////////////////////////////////////////
-//                 Direct Proxy  Implementation
-//
-
-POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_TAO_Policy_Direct_Proxy_Impl (void)
-{}
-
-POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::~_TAO_Policy_Direct_Proxy_Impl (void)
-{}
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
-
-void
-POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_get_policy_type (
-    TAO_Abstract_ServantBase  *servant,
-    TAO::Argument ** args)
-{
-  ((TAO::Arg_Traits< ::CORBA::PolicyType>::ret_val *) args[0])->arg () =
-    dynamic_cast<POA_CORBA::Policy_ptr>
-      (servant)
-    ->policy_type ();
-}
-// TAO_IDL - Generated from
-// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
-
-void
-POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy (
-    TAO_Abstract_ServantBase  *servant,
-    TAO::Argument ** args)
-{
-  ((TAO::Arg_Traits< CORBA::Policy>::ret_val *) args[0])->arg () =
-    dynamic_cast<POA_CORBA::Policy_ptr>
-      (servant)
-    ->copy ();
-}
-// TAO_IDL - Generated from
-// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
-
-void
-POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase  *servant,
-    TAO::Argument **)
-{
-  dynamic_cast<POA_CORBA::Policy_ptr>
-    (servant)
-  ->destroy ();
-}
-
-
-//
-//           End Direct Proxy Implementation
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:103
-
-POA_CORBA::Policy::Policy (void)
-  : TAO_ServantBase ()
-{
-  this->optable_ = &tao_CORBA_Policy_optable;
-}
-
-POA_CORBA::Policy::Policy (const Policy& rhs)
-  : TAO_Abstract_ServantBase (rhs),
-    TAO_ServantBase (rhs)
-{
-}
-
-POA_CORBA::Policy::~Policy (void)
-{
-}
-namespace POA_CORBA
-{
-
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-
-  class _get_policy_type_Policy
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline _get_policy_type_Policy (
-      POA_CORBA::Policy * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
-
-    virtual void execute (void)
-    {
-      TAO::SArg_Traits< ::CORBA::PolicyType>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::CORBA::PolicyType> (
-          this->operation_details_,
-          this->args_);
-
-
-      retval =
-        this->servant_->policy_type (
-          );
-
-    }
-
-  private:
-    POA_CORBA::Policy * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
-
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_ss.cpp:192
-
-void POA_CORBA::Policy::_get_policy_type_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-
-  )
-{
-
-
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static CORBA::ULong const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-
-  TAO::SArg_Traits< ::CORBA::PolicyType>::ret_val retval;
-
-  TAO::Argument * const args[] =
-    {
-      &retval
-    };
-
-  static size_t const nargs = 1;
-
-  POA_CORBA::Policy * const impl =
-    static_cast<POA_CORBA::Policy *> (servant);
-
-  _get_policy_type_Policy command (
-    impl,
-    server_request.operation_details (),
-    args);
-
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                        );
-
-}
-namespace POA_CORBA
-{
-
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-
-  class copy_Policy
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline copy_Policy (
-      POA_CORBA::Policy * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
-
-    virtual void execute (void)
-    {
-      TAO::SArg_Traits< CORBA::Policy>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::Policy> (
-          this->operation_details_,
-          this->args_);
-
-
-      retval =
-        this->servant_->copy (
-          );
-
-    }
-
-  private:
-    POA_CORBA::Policy * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
-
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_ss.cpp:192
-
-void POA_CORBA::Policy::copy_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-
-  )
-{
-
-
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static CORBA::ULong const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-
-  TAO::SArg_Traits< CORBA::Policy>::ret_val retval;
-
-  TAO::Argument * const args[] =
-    {
-      &retval
-    };
-
-  static size_t const nargs = 1;
-
-  POA_CORBA::Policy * const impl =
-    static_cast<POA_CORBA::Policy *> (servant);
-
-  copy_Policy command (
-    impl,
-    server_request.operation_details (),
-    args);
-
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                        );
-
-}
-namespace POA_CORBA
-{
-
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-
-  class destroy_Policy
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline destroy_Policy (
-      POA_CORBA::Policy * servant)
-      : servant_ (servant)
-    {
-    }
-
-    virtual void execute (void)
-    {
-      this->servant_->destroy (
-        );
-
-    }
-
-  private:
-    POA_CORBA::Policy * const servant_;
-  };
-
-}
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_ss.cpp:192
-
-void POA_CORBA::Policy::destroy_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-
-  )
-{
-
-
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static CORBA::ULong const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-
-  TAO::SArg_Traits< void>::ret_val retval;
-
-  TAO::Argument * const args[] =
-    {
-      &retval
-    };
-
-  static size_t const nargs = 1;
-
-  POA_CORBA::Policy * const impl =
-    static_cast<POA_CORBA::Policy *> (servant);
-
-  destroy_Policy command (
-    impl);
-
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                        );
-
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:169
-
-namespace POA_CORBA
-{
-
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-
-  class _is_a_Policy_Upcall_Command
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline _is_a_Policy_Upcall_Command (
-      POA_CORBA::Policy * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
-
-    virtual void execute (void)
-    {
-      TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
-          this->operation_details_,
-          this->args_);
-
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *> (
-          this->operation_details_,
-          this->args_,
-          1);
-
-
-      retval =
-        this->servant_-> _is_a (
-          arg_1
-         );
-
-    }
-
-  private:
-    POA_CORBA::Policy * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
-
-}
-void POA_CORBA::Policy::_is_a_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-
-  )
-{
-
-
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static CORBA::ULong const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-
-  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
-
-  TAO::Argument * const args[] =
-    {
-      &retval,
-      &_tao_repository_id
-    };
-
-  static size_t const nargs = 2;
-
-  POA_CORBA::Policy * const impl =
-    static_cast<POA_CORBA::Policy *> (servant);
-
-  _is_a_Policy_Upcall_Command command (
-    impl,
-    server_request.operation_details (),
-    args);
-
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                        );
-
-}
-
-namespace POA_CORBA
-{
-
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-
-  class _non_existent_Policy_Upcall_Command
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline _non_existent_Policy_Upcall_Command (
-      POA_CORBA::Policy * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
-
-    virtual void execute (void)
-    {
-      TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
-          this->operation_details_,
-          this->args_);
-
-
-      retval =
-        this->servant_-> _non_existent (
-          );
-
-    }
-
-  private:
-    POA_CORBA::Policy * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
-
-}
-void POA_CORBA::Policy::_non_existent_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-
-  )
-{
-
-
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static CORBA::ULong const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-
-  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
-  TAO::Argument * const args[] =
-    {
-      &retval
-    };
-
-  static size_t const nargs = 1;
-
-  POA_CORBA::Policy * const impl =
-    static_cast<POA_CORBA::Policy *> (servant);
-
-  _non_existent_Policy_Upcall_Command command (
-    impl,
-    server_request.operation_details (),
-    args);
-
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                        );
-
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:393
-
-
-
-void POA_CORBA::Policy::_interface_skel (
-    TAO_ServerRequest & server_request,
-    void * /* servant_upcall */,
-    void * servant
-
-  )
-{
-  TAO_IFR_Client_Adapter *_tao_adapter =
-    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
-        TAO_ORB_Core::ifr_client_adapter_name ()
-      );
-
-  if (_tao_adapter == 0)
-    {
-      throw ::CORBA::INTF_REPOS (CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO);
-    }
-
-  POA_CORBA::Policy * const impl =
-    static_cast<POA_CORBA::Policy *> (servant);
-  CORBA::InterfaceDef_ptr _tao_retval =
-    impl->_get_interface ();
-
-  server_request.init_reply ();
-  TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
-  CORBA::Boolean const _tao_result =
-    _tao_adapter->interfacedef_cdr_insert (
-        _tao_out,
-        _tao_retval
-      );
-
-  _tao_adapter->dispose (_tao_retval);
-
-  if (_tao_result == 0)
-    {
-      throw ::CORBA::MARSHAL ();
-    }
-}
-
-namespace POA_CORBA
-{
-
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-
-  class _get_component_Policy_Upcall_Command
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline _get_component_Policy_Upcall_Command (
-      POA_CORBA::Policy * servant,
-      TAO_Operation_Details const * operation_details,
-      TAO::Argument * const args[])
-      : servant_ (servant)
-      , operation_details_ (operation_details)
-      , args_ (args)
-    {
-    }
-
-    virtual void execute (void)
-    {
-      TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
-          this->operation_details_,
-          this->args_);
-
-
-      retval =
-        this->servant_-> _get_component (
-          );
-
-    }
-
-  private:
-    POA_CORBA::Policy * const servant_;
-    TAO_Operation_Details const * const operation_details_;
-    TAO::Argument * const * const args_;
-  };
-
-}
-void POA_CORBA::Policy::_component_skel (
-    TAO_ServerRequest & server_request,
-    void * TAO_INTERCEPTOR (servant_upcall),
-    void * servant
-
-  )
-{
-
-
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static CORBA::ULong const nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-
-  TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
-  TAO::Argument * const args[] =
-    {
-      &retval
-    };
-
-  static size_t const nargs = 1;
-
-  POA_CORBA::Policy * const impl =
-    static_cast<POA_CORBA::Policy *> (servant);
-
-  _get_component_Policy_Upcall_Command command (
-    impl,
-    server_request.operation_details (),
-    args);
-
-  TAO::Upcall_Wrapper upcall_wrapper;
-  upcall_wrapper.upcall (server_request
-                         , args
-                         , nargs
-                         , command
-#if TAO_HAS_INTERCEPTORS == 1
-                         , servant_upcall
-                         , exceptions
-                         , nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-                        );
-
-}
-
-CORBA::Boolean POA_CORBA::Policy::_is_a (
-    const char* value
-
-  )
-{
-  return
-    (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-    );
-}
-
-const char* POA_CORBA::Policy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/Policy:1.0";
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
-
-void POA_CORBA::Policy::_dispatch (
-    TAO_ServerRequest & req,
-    void * servant_upcall
-
-  )
-{
-  this->synchronous_upcall_dispatch (req,
-                                     servant_upcall,
-                                     this
-                                    );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
-
-CORBA::Policy *
-POA_CORBA::Policy::_this (void)
-{
-  TAO_Stub *stub = this->_create_stub ();
-
-  TAO_Stub_Auto_Ptr safe_stub (stub);
-  CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
-  CORBA::Boolean _tao_opt_colloc =
-    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
-  ACE_NEW_RETURN (
-      tmp,
-      CORBA::Object (stub, _tao_opt_colloc, this),
-      0
-    );
-
-  CORBA::Object_var obj = tmp;
-  (void) safe_stub.release ();
-
-  typedef ::CORBA::Policy STUB_SCOPED_NAME;
-  return
-    TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
-        obj.in ());
-}
-
-#endif /* ifndef */
-
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h
deleted file mode 100644
index fc076ae73b5..00000000000
--- a/TAO/tao/PortableServer/PolicyS.h
+++ /dev/null
@@ -1,247 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:391
-
-#ifndef _TAO_IDL_ORIG_POLICYS_H_
-#define _TAO_IDL_ORIG_POLICYS_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PolicyC.h"
-#include "tao/UShortSeqS.h"
-#include "tao/CurrentS.h"
-#include "tao/Policy_ForwardS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#include "tao/PortableServer/portableserver_export.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_PortableServer_Export
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_sh.cpp:49
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace POA_CORBA
-{
-
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_sh.cpp:87
-
-  class Policy;
-  typedef Policy *Policy_ptr;
-
-  class TAO_PortableServer_Export Policy
-    : public virtual PortableServer::ServantBase
-  {
-  protected:
-    Policy (void);
-
-  public:
-    // Useful for template programming.
-    typedef ::CORBA::Policy _stub_type;
-    typedef ::CORBA::Policy_ptr _stub_ptr_type;
-    typedef ::CORBA::Policy_var _stub_var_type;
-
-    Policy (const Policy& rhs);
-    virtual ~Policy (void);
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id
-
-      );
-
-    static void _is_a_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-
-      );
-
-    static void _non_existent_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-
-      );
-
-    static void _interface_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-
-      );
-
-    static void _component_skel (
-        TAO_ServerRequest & req,
-        void * servant_upcall,
-        void * servant
-
-      );
-
-    virtual void _dispatch (
-        TAO_ServerRequest & req,
-        void * servant_upcall
-
-      );
-
-    ::CORBA::Policy *_this (
-        void
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_sh.cpp:45
-
-    virtual CORBA::PolicyType policy_type (
-        void
-      )
-      = 0;
-
-    static void _get_policy_type_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-
-      );
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_sh.cpp:45
-
-    virtual ::CORBA::Policy_ptr copy (
-        void
-      )
-      = 0;
-
-    static void copy_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-
-      );
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_sh.cpp:45
-
-    virtual void destroy (
-        void
-      )
-      = 0;
-
-    static void destroy_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-
-      );
-  };
-
-
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
-
-  ///////////////////////////////////////////////////////////////////////
-  //                    Direct  Impl. Declaration
-  //
-
-  class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl
-  {
-  public:
-    _TAO_Policy_Direct_Proxy_Impl (void);
-
-    virtual ~_TAO_Policy_Direct_Proxy_Impl (void);
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/proxy_impl_xh.cpp:24
-
-    static void
-    _get_policy_type (
-        TAO_Abstract_ServantBase *servant,
-        TAO::Argument ** args);
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/proxy_impl_xh.cpp:24
-
-    static void
-    copy (
-        TAO_Abstract_ServantBase *servant,
-        TAO::Argument ** args);
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/proxy_impl_xh.cpp:24
-
-    static void
-    destroy (
-        TAO_Abstract_ServantBase *servant,
-        TAO::Argument ** args);
-  };
-
-  //
-  //                Direct  Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_sh.cpp:80
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:995
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include "tao/PortableServer/PolicyS_T.h"
-
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* ifndef */
-
diff --git a/TAO/tao/PortableServer/PolicyS_T.cpp b/TAO/tao/PortableServer/PolicyS_T.cpp
deleted file mode 100644
index 312a1e2f507..00000000000
--- a/TAO/tao/PortableServer/PolicyS_T.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:677
-
-#ifndef _TAO_IDL_ORIG_POLICYS_T_CPP_
-#define _TAO_IDL_ORIG_POLICYS_T_CPP_
-
-#include "tao/PortableServer/PolicyS_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/PortableServer/PolicyS_T.inl"
-#endif /* !defined INLINE */
-
-
-#endif /* ifndef */
diff --git a/TAO/tao/PortableServer/PolicyS_T.h b/TAO/tao/PortableServer/PolicyS_T.h
deleted file mode 100644
index ef5c094ce39..00000000000
--- a/TAO/tao/PortableServer/PolicyS_T.h
+++ /dev/null
@@ -1,145 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:536
-
-#ifndef _TAO_IDL_ORIG_POLICYS_T_H_
-#define _TAO_IDL_ORIG_POLICYS_T_H_
-
-#include /**/ "ace/pre.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// TAO_IDL - Generated from
-// be\be_visitor_root/root_sth.cpp:116
-
-namespace POA_CORBA
-{
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/tie_sh.cpp:87
-
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class  Policy_tie : public Policy
-  {
-  public:
-    Policy_tie (T &t);
-    // the T& ctor
-    Policy_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    Policy_tie (T *tp, CORBA::Boolean release = true);
-    // ctor taking pointer and an ownership flag
-    Policy_tie (
-        T *tp,
-        PortableServer::POA_ptr poa,
-        CORBA::Boolean release = true
-      );
-    // ctor with T*, ownership flag and a POA
-    ~Policy_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release = true);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        void
-      );
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/tie_sh.cpp:60
-
-    CORBA::PolicyType policy_type (
-        void
-      );
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/tie_sh.cpp:60
-
-    ::CORBA::Policy_ptr copy (
-        void
-      );
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/tie_sh.cpp:60
-
-    void destroy (
-        void
-      );
-
-  private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    Policy_tie (const Policy_tie &);
-    void operator= (const Policy_tie &);
-  };
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:1096
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-#include "tao/PortableServer/PolicyS_T.inl"
-#endif /* defined INLINE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/PortableServer/PolicyS_T.cpp"
-#endif /* defined REQUIRED SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("PolicyS_T.cpp")
-#endif /* defined REQUIRED PRAGMA */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* ifndef */
-
diff --git a/TAO/tao/PortableServer/PolicyS_T.inl b/TAO/tao/PortableServer/PolicyS_T.inl
deleted file mode 100644
index b72444d2753..00000000000
--- a/TAO/tao/PortableServer/PolicyS_T.inl
+++ /dev/null
@@ -1,162 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/tie_si.cpp:96
-
-template <class T> ACE_INLINE
-POA_CORBA::Policy_tie<T>::Policy_tie (T &t)
-  : ptr_ (&t),
-    poa_ (PortableServer::POA::_nil ()),
-    rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::Policy_tie<T>::Policy_tie (T &t, PortableServer::POA_ptr poa)
-  : ptr_ (&t),
-    poa_ (PortableServer::POA::_duplicate (poa)),
-    rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::Policy_tie<T>::Policy_tie (T *tp, CORBA::Boolean release)
-  : ptr_ (tp),
-    poa_ (PortableServer::POA::_nil ()),
-    rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::Policy_tie<T>::Policy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-  : ptr_ (tp),
-    poa_ (PortableServer::POA::_duplicate (poa)),
-    rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::Policy_tie<T>::~Policy_tie (void)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::Policy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::Policy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::Policy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_)
-    {
-      delete this->ptr_;
-    }
-
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::Policy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::Policy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::Policy_tie<T>::_default_POA (void)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-
-  return this->Policy::_default_POA ();
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-CORBA::PolicyType POA_CORBA::Policy_tie<T>::policy_type  (
-
-  )
-{
-  return this->ptr_->policy_type (
-
-  );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-::CORBA::Policy_ptr POA_CORBA::Policy_tie<T>::copy  (
-  )
-{
-  return this->ptr_->copy (
-
-  );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/tie_si.cpp:68
-
-template <class T> ACE_INLINE
-void POA_CORBA::Policy_tie<T>::destroy  (
-
-  )
-{
-  this->ptr_->destroy (
-
-  );
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/PortableServer.mpc b/TAO/tao/PortableServer/PortableServer.mpc
index bfdcd5b0bd7..fec90ddd602 100644
--- a/TAO/tao/PortableServer/PortableServer.mpc
+++ b/TAO/tao/PortableServer/PortableServer.mpc
@@ -91,6 +91,7 @@ project(PortableServer) : taolib, tao_output, install, anytypecode, taoidldefaul
     POAManagerC.cpp
     POAManagerFactoryC.cpp
     POAC.cpp
+    PolicyS.cpp
     PS_CurrentC.cpp
     PortableServer_includeC.cpp
     PortableServerC.cpp
@@ -122,6 +123,8 @@ project(PortableServer) : taolib, tao_output, install, anytypecode, taoidldefaul
     POAC.h
     POAManagerC.h
     POAManagerFactoryC.h
+    PolicyS.h
+    PolicyS_T.h
     PortableServerC.h
     PortableServer_includeC.h
     PS_CurrentC.h
@@ -169,6 +172,7 @@ project(PortableServer) : taolib, tao_output, install, anytypecode, taoidldefaul
 
   Template_Files {
     Servant_var.cpp
+    PolicyS_T.cpp
     *_T.cpp
   }
 
diff --git a/TAO/tao/PortableServer/SUpcall_commands.cpp b/TAO/tao/PortableServer/SUpcall_commands.cpp
new file mode 100644
index 00000000000..366b1c8a6fa
--- /dev/null
+++ b/TAO/tao/PortableServer/SUpcall_commands.cpp
@@ -0,0 +1,125 @@
+// -*- C++ -*-
+// $Id$
+
+#include "tao/PortableServer/SUpcall_commands.h"
+
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/DynamicC.h"
+
+#include "tao/PortableServer/Servant_Base.h"
+#include "tao/PortableServer/SArg_Traits_T.h"
+#include "tao/PortableServer/Basic_SArguments.h"
+#include "tao/PortableServer/Special_Basic_SArguments.h"
+#include "tao/PortableServer/Fixed_Size_SArgument_T.h"
+#include "tao/PortableServer/Var_Size_SArgument_T.h"
+#include "tao/PortableServer/Object_SArg_Traits.h"
+#include "tao/PortableServer/UB_String_SArguments.h"
+#include "tao/PortableServer/get_arg.h"
+#include "tao/Object.h"
+
+void
+_is_a_thru_poa_Upcall_Command::execute (void)
+{
+  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
+    TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
+      this->operation_details_,
+      this->args_);
+
+  TAO::SArg_Traits< char *>::in_arg_type arg_1 =
+    TAO::Portable_Server::get_in_arg< char *> (
+      this->operation_details_,
+      this->args_,
+      1);
+
+  retval =
+    this->servant_-> _is_a (
+      arg_1);
+}
+
+void
+_is_a_Upcall_Command::execute (void)
+{
+  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
+    static_cast<TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val *> (this->args_[0])->arg ();
+
+  TAO::SArg_Traits< char *>::in_arg_type arg_1 =
+    static_cast<TAO::SArg_Traits< char *>::in_arg_val *> (this->args_[1])->arg ();
+
+  retval =
+    this->servant_-> _is_a (
+      arg_1);
+}
+
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+void
+_non_existent_thru_poa_Upcall_Command::execute (void)
+{
+  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
+    TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> (
+      this->operation_details_,
+      this->args_);
+
+  retval =
+    this->servant_-> _non_existent ();
+}
+
+void
+_non_existent_Upcall_Command::execute (void)
+{
+  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
+    static_cast<TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val *> (this->args_[0])->arg ();
+
+  retval =
+    this->servant_-> _non_existent ();
+}
+
+
+# if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+void
+_get_component_thru_poa_Upcall_Command::execute (void)
+{
+  TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
+    TAO::Portable_Server::get_ret_arg< ::CORBA::Object> (
+      this->operation_details_,
+      this->args_);
+
+  retval =
+    this->servant_-> _get_component ();
+}
+
+void
+_get_component_Upcall_Command::execute (void)
+{
+  TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
+    static_cast<TAO::SArg_Traits< ::CORBA::Object>::ret_val *> (this->args_[0])->arg ();
+
+  retval =
+    this->servant_-> _get_component ();
+}
+
+# endif /* !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */
+
+
+void
+_repository_id_thru_poa_Upcall_Command::execute (void)
+{
+  TAO::SArg_Traits< char *>::ret_arg_type retval =
+    TAO::Portable_Server::get_ret_arg< char *> (
+      this->operation_details_,
+      this->args_);
+
+  retval =
+    this->servant_-> _repository_id ();
+}
+
+void
+_repository_id_Upcall_Command::execute(void )
+{
+  TAO::SArg_Traits< char *>::ret_arg_type retval =
+    static_cast<TAO::SArg_Traits< char *>::ret_val *> (this->args_[0])->arg ();
+
+  retval =
+    this->servant_-> _repository_id ();
+}
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
diff --git a/TAO/tao/PortableServer/SUpcall_commands.h b/TAO/tao/PortableServer/SUpcall_commands.h
new file mode 100644
index 00000000000..4b44d4667b0
--- /dev/null
+++ b/TAO/tao/PortableServer/SUpcall_commands.h
@@ -0,0 +1,269 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    SUpcall_commands.h
+ *
+ *  $Id$
+ *
+ *  @author  Marcel Smit <msmit@remedy.nl>
+ *
+ * @brief Upcall command exection classes for static skeleton methods
+ *
+ * This file contains the classes needed to perform an upcall command for
+ * the following static methods, defined in Servant_Base.h
+ * - _is_a_skel
+ * - _non_existent_skel
+ * - _component_skel
+ * - _repository_id_skel
+ * - _interface_skel
+ *
+ */
+//=============================================================================
+
+#ifndef TAO_SUPCALL_COMMANDS_H
+#define TAO_SUPCALL_COMMANDS_H
+
+#include /**/ "ace/pre.h"
+
+#include "tao/PortableServer/Upcall_Command.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/PortableServer/Upcall_Wrapper.h"
+#include "tao/operation_details.h"
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+/**
+ * @class _is_a_thru_poa_Upcall_Command
+ *
+ * @brief Execution class for _is_a_skel.
+ *
+ *
+ */
+class _is_a_thru_poa_Upcall_Command
+  : public TAO::Upcall_Command
+{
+public:
+  inline _is_a_thru_poa_Upcall_Command (
+    TAO_ServantBase * servant,
+    TAO_Operation_Details const * operation_details,
+    TAO::Argument * const args[])
+    : servant_ (servant)
+    , operation_details_ (operation_details)
+    , args_ (args)
+  {}
+
+  virtual void execute (void);
+
+private:
+  TAO_ServantBase * const servant_;
+  TAO_Operation_Details const * const operation_details_;
+  TAO::Argument * const * const args_;
+};
+
+/**
+ * @class _is_a_Upcall_Command
+ *
+ * @brief Execution class for _is_a_skel when through POA option is used.
+ *
+ *
+ */
+class _is_a_Upcall_Command
+  : public TAO::Upcall_Command
+{
+public:
+  inline _is_a_Upcall_Command (
+    TAO_ServantBase * servant,
+    TAO::Argument * const args[])
+    : servant_ (servant)
+    , args_ (args)
+  {
+  }
+
+  virtual void execute (void);
+
+private:
+  TAO_ServantBase * const servant_;
+  TAO::Argument * const * const args_;
+};
+
+
+/**
+ * @class _non_existent_thru_poa_Upcall_Command
+ *
+ * @brief Execution class for _non_existent_skel.
+ *
+ *
+ */
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+class _non_existent_thru_poa_Upcall_Command
+  : public TAO::Upcall_Command
+{
+public:
+  inline _non_existent_thru_poa_Upcall_Command (
+    TAO_ServantBase * servant,
+    TAO_Operation_Details const * operation_details,
+    TAO::Argument * const args[])
+    : servant_ (servant)
+    , operation_details_ (operation_details)
+    , args_ (args)
+  {
+  }
+
+  virtual void execute (void);
+private:
+  TAO_ServantBase * const servant_;
+  TAO_Operation_Details const * const operation_details_;
+  TAO::Argument * const * const args_;
+};
+
+/**
+ * @class _non_existent_Upcall_Command
+ *
+ * @brief Execution class for _non_existent_skel when through POA option is used.
+ *
+ *
+ */
+class _non_existent_Upcall_Command
+  : public TAO::Upcall_Command
+{
+public:
+  inline _non_existent_Upcall_Command (
+    TAO_ServantBase * servant,
+    TAO::Argument * const args[])
+    : servant_ (servant)
+    , args_ (args)
+  {
+  }
+
+  virtual void execute (void);
+
+private:
+  TAO_ServantBase * const servant_;
+  TAO::Argument * const * const args_;
+};
+
+
+# if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+/**
+ * @class _get_component_thru_poa_Upcall_Command
+ *
+ * @brief Execution class for _component_skel.
+ *
+ *
+ */
+class _get_component_thru_poa_Upcall_Command
+  : public TAO::Upcall_Command
+{
+public:
+  inline _get_component_thru_poa_Upcall_Command (
+    TAO_ServantBase * servant,
+    TAO_Operation_Details const * operation_details,
+    TAO::Argument * const args[])
+    : servant_ (servant)
+    , operation_details_ (operation_details)
+    , args_ (args)
+  {
+  }
+
+  virtual void execute (void);
+
+private:
+  TAO_ServantBase * const servant_;
+  TAO_Operation_Details const * const operation_details_;
+  TAO::Argument * const * const args_;
+};
+
+/**
+ * @class _get_component_Upcall_Command
+ *
+ * @brief Execution class for _get_component when through POA option is used.
+ *
+ *
+ */
+class _get_component_Upcall_Command
+  : public TAO::Upcall_Command
+{
+public:
+  inline _get_component_Upcall_Command (
+    TAO_ServantBase * servant,
+    TAO::Argument * const args[])
+    : servant_ (servant)
+      , args_ (args)
+  {
+  }
+
+  virtual void execute (void);
+
+private:
+  TAO_ServantBase * const servant_;
+  TAO::Argument * const * const args_;
+};
+# endif /* !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */
+
+/**
+ * @class _repository_id_thru_poa_Upcall_Command
+ *
+ * @brief Execution class for _repository_id_skel
+ *
+ *
+ */
+class _repository_id_thru_poa_Upcall_Command
+  : public TAO::Upcall_Command
+{
+public:
+  inline _repository_id_thru_poa_Upcall_Command (
+    TAO_ServantBase * servant,
+    TAO_Operation_Details const * operation_details,
+    TAO::Argument * const args[])
+    : servant_ (servant)
+    , operation_details_ (operation_details)
+    , args_ (args)
+  {
+  }
+
+  virtual void execute (void);
+
+private:
+  TAO_ServantBase * const servant_;
+  TAO_Operation_Details const * const operation_details_;
+  TAO::Argument * const * const args_;
+};
+
+/**
+ * @class _repository_id_Upcall_Command
+ *
+ * @brief Execution class for _repository_id when through POA option is used.
+ *
+ *
+ */
+class _repository_id_Upcall_Command
+  : public TAO::Upcall_Command
+{
+public:
+  inline _repository_id_Upcall_Command (
+    TAO_ServantBase * servant,
+    TAO::Argument * const args[])
+    : servant_ (servant)
+    , args_ (args)
+  {
+  }
+
+  virtual void execute (void);
+
+private:
+  TAO_ServantBase * const servant_;
+  TAO::Argument * const * const args_;
+};
+
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_SUPCALL_COMMANDS_H */
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index 4c33eb15523..5de55231790 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -7,12 +7,26 @@
 #include "tao/PortableServer/POA_Current_Impl.h"
 #include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h"
 
+#include "tao/PortableInterceptor.h"
+#include "tao/PortableServer/SUpcall_commands.h"
+
+#include "tao/PortableServer/SArg_Traits_T.h"
+#include "tao/PortableServer/Basic_SArguments.h"
+#include "tao/PortableServer/Special_Basic_SArguments.h"
+#include "tao/PortableServer/Fixed_Size_SArgument_T.h"
+#include "tao/PortableServer/Var_Size_SArgument_T.h"
+#include "tao/PortableServer/Object_SArg_Traits.h"
+#include "tao/PortableServer/UB_String_SArguments.h"
+#include "tao/PortableServer/get_arg.h"
+#include "tao/Object.h"
+
 #include "tao/Timeprobe.h"
 #include "tao/ORB_Core.h"
 #include "tao/TSS_Resources.h"
 #include "tao/Stub.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/IFR_Client_Adapter.h"
+#include "tao/Basic_Types.h"
 
 #include "ace/Dynamic_Service.h"
 #include "ace/OS_NS_string.h"
@@ -25,10 +39,10 @@
 
 #if defined (ACE_ENABLE_TIMEPROBES)
 
-static const char *TAO_Servant_Base_Timeprobe_Description[] =
+static const char *TAO_ServantBase_Timeprobe_Description[] =
 {
-  "Servant_Base::_find - start",
-  "Servant_Base::_find - end"
+  "TAO_ServantBase::_find - start",
+  "TAO_ServantBase::_find - end"
 };
 
 enum
@@ -38,7 +52,7 @@ enum
   };
 
 // Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Servant_Base_Timeprobe_Description,
+ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_ServantBase_Timeprobe_Description,
                                   TAO_SERVANT_BASE_FIND_START);
 
 #endif /* ACE_ENABLE_TIMEPROBES */
@@ -78,6 +92,340 @@ TAO_ServantBase::_default_POA (void)
   return PortableServer::POA::_narrow (object.in ());
 }
 
+
+void
+TAO_ServantBase::_is_a_skel (TAO_ServerRequest & server_request,
+                             TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR(servant_upcall),
+                             TAO_ServantBase *servant)
+{
+#if TAO_HAS_INTERCEPTORS == 1
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+
+  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
+  TAO::SArg_Traits< char *>::in_arg_val _tao_repository_id;
+
+  TAO::Argument * const args[] =
+    {
+      &retval,
+      &_tao_repository_id
+    };
+
+  static size_t const nargs = 2;
+
+  _is_a_Upcall_Command command (
+    servant,
+    args);
+
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         );
+}
+
+void
+TAO_ServantBase::_is_a_thru_poa_skel (TAO_ServerRequest & server_request,
+                                      TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall),
+                                      TAO_ServantBase *servant)
+{
+#if TAO_HAS_INTERCEPTORS == 1
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+
+  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
+  TAO::SArg_Traits< char *>::in_arg_val _tao_repository_id;
+
+  TAO::Argument * const args[] =
+    {
+      &retval,
+      &_tao_repository_id
+    };
+
+  static size_t const nargs = 2;
+
+  _is_a_thru_poa_Upcall_Command command (
+    servant,
+    server_request.operation_details (),
+    args);
+
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         );
+}
+
+
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+void
+TAO_ServantBase::_non_existent_skel (TAO_ServerRequest & server_request,
+                                    TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall),
+                                    TAO_ServantBase *servant)
+{
+#if TAO_HAS_INTERCEPTORS == 1
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+
+  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
+
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+
+  static size_t const nargs = 1;
+
+  _non_existent_Upcall_Command command (
+    servant,
+    args);
+
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         );
+}
+
+void TAO_ServantBase::_non_existent_thru_poa_skel (TAO_ServerRequest & server_request,
+                                                  TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall),
+                                                  TAO_ServantBase *servant)
+{
+#if TAO_HAS_INTERCEPTORS == 1
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+
+  TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
+
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+
+  static size_t const nargs = 1;
+
+  _non_existent_thru_poa_Upcall_Command command (
+    servant,
+    server_request.operation_details (),
+    args);
+
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         );
+}
+
+
+# if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+void
+TAO_ServantBase::_interface_skel (TAO_ServerRequest & server_request,
+                                  TAO::Portable_Server::Servant_Upcall* /* servant_upcall */,
+                                  TAO_ServantBase *servant)
+{
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ());
+
+  if (!_tao_adapter)
+    {
+      throw ::CORBA::INTF_REPOS (::CORBA::OMGVMCID | 1, ::CORBA::COMPLETED_NO);
+    }
+
+  ::CORBA::InterfaceDef_ptr _tao_retval = servant->_get_interface ();
+  server_request.init_reply ();
+  TAO_OutputCDR &_tao_out = *server_request.outgoing ();
+
+  ::CORBA::Boolean const _tao_result =
+    _tao_adapter->interfacedef_cdr_insert (_tao_out, _tao_retval);
+
+  _tao_adapter->dispose (_tao_retval);
+
+  if (!_tao_result)
+    {
+      throw ::CORBA::MARSHAL ();
+    }
+}
+
+void
+TAO_ServantBase::_component_skel (TAO_ServerRequest & server_request,
+                                  TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall),
+                                  TAO_ServantBase *servant)
+{
+#if TAO_HAS_INTERCEPTORS == 1
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+
+  TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
+
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+
+  static size_t const nargs = 1;
+
+  _get_component_Upcall_Command command (
+    servant,
+    args);
+
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         );
+}
+
+void
+TAO_ServantBase::_component_thru_poa_skel (TAO_ServerRequest & server_request,
+                                          TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall),
+                                          TAO_ServantBase *servant)
+{
+#if TAO_HAS_INTERCEPTORS == 1
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+
+  TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
+
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+
+  static size_t const nargs = 1;
+
+  _get_component_thru_poa_Upcall_Command command (
+    servant,
+    server_request.operation_details (),
+    args);
+
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         );
+}
+
+# endif /* !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */
+
+
+
+void
+TAO_ServantBase::_repository_id_skel (TAO_ServerRequest & server_request,
+                                      TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall),
+                                      TAO_ServantBase *servant)
+{
+#if TAO_HAS_INTERCEPTORS == 1
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+
+  TAO::SArg_Traits< char *>::ret_val retval;
+
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+
+  static size_t const nargs = 1;
+
+  _repository_id_Upcall_Command command (
+    servant,
+    args);
+
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         );
+}
+
+void
+TAO_ServantBase::_repository_id_thru_poa_skel (TAO_ServerRequest & server_request,
+                                              TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall),
+                                              TAO_ServantBase *servant)
+{
+#if TAO_HAS_INTERCEPTORS == 1
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+
+  TAO::SArg_Traits< char *>::ret_val retval;
+
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+
+  static size_t const nargs = 1;
+
+  _repository_id_thru_poa_Upcall_Command command (
+    servant,
+    server_request.operation_details (),
+    args);
+
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         );
+}
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
 CORBA::Boolean
 TAO_ServantBase::_is_a (const char *logical_type_id)
 {
@@ -85,6 +433,7 @@ TAO_ServantBase::_is_a (const char *logical_type_id)
   return ACE_OS::strcmp (logical_type_id, id) == 0;
 }
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
 CORBA::Boolean
 TAO_ServantBase::_non_existent (void)
 {
@@ -109,17 +458,19 @@ TAO_ServantBase::_get_interface (void)
                                  this->_interface_repository_id ());
 }
 
+#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 CORBA::Object_ptr
 TAO_ServantBase::_get_component (void)
 {
   return CORBA::Object::_nil ();
 }
-
+#endif
 char *
 TAO_ServantBase::_repository_id (void)
 {
   return CORBA::string_dup (this->_interface_repository_id ());
 }
+#endif /* TAO_HAS_MINIMUM_CORBA */
 
 int
 TAO_ServantBase::_find (const char *opname,
@@ -182,9 +533,11 @@ TAO_ServantBase::_create_stub (void)
   return stub;
 }
 
-void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest & req,
-                                                   void * servant_upcall,
-                                                   void * derived_this)
+void
+TAO_ServantBase::synchronous_upcall_dispatch (
+  TAO_ServerRequest & req,
+  TAO::Portable_Server::Servant_Upcall* servant_upcall,
+  TAO_ServantBase *derived_this)
 {
   TAO_Skeleton skel;
   char const * const opname = req.operation ();
@@ -216,7 +569,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest & req,
     {
       // Invoke the skeleton, it will demarshal the arguments, invoke
       // the right operation on the skeleton class, and marshal any
-      // results.  De/marshaling will only occur in the uncollocated
+      // results.  De/marshaling will only occur in the not collocated
       // case.
       skel (req, servant_upcall, derived_this);
 
@@ -251,13 +604,13 @@ void TAO_ServantBase::synchronous_upcall_dispatch (TAO_ServerRequest & req,
             req.tao_send_reply_exception (ex);
         }
     }
-
-  return;
 }
 
-void TAO_ServantBase::asynchronous_upcall_dispatch (TAO_ServerRequest & req,
-                                                    void * servant_upcall,
-                                                    void * derived_this)
+void
+TAO_ServantBase::asynchronous_upcall_dispatch (
+  TAO_ServerRequest &req,
+  TAO::Portable_Server::Servant_Upcall *servant_upcall,
+  TAO_ServantBase *derived_this)
 {
   TAO_Skeleton skel;
   const char *opname = req.operation ();
@@ -284,7 +637,7 @@ void TAO_ServantBase::asynchronous_upcall_dispatch (TAO_ServerRequest & req,
     {
       // Invoke the skeleton, it will demarshal the arguments, invoke
       // the right operation on the skeleton class, and marshal any
-      // results.  De/marshaling will only occur in the uncollocated
+      // results.  De/marshaling will only occur in the not collocated
       // case.
       skel (req, servant_upcall, derived_this);
 
@@ -294,7 +647,6 @@ void TAO_ServantBase::asynchronous_upcall_dispatch (TAO_ServerRequest & req,
       // Return immediately. Do not send a reply; this is an
       // asynchronous upcall. (unless, of course there is a system
       // exception.
-
     }
   catch (const ::CORBA::Exception& ex)
     {
@@ -302,8 +654,6 @@ void TAO_ServantBase::asynchronous_upcall_dispatch (TAO_ServerRequest & req,
       // the appropriate reply to the client
       req.tao_send_reply_exception (ex);
     }
-
-  return;
 }
 
 void
diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h
index f2e43803cb4..59718ff0ae2 100644
--- a/TAO/tao/PortableServer/Servant_Base.h
+++ b/TAO/tao/PortableServer/Servant_Base.h
@@ -70,23 +70,63 @@ public:
   /// Destructor.
   virtual ~TAO_ServantBase (void);
 
+  static void _is_a_skel (TAO_ServerRequest & req,
+                          TAO::Portable_Server::Servant_Upcall* servant_upcall,
+                          TAO_ServantBase *servant);
+
+  static void _is_a_thru_poa_skel (TAO_ServerRequest & server_request,
+                                   TAO::Portable_Server::Servant_Upcall* servant_upcall,
+                                   TAO_ServantBase *servant);
+
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+  static void _non_existent_skel (TAO_ServerRequest & req,
+                                  TAO::Portable_Server::Servant_Upcall* servant_upcall,
+                                  TAO_ServantBase *servant);
+  static void _non_existent_thru_poa_skel (TAO_ServerRequest & server_request,
+                                           TAO::Portable_Server::Servant_Upcall* servant_upcall,
+                                           TAO_ServantBase *servant);
+
+# if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
+  static void _interface_skel (TAO_ServerRequest & req,
+                               TAO::Portable_Server::Servant_Upcall* servant_upcall,
+                               TAO_ServantBase *servant);
+
+  static void _component_skel (TAO_ServerRequest & req,
+                               TAO::Portable_Server::Servant_Upcall* servant_upcall,
+                               TAO_ServantBase *servant);
+  static void _component_thru_poa_skel (TAO_ServerRequest & server_request,
+                                        TAO::Portable_Server::Servant_Upcall* servant_upcall,
+                                        TAO_ServantBase *servant);
+# endif /* !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */
+  static void _repository_id_skel (TAO_ServerRequest & req,
+                                  TAO::Portable_Server::Servant_Upcall* servant_upcall,
+                                  TAO_ServantBase *servant);
+  static void _repository_id_thru_poa_skel (TAO_ServerRequest & server_request,
+                                            TAO::Portable_Server::Servant_Upcall* servant_upcall,
+                                            TAO_ServantBase *servant);
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
   /// Returns the default POA for this servant.
   virtual PortableServer::POA_ptr _default_POA (void);
 
   /// Local implementation of the CORBA::Object::_is_a method.
   virtual CORBA::Boolean _is_a (const char *logical_type_id);
 
+#if (TAO_HAS_MINIMUM_CORBA == 0)
   /// Default _non_existent: always returns false.
   virtual CORBA::Boolean _non_existent (void);
 
   /// Query the Interface Repository for the interface definition.
   virtual CORBA::InterfaceDef_ptr _get_interface (void);
 
+#if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
   /// Default _get_component: always returns CORBA::Object::_nil().
   virtual CORBA::Object_ptr _get_component (void);
+#endif
 
   /// Get the repository id.
   virtual char * _repository_id (void);
+#endif /* TAO_HAS_MINIMUM_CORBA */
 
   /// This is an auxiliary method for _this() and _narrow().
   virtual TAO_Stub *_create_stub (void);
@@ -98,7 +138,9 @@ public:
    * results and out parameters (if any) or the exceptions thrown into
    * @a request.
    */
-  virtual void _dispatch (TAO_ServerRequest &request, void *servant_upcall) = 0;
+  virtual void _dispatch (
+    TAO_ServerRequest &request,
+    TAO::Portable_Server::Servant_Upcall* servant_upcall) = 0;
 
   /// Please see documentation in tao/Abstract_Servant_Base.h for
   /// details.
@@ -154,13 +196,15 @@ protected:
   /// Assignment operator.
   TAO_ServantBase &operator= (const TAO_ServantBase &);
 
-  virtual void synchronous_upcall_dispatch (TAO_ServerRequest & req,
-                                            void * servant_upcall,
-                                            void * derived_this);
+  void synchronous_upcall_dispatch (
+    TAO_ServerRequest & req,
+    TAO::Portable_Server::Servant_Upcall* servant_upcall,
+    TAO_ServantBase *derived_this);
 
-  virtual void asynchronous_upcall_dispatch (TAO_ServerRequest & req,
-                                             void * servant_upcall,
-                                             void * derived_this);
+  void asynchronous_upcall_dispatch (
+    TAO_ServerRequest & req,
+    TAO::Portable_Server::Servant_Upcall* servant_upcall,
+    TAO_ServantBase *derived_this);
 
 protected:
   /// Reference counter.
diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Upcall_Wrapper.cpp
index f3dad5e121c..501da0d9e18 100644
--- a/TAO/tao/PortableServer/Upcall_Wrapper.cpp
+++ b/TAO/tao/PortableServer/Upcall_Wrapper.cpp
@@ -28,7 +28,7 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
                              size_t nargs,
                              TAO::Upcall_Command & command
 #if TAO_HAS_INTERCEPTORS == 1
-                             , void * servant_upcall
+                             , TAO::Portable_Server::Servant_Upcall *servant_upcall
                              , CORBA::TypeCode_ptr const * exceptions
                              , CORBA::ULong nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.h b/TAO/tao/PortableServer/Upcall_Wrapper.h
index 2138e0b62e9..98d88847e87 100644
--- a/TAO/tao/PortableServer/Upcall_Wrapper.h
+++ b/TAO/tao/PortableServer/Upcall_Wrapper.h
@@ -43,6 +43,11 @@ namespace TAO
   class Argument;
   class Upcall_Command;
 
+  namespace Portable_Server
+  {
+    class Servant_Upcall;
+  }
+
   /**
    * @class Upcall_Wrapper
    *
@@ -68,7 +73,6 @@ namespace TAO
      *                       argument list.
      * @param command        @c Command object that performs the
      *                       actual upcall into the servant.
-     *
      * @param servant_upcall Object containing information for POA
      *                       that dispatched the servant.
      * @param exceptions     Array of user exceptions the operation
@@ -81,7 +85,7 @@ namespace TAO
                  size_t nargs,
                  TAO::Upcall_Command & command
 #if TAO_HAS_INTERCEPTORS == 1
-                 , void * servant_upcall
+                 , TAO::Portable_Server::Servant_Upcall *servant_upcall
                  , CORBA::TypeCode_ptr const * exceptions
                  , CORBA::ULong nexceptions
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/ServerRequestInterceptor_Adapter.h b/TAO/tao/ServerRequestInterceptor_Adapter.h
index 5a3f55db4bb..6b3577c198d 100644
--- a/TAO/tao/ServerRequestInterceptor_Adapter.h
+++ b/TAO/tao/ServerRequestInterceptor_Adapter.h
@@ -56,6 +56,11 @@ namespace TAO
   class PICurrent_Impl;
   class Upcall_Command;
 
+  namespace Portable_Server
+  {
+    class Servant_Upcall;
+  }
+
   /**
    * @class ServerRequestInterceptor_Adapter
    */
@@ -80,7 +85,7 @@ namespace TAO
         TAO_ServerRequest &server_request,
         TAO::Argument * const args[],
         size_t nargs,
-        void * servant_upcall,
+        TAO::Portable_Server::Servant_Upcall *servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
         CORBA::ULong nexceptions,
         CORBA::OctetSeq_out oc) = 0;
@@ -97,7 +102,7 @@ namespace TAO
         TAO_ServerRequest &server_request,
         TAO::Argument * const args[],
         size_t nargs,
-        void * servant_upcall,
+        TAO::Portable_Server::Servant_Upcall *servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
         CORBA::ULong nexceptions) = 0;
 
@@ -106,7 +111,7 @@ namespace TAO
         TAO_ServerRequest &server_request,
         TAO::Argument * const args[],
         size_t nargs,
-        void * servant_upcall,
+        TAO::Portable_Server::Servant_Upcall *servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
         CORBA::ULong nexceptions) = 0;
 
@@ -116,7 +121,7 @@ namespace TAO
         TAO_ServerRequest &server_request,
         TAO::Argument * const args[],
         size_t nargs,
-        void * servant_upcall,
+        TAO::Portable_Server::Servant_Upcall *servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
         CORBA::ULong nexceptions) = 0;
 
@@ -126,7 +131,7 @@ namespace TAO
         TAO_ServerRequest &server_request,
         TAO::Argument * const args[],
         size_t nargs,
-        void * servant_upcall,
+        TAO::Portable_Server::Servant_Upcall *servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
         CORBA::ULong nexceptions) = 0;
 
@@ -136,7 +141,7 @@ namespace TAO
         TAO_ServerRequest &server_request,
         TAO::Argument * const args[],
         size_t nargs,
-        void * servant_upcall,
+        TAO::Portable_Server::Servant_Upcall *servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
         CORBA::ULong nexceptions) = 0;
     //@}
@@ -148,8 +153,7 @@ namespace TAO
     /// Register an interceptor with policies.
     virtual void add_interceptor (
       PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
-      const CORBA::PolicyList& policies
-      ) = 0;
+      const CORBA::PolicyList& policies) = 0;
 
     virtual TAO::PICurrent_Impl *allocate_pi_current (void) = 0;
 
diff --git a/TAO/tao/Strategies/COIOP_Transport.h b/TAO/tao/Strategies/COIOP_Transport.h
index 597899a0b71..e80adec2978 100644
--- a/TAO/tao/Strategies/COIOP_Transport.h
+++ b/TAO/tao/Strategies/COIOP_Transport.h
@@ -99,7 +99,7 @@ public:
 
   virtual int send_message (TAO_OutputCDR &stream,
                             TAO_Stub *stub = 0,
-                            TAO_Message_Semantics message_semantics = TAO_TWOWAY_REQUEST,
+                            TAO_Message_Semantics message_semantics = TAO_Message_Semantics (),
                             ACE_Time_Value *max_time_wait = 0);
 
 private:
diff --git a/TAO/tao/Strategies/DIOP_Transport.h b/TAO/tao/Strategies/DIOP_Transport.h
index 3aefc215c63..1cba2212e5c 100644
--- a/TAO/tao/Strategies/DIOP_Transport.h
+++ b/TAO/tao/Strategies/DIOP_Transport.h
@@ -98,7 +98,7 @@ public:
 
   virtual int send_message (TAO_OutputCDR &stream,
                             TAO_Stub *stub = 0,
-                            TAO_Message_Semantics message_semantics = TAO_TWOWAY_REQUEST,
+                            TAO_Message_Semantics message_semantics = TAO_Message_Semantics (),
                             ACE_Time_Value *max_time_wait = 0);
 
 private:
diff --git a/TAO/tao/Strategies/SCIOP_Transport.h b/TAO/tao/Strategies/SCIOP_Transport.h
index 7f1787c40b2..b46bbda512f 100644
--- a/TAO/tao/Strategies/SCIOP_Transport.h
+++ b/TAO/tao/Strategies/SCIOP_Transport.h
@@ -90,7 +90,7 @@ public:
 
   virtual int send_message (TAO_OutputCDR &association,
                             TAO_Stub *stub = 0,
-                            TAO_Message_Semantics message_semantics = TAO_TWOWAY_REQUEST,
+                            TAO_Message_Semantics message_semantics = TAO_Message_Semantics (),
                             ACE_Time_Value *max_time_wait = 0);
 
   /*virtual int send_reply (TAO_OutputCDR &stream,
diff --git a/TAO/tao/Strategies/SHMIOP_Transport.h b/TAO/tao/Strategies/SHMIOP_Transport.h
index 63d446f547a..186f6a62860 100644
--- a/TAO/tao/Strategies/SHMIOP_Transport.h
+++ b/TAO/tao/Strategies/SHMIOP_Transport.h
@@ -96,7 +96,7 @@ public:
 
   virtual int send_message (TAO_OutputCDR &stream,
                             TAO_Stub *stub = 0,
-                            TAO_Message_Semantics message_semantics = TAO_TWOWAY_REQUEST,
+                            TAO_Message_Semantics message_semantics = TAO_Message_Semantics (),
                             ACE_Time_Value *max_time_wait = 0);
 
 private:
diff --git a/TAO/tao/Strategies/UIOP_Transport.h b/TAO/tao/Strategies/UIOP_Transport.h
index a0dfe3fbda3..d103a35da5f 100644
--- a/TAO/tao/Strategies/UIOP_Transport.h
+++ b/TAO/tao/Strategies/UIOP_Transport.h
@@ -90,7 +90,7 @@ public:
 
   virtual int send_message (TAO_OutputCDR &stream,
                             TAO_Stub *stub = 0,
-                            TAO_Message_Semantics message_semantics = TAO_TWOWAY_REQUEST,
+                            TAO_Message_Semantics message_semantics = TAO_Message_Semantics (),
                             ACE_Time_Value *max_time_wait = 0);
   //@}
 
diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp
index de7f3e18ad4..29b16cef49d 100644
--- a/TAO/tao/Synch_Invocation.cpp
+++ b/TAO/tao/Synch_Invocation.cpp
@@ -92,7 +92,7 @@ namespace TAO
 
         cdr.message_attributes (this->details_.request_id (),
                                 this->resolver_.stub (),
-                                TAO_TWOWAY_REQUEST,
+                                TAO_Message_Semantics (),
                                 max_wait_time);
 
         this->write_header (cdr);
@@ -118,7 +118,7 @@ namespace TAO
         countdown.update ();
 
         s = this->send_message (cdr,
-                                TAO_TWOWAY_REQUEST,
+                                TAO_Message_Semantics (),
                                 max_wait_time);
 
         ace_mon.release();
@@ -143,7 +143,7 @@ namespace TAO
         countdown.update ();
 
         // For some strategies one may want to release the transport
-        // back to  cache. If the idling is successful let the
+        // back to cache. If the idling is successful let the
         // resolver about that.
         if (transport->idle_after_send ())
           this->resolver_.transport_released ();
@@ -152,7 +152,7 @@ namespace TAO
         // here; need to investigate.  Client threads would frequently be
         // canceled sometime during recv_request ... the correct action to
         // take on being canceled is to issue a CancelRequest message to the
-        // server and then imediately let other client-side cancellation
+        // server and then immediately let other client-side cancellation
         // handlers do their jobs.
         //
         // In C++, that basically means to unwind the stack using almost
@@ -690,7 +690,7 @@ namespace TAO
 
     cdr.message_attributes (this->details_.request_id (),
           this->resolver_.stub (),
-          TAO_ONEWAY_REQUEST,
+          TAO_Message_Semantics (TAO_Message_Semantics::TAO_ONEWAY_REQUEST),
           max_wait_time);
 
     this->write_header (cdr);
@@ -703,7 +703,7 @@ namespace TAO
       {
         // We have a connected transport so we can send the message
         s = this->send_message (cdr,
-              TAO_ONEWAY_REQUEST,
+            TAO_Message_Semantics (TAO_Message_Semantics::TAO_ONEWAY_REQUEST),
               max_wait_time);
       }
     else
diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp
index b1c13838012..db0dd223551 100644
--- a/TAO/tao/TAO_Server_Request.cpp
+++ b/TAO/tao/TAO_Server_Request.cpp
@@ -266,7 +266,7 @@ TAO_ServerRequest::init_reply (void)
 
   this->outgoing_->message_attributes (this->request_id_,
                                        0,
-                                       TAO_REPLY,
+                                       TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY),
                                        0);
 
   // Construct a REPLY header.
@@ -313,7 +313,7 @@ TAO_ServerRequest::send_no_exception_reply (void)
 
   this->outgoing_->message_attributes (this->request_id_,
                                        0,
-                                       TAO_REPLY,
+                                       TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY),
                                        0);
 
   // Construct a REPLY header.
@@ -324,7 +324,7 @@ TAO_ServerRequest::send_no_exception_reply (void)
   // Send the message.
   int const result = this->transport_->send_message (*this->outgoing_,
                                                      0,
-                                                     TAO_REPLY);
+                                                     TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY));
 
   if (result == -1)
     {
@@ -351,7 +351,7 @@ TAO_ServerRequest::tao_send_reply (void)
 
   int const result = this->transport_->send_message (*this->outgoing_,
                                                      0,
-                                                     TAO_REPLY);
+                                                     TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY));
   if (result == -1)
     {
       if (TAO_debug_level > 0)
@@ -439,7 +439,7 @@ TAO_ServerRequest::tao_send_reply_exception (const CORBA::Exception &ex)
           // Send the message
           if (this->transport_->send_message (*this->outgoing_,
                                               0,
-                                              TAO_REPLY) == -1)
+                                              TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY)) == -1)
             {
               ACE_ERROR ((LM_ERROR,
                           ACE_TEXT ("TAO (%P|%t) - ServerRequest::")
@@ -520,7 +520,7 @@ TAO_ServerRequest::send_cached_reply (CORBA::OctetSeq &s)
 
   this->outgoing_->message_attributes (this->request_id_,
                                        0,
-                                       TAO_REPLY,
+                                       TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY),
                                        0);
 
   // Make the reply message
@@ -550,7 +550,7 @@ TAO_ServerRequest::send_cached_reply (CORBA::OctetSeq &s)
   // Send the message
   if (this->transport_->send_message (*this->outgoing_,
                                       0,
-                                      TAO_REPLY) == -1)
+                                      TAO_Message_Semantics (TAO_Message_Semantics::TAO_REPLY)) == -1)
     {
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("TAO (%P|%t) - ServerRequest::send_cached_reply, ")
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index a0978632a82..ce7224a2287 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -387,6 +387,14 @@ TAO_Transport::register_handler (void)
       return 0;
     }
 
+  if (TAO_debug_level > 6)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("TAO (%P|%t) - Transport[%d]::register_handler - ")
+                  ACE_TEXT ("registering event handler with reactor\n"),
+                  this->id ()));
+    }
+
   // Set the flag in the Connection Handler and in the Wait Strategy
   // @@Maybe we should set these flags after registering with the
   // reactor. What if the  registration fails???
@@ -397,6 +405,64 @@ TAO_Transport::register_handler (void)
                               ACE_Event_Handler::READ_MASK);
 }
 
+int
+TAO_Transport::remove_handler (void)
+{
+  if (TAO_debug_level > 4)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("TAO (%P|%t) - Transport[%d]::remove_handler\n"),
+                  this->id ()));
+    }
+
+  ACE_Reactor * const r = this->orb_core_->reactor ();
+
+  // @@note: This should be okay since the remove handler call will
+  // not make a nested call into the transport.
+  ACE_GUARD_RETURN (ACE_Lock,
+                    ace_mon,
+                    *this->handler_lock_,
+                    false);
+
+
+  if (this->event_handler_i ()->reactor () == 0)
+    {
+      return 0;
+    }
+
+  if (TAO_debug_level > 6)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("TAO (%P|%t) - Transport[%d]::remove_handler - ")
+                  ACE_TEXT ("removing event handler from reactor\n"),
+                  this->id ()));
+    }
+
+  // Set the flag in the Wait Strategy
+  this->ws_->is_registered (false);
+
+  // Remove the handler from the reactor
+  if (r->remove_handler (this->event_handler_i (),
+                         ACE_Event_Handler::READ_MASK|
+                         ACE_Event_Handler::DONT_CALL) == -1)
+    {
+      if (TAO_debug_level > 0)
+        ACE_ERROR ((LM_ERROR,
+                    ACE_TEXT ("TAO (%P|%t) - Transport[%d]::remove_handler - ")
+                    ACE_TEXT ("reactor->remove_handler failed\n"),
+                    this->id ()));
+      return -1;
+    }
+  else
+    {
+      // reset the reactor property of the event handler or
+      // Transport::register_handler() will not re-register
+      // when called after us again.
+      this->event_handler_i ()->reactor (0);
+      return 0;
+    }
+}
+
 #if TAO_HAS_SENDFILE == 1
 ssize_t
 TAO_Transport::sendfile (TAO_MMAP_Allocator * /* allocator */,
@@ -1317,17 +1383,17 @@ TAO_Transport::send_message_shared_i (TAO_Stub *stub,
   size_t const message_length = message_block->length ();
 #endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
 
-  switch (message_semantics)
+  switch (message_semantics.type_)
     {
-      case TAO_TWOWAY_REQUEST:
+      case TAO_Message_Semantics::TAO_TWOWAY_REQUEST:
         ret = this->send_synchronous_message_i (message_block, max_wait_time);
         break;
 
-      case TAO_REPLY:
+      case TAO_Message_Semantics::TAO_REPLY:
         ret = this->send_reply_message_i (message_block, max_wait_time);
         break;
 
-      case TAO_ONEWAY_REQUEST:
+      case TAO_Message_Semantics::TAO_ONEWAY_REQUEST:
         ret = this->send_asynchronous_message_i (stub,
                                                  message_block,
                                                  max_wait_time);
diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h
index 5a768714b81..47fd8e3b4a0 100644
--- a/TAO/tao/Transport.h
+++ b/TAO/tao/Transport.h
@@ -244,14 +244,14 @@ namespace TAO
  *  - Minimize locking and copying overhead when trying to attack the
  *    above.
  *
- * <H3> Parsing messages (GIOP) & processing the message:</H3>
+ * <H3>Parsing messages (GIOP) & processing the message:</H3>
  *
  * The messages should be checked for validity and the right
  * information should be sent to the higher layer for processing. The
  * process of doing a sanity check and preparing the messages for the
  * higher layers of the ORB are done by the messaging protocol.
  *
- * <H3> Design forces and Challenges </H3>
+ * <H3>Design forces and Challenges </H3>
  *
  * To keep things as efficient as possible for medium sized requests,
  * it would be good to minimize data copying and locking along the
@@ -293,7 +293,7 @@ namespace TAO
  *       message from the queue and processes that. Once the queue
  *       is drained the last thread resumes the handle.
  *
- * <H3> Sending Replies </H3>
+ * <H3>Sending Replies </H3>
  *
  * We could use the outgoing path of the ORB to send replies. This
  * would allow us to reuse most of the code in the outgoing data
@@ -304,7 +304,7 @@ namespace TAO
  * Reactor could potentially handle other messages (incoming or
  * outgoing) and the stack starts growing leading to crashes.
  *
- * <H4> Solution to the nesting problem </H4>
+ * <H4>Solution to the nesting problem </H4>
  *
  * The solution that we (plan to) adopt is pretty straight
  * forward. The thread sending replies will not block to send the
@@ -474,6 +474,9 @@ public:
    */
   virtual int register_handler (void);
 
+  /// Remove the handler from the reactor.
+  virtual int remove_handler (void);
+
   /// Write the complete Message_Block chain to the connection.
   /**
    * This method serializes on handler_lock_, guaranteeing that only
@@ -757,7 +760,7 @@ public:
    */
   virtual int send_message (TAO_OutputCDR &stream,
                             TAO_Stub *stub = 0,
-                            TAO_Message_Semantics message_semantics = TAO_TWOWAY_REQUEST,
+                            TAO_Message_Semantics message_semantics = TAO_Message_Semantics (),
                             ACE_Time_Value *max_time_wait = 0) = 0;
 
   /// Sent the contents of @a message_block
diff --git a/TAO/tao/Transport_Mux_Strategy.h b/TAO/tao/Transport_Mux_Strategy.h
index 94eeef24060..ba7ebd62068 100644
--- a/TAO/tao/Transport_Mux_Strategy.h
+++ b/TAO/tao/Transport_Mux_Strategy.h
@@ -58,7 +58,7 @@ public:
 
   /**
    * Unbind the dispatcher, the client is no longer waiting for the
-   * request, for example, because the request timedout.
+   * request, for example, because the request timed out.
    * The strategy can (must) cleanup any resources associated with the
    * request.
    * A later reply for that request should be ignored.
diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h
index 6d076dcb9c2..f4fd56ca3ed 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -5,5 +5,5 @@
 
 #define TAO_MAJOR_VERSION 2
 #define TAO_MINOR_VERSION 0
-#define TAO_BETA_VERSION 5
-#define TAO_VERSION "2.0.5"
+#define TAO_BETA_VERSION 6
+#define TAO_VERSION "2.0.6"
diff --git a/TAO/tao/Wait_On_Leader_Follower.cpp b/TAO/tao/Wait_On_Leader_Follower.cpp
index 75c8282e18a..b0571018861 100644
--- a/TAO/tao/Wait_On_Leader_Follower.cpp
+++ b/TAO/tao/Wait_On_Leader_Follower.cpp
@@ -46,7 +46,7 @@ TAO_Wait_On_Leader_Follower::non_blocking (void) const
 
 int
 TAO_Wait_On_Leader_Follower::sending_request (TAO_ORB_Core *orb_core,
-                                              int two_way)
+                                              TAO_Message_Semantics msg_semantics)
 {
   // Register the handler.
   if (!this->is_registered_)
@@ -56,7 +56,7 @@ TAO_Wait_On_Leader_Follower::sending_request (TAO_ORB_Core *orb_core,
 
   // Send the request.
 //@@ LF_WAIT_STRATEGY_SPL_SENDING_REQUEST_HOOK
-  return this->TAO_Wait_Strategy::sending_request (orb_core, two_way);
+  return this->TAO_Wait_Strategy::sending_request (orb_core, msg_semantics);
 }
 
 int
diff --git a/TAO/tao/Wait_On_Leader_Follower.h b/TAO/tao/Wait_On_Leader_Follower.h
index c10247bb8d9..ab824f0c3a0 100644
--- a/TAO/tao/Wait_On_Leader_Follower.h
+++ b/TAO/tao/Wait_On_Leader_Follower.h
@@ -48,7 +48,7 @@ public:
   virtual ~TAO_Wait_On_Leader_Follower (void);
 
    /*! @copydoc TAO_Wait_Strategy::sending_request() */
-  virtual int sending_request (TAO_ORB_Core *orb_core, int two_way);
+  virtual int sending_request (TAO_ORB_Core *orb_core, TAO_Message_Semantics msg_semantics);
 
    /*! @copydoc TAO_Wait_Strategy::wait() */
   virtual int wait (ACE_Time_Value *max_wait_time,
diff --git a/TAO/tao/Wait_On_Read.cpp b/TAO/tao/Wait_On_Read.cpp
index 4127b6b8c5f..bb9ce367838 100644
--- a/TAO/tao/Wait_On_Read.cpp
+++ b/TAO/tao/Wait_On_Read.cpp
@@ -30,6 +30,49 @@ TAO_Wait_On_Read::~TAO_Wait_On_Read (void)
 
 //@@ WAIT_STRATEGY_SPL_COPY_HOOK_START
 
+int
+TAO_Wait_On_Read::sending_request (TAO_ORB_Core *orb_core,
+                                   TAO_Message_Semantics msg_semantics)
+{
+  if ((this->transport_->opened_as () == TAO::TAO_CLIENT_ROLE) &&
+      (this->transport_->bidirectional_flag () == -1))
+    {
+      // register the transport for event handling in case of AMI requests because
+      // for these requests explicitly require event handling.
+      if (msg_semantics.type_ == TAO_Message_Semantics::TAO_ONEWAY_REQUEST &&
+          msg_semantics.mode_ == TAO_Message_Semantics::TAO_ASYNCH_CALLBACK)
+        {
+          // Register the handler unless already registered (should never happen).
+          if (!this->is_registered_)
+            {
+              this->transport_->register_handler ();
+            }
+        }
+    }
+
+  // Send the request.
+//@@ LF_WAIT_STRATEGY_SPL_SENDING_REQUEST_HOOK
+  return this->TAO_Wait_Strategy::sending_request (orb_core, msg_semantics);
+}
+
+void
+TAO_Wait_On_Read::finished_request ()
+{
+  if ((this->transport_->opened_as () == TAO::TAO_CLIENT_ROLE) &&
+      (this->transport_->bidirectional_flag () == -1))
+    {
+      // ORB finished request handling so if the transport was registered for
+      // an AMI call, deregister it now
+      if (this->is_registered_)
+      {
+        this->transport_->remove_handler ();
+      }
+    }
+
+  //@@ LF_WAIT_STRATEGY_SPL_SENDING_REQUEST_HOOK
+    this->TAO_Wait_Strategy::finished_request ();
+}
+
 // Wait on the read operation.
 int
 TAO_Wait_On_Read::wait (ACE_Time_Value * max_wait_time,
diff --git a/TAO/tao/Wait_On_Read.h b/TAO/tao/Wait_On_Read.h
index f5cd69e2652..686342702a1 100644
--- a/TAO/tao/Wait_On_Read.h
+++ b/TAO/tao/Wait_On_Read.h
@@ -38,6 +38,12 @@ public:
   /// Destructor.
   virtual ~TAO_Wait_On_Read (void);
 
+  /*! @copydoc TAO_Wait_Strategy::sending_request() */
+  virtual int sending_request (TAO_ORB_Core *orb_core, TAO_Message_Semantics msg_semantics);
+
+   /*! @copydoc TAO_Wait_Strategy::finished_request() */
+  virtual void finished_request ();
+
   /*! @copydoc TAO_Wait_Strategy::wait() */
   virtual int wait (ACE_Time_Value *max_wait_time,
                     TAO_Synch_Reply_Dispatcher &rd);
diff --git a/TAO/tao/Wait_Strategy.cpp b/TAO/tao/Wait_Strategy.cpp
index cff977b9031..30e1707ac62 100644
--- a/TAO/tao/Wait_Strategy.cpp
+++ b/TAO/tao/Wait_Strategy.cpp
@@ -33,12 +33,17 @@ TAO_Wait_Strategy::defer_upcall (ACE_Event_Handler*)
  */
 //@@ LF_WAIT_STRATEGY_SPL_COMMENT_HOOK_START
 int
-TAO_Wait_Strategy::sending_request (TAO_ORB_Core *, int)
+TAO_Wait_Strategy::sending_request (TAO_ORB_Core *, TAO_Message_Semantics)
 {
   return 0;
 }
 //@@ LF_WAIT_STRATEGY_SPL_COMMENT_HOOK_END
 
+void
+TAO_Wait_Strategy::finished_request ()
+{
+}
+
 /*
  * Hook to specialize the Wait Strategy
  */
diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h
index 78cf346fce2..8b53e41e829 100644
--- a/TAO/tao/Wait_Strategy.h
+++ b/TAO/tao/Wait_Strategy.h
@@ -22,9 +22,11 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "tao/TAO_Export.h"
+#include /**/ "tao/Message_Semantics.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Time_Value;
+class ACE_Event_Handler;
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -32,7 +34,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_ORB_Core;
 class TAO_Transport;
 class TAO_Synch_Reply_Dispatcher;
-class ACE_Event_Handler;
 
 /**
  * @class TAO_Wait_Strategy
@@ -55,7 +56,11 @@ public:
    * variables because the reply may arrive *before* the user calls
    * wait.
    */
-  virtual int sending_request (TAO_ORB_Core *orb_core, int two_way);
+  virtual int sending_request (TAO_ORB_Core *orb_core, TAO_Message_Semantics msg_semantics);
+
+  // The ORB finished handling the request; either the reply was received
+  // and dispatched, the request timed out or the connection was closed.
+  virtual void finished_request ();
 
   /// Base class virtual method. Wait till the @c reply_received flag is
   /// true or the time expires.
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp
index 785d5909c98..ac2e0c1a57c 100644
--- a/TAO/tao/default_client.cpp
+++ b/TAO/tao/default_client.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-// $Id$
+// $Id: default_client.cpp 93686 2011-03-31 12:12:12Z johnnyw $
 
 #include "tao/default_client.h"
 #include "tao/Wait_On_Read.h"
@@ -34,6 +34,8 @@ TAO_Default_Client_Strategy_Factory::TAO_Default_Client_Strategy_Factory (void)
   this->wait_strategy_ = TAO_WAIT_ON_REACTOR;
 #elif defined (TAO_USE_WAIT_ON_LF_NO_UPCALL)
   this->wait_strategy_ = TAO_WAIT_ON_LF_NO_UPCALL;
+#elif defined (TAO_USE_WAIT_RW_STRATEGY)
+  this->wait_strategy_ = TAO_WAIT_ON_READ;
 #else
   this->wait_strategy_ = TAO_WAIT_ON_LEADER_FOLLOWER;
 #endif /* TAO_USE_ST_CLIENT_CONNECTION_HANDLER */
@@ -44,8 +46,14 @@ TAO_Default_Client_Strategy_Factory::TAO_Default_Client_Strategy_Factory (void)
   this->transport_mux_strategy_ = TAO_EXCLUSIVE_TMS;
 #endif /* TAO_USE_MUXED_TRANSPORT_MUX_STRATEGY */
 
+#if defined (TAO_USE_BLOCKING_CONNECT_STRATEGY)
+  this->connect_strategy_ = TAO_BLOCKED_CONNECT;
+#elif defined (TAO_USE_REACTIVE_CONNECT_STRATEGY)
+  this->connect_strategy_ = TAO_REACTIVE_CONNECT;
+#else
   // @todo: will be changed when other strategies are implemented.
   this->connect_strategy_ = TAO_LEADER_FOLLOWER_CONNECT;
+#endif
 }
 
 TAO_Default_Client_Strategy_Factory::~TAO_Default_Client_Strategy_Factory (void)
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index ed57244617e..cf02fc6404d 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-// $Id$
+// $Id: default_resource.cpp 93496 2011-03-07 09:37:27Z johnnyw $
 
 #include "tao/default_resource.h"
 
@@ -119,7 +119,13 @@ TAO_Default_Resource_Factory::TAO_Default_Resource_Factory (void)
   , use_local_memory_pool_ (false)
 #endif
   , cached_connection_lock_type_ (TAO_THREAD_LOCK)
+#if defined (TAO_USE_BLOCKING_FLUSHING)
+  , flushing_strategy_type_ (TAO_BLOCKING_FLUSHING)
+#elif defined (TAO_USE_REACTIVE_FLUSHING)
+  , flushing_strategy_type_ (TAO_REACTIVE_FLUSHING)
+#else
   , flushing_strategy_type_ (TAO_LEADER_FOLLOWER_FLUSHING)
+#endif
   , char_codeset_parameters_ ()
   , wchar_codeset_parameters_ ()
   , resource_usage_strategy_ (TAO_Resource_Factory::TAO_EAGER)
diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc
index e13989706e0..acd680317d0 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -62,11 +62,20 @@ project(TAO_Core_idl) : tao_versioning_idl_defaults, gen_ostream, install, pidl_
     WStringSeq.pidl >> AnyTypeCode/WStringSeqA.h AnyTypeCode/WStringSeqA.cpp
   }
 
+  IDL_Files {
+    idlflags += -GT -oS PortableServer -Gd \
+                -Wb,safe_include=tao/PolicyC.h \
+                -Wb,skel_export_macro=TAO_PortableServer_Export \
+                -Wb,skel_export_include=tao/PortableServer/portableserver_export.h
+    idlflags -= -SS
+    idlflags -= -Sorb
+    Policy.pidl >> PortableServer/PolicyS.h PortableServer/PolicyS.cpp PortableServer/PolicyS_T.h PortableServer/PolicyS_T.cpp AnyTypeCode/PolicyA.h AnyTypeCode/PolicyA.cpp
+  }
+
   PidlInstallWithoutBuilding_Files {
     InterfaceDef.pidl
     InvalidName.pidl
     Object_Key.pidl
-    Policy.pidl
     Typecode_types.pidl
     WrongTransaction.pidl
     orb.idl
@@ -656,6 +665,7 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, taoid
 
   Inline_Files {
     GIOPC.inl
+    PolicyC.inl
     *.inl
   }
 
diff --git a/TAO/tests/AMH_Exceptions/client.cpp b/TAO/tests/AMH_Exceptions/client.cpp
index 4145de92f4b..1f6cb71e638 100644
--- a/TAO/tests/AMH_Exceptions/client.cpp
+++ b/TAO/tests/AMH_Exceptions/client.cpp
@@ -70,6 +70,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
           roundtrip->shutdown ();
         }
+
+      orb->destroy ();
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp
index f8132bca70e..7f724da1493 100644
--- a/TAO/tests/AMH_Exceptions/server.cpp
+++ b/TAO/tests/AMH_Exceptions/server.cpp
@@ -84,7 +84,7 @@ public:
   virtual void run_event_loop ();
 
 public:
-  /// Accesor method (for servants) to the initialised ORB
+  /// Accesor method (for servants) to the initialized ORB
   CORBA::ORB_ptr orb () { return this->orb_.in (); }
 
 protected:
diff --git a/TAO/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp
index f1855318f91..066eeb5f5ae 100644
--- a/TAO/tests/AMI/client.cpp
+++ b/TAO/tests/AMI/client.cpp
@@ -22,6 +22,8 @@ const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int nthreads = 5;
 int niterations = 5;
 int debug = 0;
+int shutdown_flag = 0;
+int perform_work_flag = 1;
 int number_of_replies = 0;
 
 CORBA::Long in_number = 931232;
@@ -31,7 +33,7 @@ int parameter_corruption = 0;
 int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("dk:n:i:"));
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("dk:n:i:xw"));
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -49,6 +51,12 @@ parse_args (int argc, ACE_TCHAR *argv[])
       case 'i':
         niterations = ACE_OS::atoi (get_opts.opt_arg ());
         break;
+      case 'x':
+        shutdown_flag = 1;
+        break;
+      case 'w':
+        perform_work_flag = 0;
+        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -57,6 +65,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
                            "-k <ior> "
                            "-n <nthreads> "
                            "-i <niterations> "
+                           "-x"
                            "\n",
                            argv [0]),
                           -1);
@@ -233,35 +242,49 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       // <nthreads*niterations> replies.
       number_of_replies = nthreads *niterations;
 
-      if (debug)
+      if (perform_work_flag)
         {
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) : Entering perform_work loop to receive <%d> replies\n",
-                      number_of_replies));
-        }
+          if (debug)
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          "(%P|%t) : Entering perform_work loop to receive <%d> replies\n",
+                          number_of_replies));
+            }
 
-      // ORB loop.
+          // ORB loop.
 
-      while (number_of_replies > 0)
-        {
-          CORBA::Boolean pending = orb->work_pending();
+          while (number_of_replies > 0)
+            {
+              CORBA::Boolean pending = orb->work_pending();
+
+              if (pending)
+                {
+                  orb->perform_work();
+                }
+            }
 
-          if (pending)
+          if (debug)
             {
-              orb->perform_work();
+              ACE_DEBUG ((LM_DEBUG,
+                          "(%P|%t) : Exited perform_work loop\n"));
             }
         }
 
+      client.thr_mgr ()->wait ();
+
+      ACE_DEBUG ((LM_DEBUG, "threads finished\n"));
+
       if (debug)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) : Exited perform_work loop Received <%d> replies\n",
+                      "(%P|%t) : Received <%d> replies\n",
                       (nthreads*niterations) - number_of_replies));
         }
 
-      client.thr_mgr ()->wait ();
-
-      ACE_DEBUG ((LM_DEBUG, "threads finished\n"));
+      if (shutdown_flag)
+        {
+          server->shutdown ();
+        }
 
       root_poa->destroy (1,  // ethernalize objects
                          0);  // wait for completion
diff --git a/TAO/tests/AMI/exclusive_rw.conf b/TAO/tests/AMI/exclusive_rw.conf
new file mode 100644
index 00000000000..d7ed9ec9d14
--- /dev/null
+++ b/TAO/tests/AMI/exclusive_rw.conf
@@ -0,0 +1,4 @@
+# $Id$
+
+static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW -ORBConnectStrategy blocked"
+static Resource_Factory "-ORBFlushingStrategy blocking"
diff --git a/TAO/tests/AMI/exclusive_rw.conf.xml b/TAO/tests/AMI/exclusive_rw.conf.xml
new file mode 100644
index 00000000000..d9fdac7d3ae
--- /dev/null
+++ b/TAO/tests/AMI/exclusive_rw.conf.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0'?>
+<!-- Converted from ./tests/AMI/exclusive.conf by svcconf-convert.pl -->
+<ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
+ <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBclientconnectionhandler RW -ORBConnectStrategy blocked"/>
+ <static id="Resource_Factory" params="-ORBFlushingStrategy blocking"/>
+</ACE_Svc_Conf>
diff --git a/TAO/tests/AMI/run_exclusive_rw.pl b/TAO/tests/AMI/run_exclusive_rw.pl
new file mode 100755
index 00000000000..d89427bd6be
--- /dev/null
+++ b/TAO/tests/AMI/run_exclusive_rw.pl
@@ -0,0 +1,88 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "$ENV{ACE_ROOT}/bin";
+use PerlACE::TestTarget;
+
+my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
+my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
+
+$client_conf_base = "exclusive_rw$PerlACE::svcconf_ext";
+$client_conf = $client->LocalFile ($client_conf_base);
+if ($client->PutFile ($client_conf_base) == -1) {
+    print STDERR "ERROR: cannot set file <$client_conf>\n";
+    exit 1;
+}
+
+$server_debug_level = '0';
+$client_debug_level = '0';
+$iterations = '5';
+$threads = '5';
+
+foreach $i (@ARGV) {
+    if ($i eq '-debug') {
+        $server_debug_level = '10';
+        $client_debug_level = '10';
+    }
+}
+
+my $iorbase = "server.ior";
+my $server_iorfile = $server->LocalFile ($iorbase);
+my $client_iorfile = $client->LocalFile ($iorbase);
+$server->DeleteFile($iorbase);
+$client->DeleteFile($iorbase);
+
+$SV = $server->CreateProcess ("server", "-ORBdebuglevel $server_debug_level -o $server_iorfile");
+
+$server_status = $SV->Spawn ();
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    exit 1;
+}
+
+if ($server->WaitForFileTimed ($iorbase,
+                               $server->ProcessStartWaitInterval()) == -1) {
+    print STDERR "ERROR: cannot find file <$server_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+if ($server->GetFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot get file <$server_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+if ($client->PutFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot set file <$client_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+$CL = $client->CreateProcess ("client",
+                              "-ORBsvcconf $client_conf "
+                              . "-ORBdebuglevel $client_debug_level"
+                              . " -k file://$client_iorfile "
+                              . " -n $threads -i $iterations -d -x");
+
+$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval());
+
+if ($client_status != 0) {
+    print STDERR "ERROR: client returned $client_status\n";
+    $status = 1;
+}
+
+$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval());
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    $status = 1;
+}
+
+$server->DeleteFile($iorbase);
+$client->DeleteFile($iorbase);
+
+exit $status;
diff --git a/TAO/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp
index c7860c02cb5..c8dd6fb68b8 100644
--- a/TAO/tests/AMI/simple_client.cpp
+++ b/TAO/tests/AMI/simple_client.cpp
@@ -267,6 +267,34 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                                               l,
                                               "Let's talk SMI.");
 
+      for (ssize_t ni = 0; ni < niterations; ni++)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "Sending another asynch message: %d\n",
+                      ni));
+
+          ami_test_var->sendc_foo (the_handler_var.in (),
+                                   l,
+                                   "Let's talk AMI.");
+        }
+
+      if (debug)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "<%d> more asynchronous methods issued\n",
+                      niterations));
+        }
+
+      if (debug)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "Issuing a synchronous method to collect the AMI replies again\n"));
+        }
+
+      number = ami_test_var->foo (l,
+                                  l,
+                                  "Let's talk SMI.");
+
       if (debug)
         {
           ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/Alt_Mapping/alt_mapping.mpc b/TAO/tests/Alt_Mapping/alt_mapping.mpc
index 302f66953ee..44dd5ab336a 100644
--- a/TAO/tests/Alt_Mapping/alt_mapping.mpc
+++ b/TAO/tests/Alt_Mapping/alt_mapping.mpc
@@ -30,7 +30,6 @@ project(*Server): taoserver, codeset, avoids_minimum_corba, avoids_corba_e_compa
   }
   
   Inline_Files {
-    alt_mappingS.inl
     alt_mappingC.inl
   }
 }
diff --git a/TAO/tests/Bug_1330_Regression/Test_i.h b/TAO/tests/Bug_1330_Regression/Test_i.h
index e1f38a78323..5c5077d8532 100644
--- a/TAO/tests/Bug_1330_Regression/Test_i.h
+++ b/TAO/tests/Bug_1330_Regression/Test_i.h
@@ -23,7 +23,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_1482_Regression/Hello.h b/TAO/tests/Bug_1482_Regression/Hello.h
index 0230d9b4da6..96c88856c65 100644
--- a/TAO/tests/Bug_1482_Regression/Hello.h
+++ b/TAO/tests/Bug_1482_Regression/Hello.h
@@ -20,7 +20,7 @@ public:
   virtual CORBA::ULong next_prime (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Bug_2084_Regression/EventNode.h b/TAO/tests/Bug_2084_Regression/EventNode.h
index b3e62f57e7c..b2bb74f28de 100644
--- a/TAO/tests/Bug_2084_Regression/EventNode.h
+++ b/TAO/tests/Bug_2084_Regression/EventNode.h
@@ -26,7 +26,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Bug_2084_Regression/Hello.h b/TAO/tests/Bug_2084_Regression/Hello.h
index 0f8f1ada1ce..6a101baded5 100644
--- a/TAO/tests/Bug_2084_Regression/Hello.h
+++ b/TAO/tests/Bug_2084_Regression/Hello.h
@@ -26,7 +26,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Bug_2183_Regression/Hello.h b/TAO/tests/Bug_2183_Regression/Hello.h
index 76d00d09df0..c3338228150 100644
--- a/TAO/tests/Bug_2183_Regression/Hello.h
+++ b/TAO/tests/Bug_2183_Regression/Hello.h
@@ -27,7 +27,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_2186_Regression/Hello.h b/TAO/tests/Bug_2186_Regression/Hello.h
index 59e72ed2695..e2799f520b1 100644
--- a/TAO/tests/Bug_2186_Regression/Hello.h
+++ b/TAO/tests/Bug_2186_Regression/Hello.h
@@ -24,7 +24,7 @@ public:
   virtual void request_callback (Test::Hello_ptr call_me);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_2241_Regression/Hello.h b/TAO/tests/Bug_2241_Regression/Hello.h
index 1d5e27d075f..3a25039b7ab 100644
--- a/TAO/tests/Bug_2241_Regression/Hello.h
+++ b/TAO/tests/Bug_2241_Regression/Hello.h
@@ -23,7 +23,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Bug_2328_Regression/Hello.h b/TAO/tests/Bug_2328_Regression/Hello.h
index 883a1a610d7..421ccc5e2bd 100644
--- a/TAO/tests/Bug_2328_Regression/Hello.h
+++ b/TAO/tests/Bug_2328_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_2593_Regression/Hello.h b/TAO/tests/Bug_2593_Regression/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Bug_2593_Regression/Hello.h
+++ b/TAO/tests/Bug_2593_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_2654_Regression/Hello.h b/TAO/tests/Bug_2654_Regression/Hello.h
index 5ac669ccd98..2efb6c22796 100644
--- a/TAO/tests/Bug_2654_Regression/Hello.h
+++ b/TAO/tests/Bug_2654_Regression/Hello.h
@@ -21,7 +21,7 @@ public:
 
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
   Test::CallBack_var callback_;
diff --git a/TAO/tests/Bug_2683_Regression/test_i.h b/TAO/tests/Bug_2683_Regression/test_i.h
index 9cbd85b3468..c749c436001 100644
--- a/TAO/tests/Bug_2683_Regression/test_i.h
+++ b/TAO/tests/Bug_2683_Regression/test_i.h
@@ -34,7 +34,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   ORB_Killer *killer_;
 };
diff --git a/TAO/tests/Bug_2768_Regression/Messenger_i.h b/TAO/tests/Bug_2768_Regression/Messenger_i.h
index 8655c1c68be..1178f378987 100644
--- a/TAO/tests/Bug_2768_Regression/Messenger_i.h
+++ b/TAO/tests/Bug_2768_Regression/Messenger_i.h
@@ -12,7 +12,7 @@ public:
   virtual void send (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_2966_Regression/Hello.h b/TAO/tests/Bug_2966_Regression/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Bug_2966_Regression/Hello.h
+++ b/TAO/tests/Bug_2966_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3299_Regression/Hello.h b/TAO/tests/Bug_3299_Regression/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Bug_3299_Regression/Hello.h
+++ b/TAO/tests/Bug_3299_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3333_Regression/Hello.h b/TAO/tests/Bug_3333_Regression/Hello.h
index 782b1b2f573..af231fe1540 100644
--- a/TAO/tests/Bug_3333_Regression/Hello.h
+++ b/TAO/tests/Bug_3333_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown ();
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3430_Regression/Hello.h b/TAO/tests/Bug_3430_Regression/Hello.h
index e53a0789ce8..dadef8e03c6 100644
--- a/TAO/tests/Bug_3430_Regression/Hello.h
+++ b/TAO/tests/Bug_3430_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3479_Regression/Hello.h b/TAO/tests/Bug_3479_Regression/Hello.h
index fe1b77ce0e8..be97f9b6c82 100644
--- a/TAO/tests/Bug_3479_Regression/Hello.h
+++ b/TAO/tests/Bug_3479_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3531b_Regression/server.cpp b/TAO/tests/Bug_3531b_Regression/server.cpp
index 086d101761f..153e1cfec84 100644
--- a/TAO/tests/Bug_3531b_Regression/server.cpp
+++ b/TAO/tests/Bug_3531b_Regression/server.cpp
@@ -13,6 +13,8 @@
 #include "tao/TAO_Export.h"
 #include "ace/TP_Reactor.h"
 
+#if defined (ACE_HAS_THREADS)
+
 int nthreads = 4;
 bool debug = false;
 
@@ -32,9 +34,9 @@ bool debug = false;
 class Worker;
 
 int
-parse_args (int argc, char *argv[])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "d");
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT ("d"));
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -68,7 +70,7 @@ public:
 // NOTE: Do *NOT* put the same msg into the msg queue more than once.
 // This will confuse the msg queue and result it in dropping messages
 //////////////////////////////////////////////////////////////////////
-class Worker: public ACE_Task<ACE_MT_SYNCH>
+class Worker: public ACE_Task<ACE_SYNCH>
 {
 public:
   Worker (void)
@@ -92,7 +94,7 @@ ACE_TSS<Worker> *workers_p = 0;
 int Worker::svc (void)
 {
   if (debug)
-    ACE_DEBUG ((LM_DEBUG, "(%P|%t) Worker thread starting up.\n"));
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Worker thread starting up.\n")));
   // Register this worker
   workers.ts_object (const_cast<Worker*> (this));
   int retval = 0;
@@ -101,7 +103,7 @@ int Worker::svc (void)
       retval = this->process_cmd ();
     }
   if (debug)
-    ACE_DEBUG ((LM_DEBUG, "(%P|%t) Worker thread shutting down.\n"));
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Worker thread shutting down.\n")));
   return retval;
 }
 
@@ -122,7 +124,7 @@ int Worker::process_cmd (void)
   ACE_Message_Block *mb = 0;
   if (this->getq (mb, 0) == -1)
     {
-      ACE_ERROR ((LM_ERROR, "Error calling getq: $!\n"));
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error calling getq: $!\n")));
       // Strangely, message queues return this instead of ETIME
       if (errno == EWOULDBLOCK || errno == ESHUTDOWN)
         return 0;
@@ -161,7 +163,7 @@ public:
   virtual int handle_events (ACE_Time_Value * = 0)
   {
     if (TAO_debug_level > 10)
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) Executing Test_Reactor::handle_events\n"));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Executing Test_Reactor::handle_events\n")));
     // This is called by client leader threads.  Note, the loop here
     // glosses over the fact that the Leader_Follower code does not
     // work quite the way we want it to.  Namely, this logic:
@@ -185,6 +187,11 @@ public:
       workers->process_cmd ();
     return 0;
   };
+
+  virtual int handle_events (ACE_Time_Value &)
+  {
+    return this->handle_events ();
+  }
 };
 
 // Our own Resource_Factory for testing purposes.  This just returns
@@ -242,7 +249,7 @@ public:
   void complete_event (TAO_Leader_Follower &lf)
   {
     if (debug)
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) Completing event\n"));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Completing event\n")));
     this->state_changed (TAO_LF_Event::LFS_SUCCESS, lf);
   }
 
@@ -283,7 +290,7 @@ public:
 
   virtual int send_message (TAO_OutputCDR &,
                             TAO_Stub * = 0,
-                            TAO_Message_Semantics  = TAO_TWOWAY_REQUEST,
+                            TAO_Message_Semantics  = TAO_Message_Semantics (),
                             ACE_Time_Value * = 0)
   {
     return 0;
@@ -337,7 +344,7 @@ public:
   virtual int execute (Worker* worker)
   {
     if (debug)
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) Shutdown cmd\n"));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Shutdown cmd\n")));
     worker->shutdown (true);
     return 0;
   }
@@ -360,7 +367,7 @@ public:
   virtual int execute (Worker*)
   {
     if (debug)
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) Executing TSS_Assert(%d,%d,%d) cmd\n",
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Executing TSS_Assert(%d,%d,%d) cmd\n"),
                   elt_count_, clt_count_, leader_available_));
     TAO_Leader_Follower &leader_follower = orb_core_->leader_follower ();
     TAO_ORB_Core_TSS_Resources* tss = orb_core_->get_tss_resources ();
@@ -388,7 +395,7 @@ public:
   virtual int execute (Worker*)
   {
     if (debug)
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) Executing Wait_For_Event cmd\n"));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Executing Wait_For_Event cmd\n")));
     int retval = lf_.wait_for_event (&event_, &transport_, 0);
     // The worker has probably been shutdown in order for the client
     // leader event loop to exit - reactivate the worker so it from
@@ -414,7 +421,7 @@ public:
   virtual int execute (Worker*)
   {
     if (debug)
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) Executing Cond_Signal cmd\n"));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Executing Cond_Signal cmd\n")));
     ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard ,this->cond_.mutex (), 0);
     return this->cond_.signal ();
   }
@@ -454,7 +461,7 @@ public:
   virtual int execute (Worker* worker)
   {
     if (debug)
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) Executing Event_Loop_Thread cmd\n"));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Executing Event_Loop_Thread cmd\n")));
     TAO_LF_Event_Loop_Thread_Helper elt (lf_, lf_strategy_, 0);
     while (!worker->shutdown())
       worker->process_cmd ();
@@ -479,7 +486,7 @@ public:
   virtual int execute (Worker*)
   {
     if (debug)
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) Executing Set_Upcall_Thread cmd\n"));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Executing Set_Upcall_Thread cmd\n")));
     lf_.set_upcall_thread ();
     return 0;
   }
@@ -509,8 +516,8 @@ void Test_1 (TAO_ORB_Core* orb_core)
   TAO_Leader_Follower &leader_follower = orb_core->leader_follower ();
   TAO_ORB_Core_TSS_Resources* tss = orb_core->get_tss_resources ();
 
-  ACE_DEBUG ((LM_DEBUG, "==========\n"));
-  ACE_DEBUG ((LM_DEBUG, "TEST #1 - Simple Event Loop call\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("==========\n")));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TEST #1 - Simple Event Loop call\n")));
 
   TSS_ASSERT (tss, leader_follower, 0, 0, false);
 
@@ -530,8 +537,8 @@ void Test_2 (TAO_ORB_Core* orb_core)
   TAO_LF_Strategy &lf_strategy = orb_core->lf_strategy ();
   TAO_Leader_Follower &leader_follower = orb_core->leader_follower ();
   TAO_ORB_Core_TSS_Resources* tss = orb_core->get_tss_resources ();
-  ACE_DEBUG ((LM_DEBUG, "==========\n"));
-  ACE_DEBUG ((LM_DEBUG, "TEST #2 - 2 nested Event Loop calls\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("==========\n")));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TEST #2 - 2 nested Event Loop calls\n")));
 
   TSS_ASSERT (tss, leader_follower, 0, 0, false);
 
@@ -558,8 +565,8 @@ void Test_3 (TAO_ORB_Core* orb_core)
   TAO_LF_Strategy &lf_strategy = orb_core->lf_strategy ();
   TAO_Leader_Follower &leader_follower = orb_core->leader_follower ();
   TAO_ORB_Core_TSS_Resources* tss = orb_core->get_tss_resources ();
-  ACE_DEBUG ((LM_DEBUG, "==========\n"));
-  ACE_DEBUG ((LM_DEBUG, "TEST #3 - 2 nested Event Loop calls with set_upcall_thread\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("==========\n")));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TEST #3 - 2 nested Event Loop calls with set_upcall_thread\n")));
 
   TSS_ASSERT (tss, leader_follower, 0, 0, false);
 
@@ -587,8 +594,8 @@ void Test_3 (TAO_ORB_Core* orb_core)
 void Test_4 (TAO_ORB_Core* orb_core)
 {
   TAO_Leader_Follower &leader_follower = orb_core->leader_follower ();
-  ACE_DEBUG ((LM_DEBUG, "==========\n"));
-  ACE_DEBUG ((LM_DEBUG, "TEST #4 - Simple Client Leader thread\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("==========\n")));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TEST #4 - Simple Client Leader thread\n")));
 
   // Activate a thread
   Worker wrk1;
@@ -626,8 +633,8 @@ void Test_4 (TAO_ORB_Core* orb_core)
 void Test_5 (TAO_ORB_Core* orb_core)
 {
   TAO_Leader_Follower &leader_follower = orb_core->leader_follower ();
-  ACE_DEBUG ((LM_DEBUG, "==========\n"));
-  ACE_DEBUG ((LM_DEBUG, "TEST #5 - 2 nested Client Leader calls\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("==========\n")));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TEST #5 - 2 nested Client Leader calls\n")));
 
   // Activate a thread
   Worker wrk1;
@@ -687,8 +694,8 @@ void Test_5 (TAO_ORB_Core* orb_core)
 void Test_6 (TAO_ORB_Core* orb_core)
 {
   TAO_Leader_Follower &leader_follower = orb_core->leader_follower ();
-  ACE_DEBUG ((LM_DEBUG, "==========\n"));
-  ACE_DEBUG ((LM_DEBUG, "TEST #6 - 2 nested Client Leader calls with set_upcall_thread\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("==========\n")));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TEST #6 - 2 nested Client Leader calls with set_upcall_thread\n")));
 
   // Activate a thread
   Worker wrk1;
@@ -752,8 +759,8 @@ void Test_6 (TAO_ORB_Core* orb_core)
 void Test_7 (TAO_ORB_Core* orb_core)
 {
   TAO_Leader_Follower &leader_follower = orb_core->leader_follower ();
-  ACE_DEBUG ((LM_DEBUG, "==========\n"));
-  ACE_DEBUG ((LM_DEBUG, "TEST #7 - Client Leader yields to another client thread\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("==========\n")));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TEST #7 - Client Leader yields to another client thread\n")));
 
   // Activate a thread
   Worker wrk1;
@@ -821,8 +828,8 @@ void Test_8 (TAO_ORB_Core* orb_core)
 {
   TAO_LF_Strategy &lf_strategy = orb_core->lf_strategy ();
   TAO_Leader_Follower &leader_follower = orb_core->leader_follower ();
-  ACE_DEBUG ((LM_DEBUG, "==========\n"));
-  ACE_DEBUG ((LM_DEBUG, "TEST #8 - client becomes leader when event thread dispatched\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("==========\n")));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TEST #8 - client becomes leader when event thread dispatched\n")));
 
   // Activate a thread
   Worker wrk1;
@@ -886,8 +893,8 @@ void Test_9 (TAO_ORB_Core* orb_core)
 {
   TAO_LF_Strategy &lf_strategy = orb_core->lf_strategy ();
   TAO_Leader_Follower &leader_follower = orb_core->leader_follower ();
-  ACE_DEBUG ((LM_DEBUG, "==========\n"));
-  ACE_DEBUG ((LM_DEBUG, "TEST #9 - Client Leader thread yields to Event Loop thread\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("==========\n")));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TEST #9 - Client Leader thread yields to Event Loop thread\n")));
 
   // Activate a thread
   Worker wrk1;
@@ -967,8 +974,8 @@ void Test_10 (TAO_ORB_Core* orb_core )
 {
   TAO_LF_Strategy &lf_strategy = orb_core->lf_strategy ();
   TAO_Leader_Follower &leader_follower = orb_core->leader_follower ();
-  ACE_DEBUG ((LM_DEBUG, "==========\n"));
-  ACE_DEBUG ((LM_DEBUG, "TEST #10 - ET1437460\n"));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("==========\n")));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TEST #10 - ET1437460\n")));
 
   // This scenario involves:
   //  - an event loop thread
@@ -1097,4 +1104,16 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
+#else
+
+int
+ACE_TMAIN(int /*argc*/, ACE_TCHAR * /*argv*/ [])
+{
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("This test only makes sense in an MT build.\n")));
+
+  return 0;
+}
+
+#endif // !ACE_HAS_THREADS
+
 // ****************************************************************
diff --git a/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h b/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h
index fc0320bcc73..76b19672d68 100644
--- a/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h
+++ b/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h
@@ -17,7 +17,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3553_Regression/Hello.h b/TAO/tests/Bug_3553_Regression/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Bug_3553_Regression/Hello.h
+++ b/TAO/tests/Bug_3553_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3558_Regression/Hello.h b/TAO/tests/Bug_3558_Regression/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Bug_3558_Regression/Hello.h
+++ b/TAO/tests/Bug_3558_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3598a_Regression/Hello.h b/TAO/tests/Bug_3598a_Regression/Hello.h
index 782b1b2f573..af231fe1540 100644
--- a/TAO/tests/Bug_3598a_Regression/Hello.h
+++ b/TAO/tests/Bug_3598a_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown ();
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3636_Regression/Hello.h b/TAO/tests/Bug_3636_Regression/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Bug_3636_Regression/Hello.h
+++ b/TAO/tests/Bug_3636_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3676_Regression/Hello.h b/TAO/tests/Bug_3676_Regression/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Bug_3676_Regression/Hello.h
+++ b/TAO/tests/Bug_3676_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3743_Regression/run_test.pl b/TAO/tests/Bug_3743_Regression/run_test.pl
index d1079904971..1ddd6b7b05c 100755
--- a/TAO/tests/Bug_3743_Regression/run_test.pl
+++ b/TAO/tests/Bug_3743_Regression/run_test.pl
@@ -21,7 +21,7 @@ if (exists $ENV{HOST_ROOT}) {
 my $test_idlfile = $test->LocalFile ("Test.idl");
 
 # Files to delete after test
-my @generated_files = ("TestC.cpp", "TestS.cpp", "TestC.inl", "TestS.inl", "Test.skel.h", "Test.stub.h");
+my @generated_files = ("TestC.cpp", "TestS.cpp", "TestC.inl", "Test.skel.h", "Test.stub.h");
 
 # The IDL compiler
 $TAO_IDL = $test->CreateProcess ("$tao_idl");
diff --git a/TAO/tests/Bug_3746_Regression/Test_i.h b/TAO/tests/Bug_3746_Regression/Test_i.h
index 5d51398d2f7..454a4e75c3e 100644
--- a/TAO/tests/Bug_3746_Regression/Test_i.h
+++ b/TAO/tests/Bug_3746_Regression/Test_i.h
@@ -25,7 +25,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3748_Regression/Hello.h b/TAO/tests/Bug_3748_Regression/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Bug_3748_Regression/Hello.h
+++ b/TAO/tests/Bug_3748_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3768_Regression/TestCallback.cpp b/TAO/tests/Bug_3768_Regression/TestCallback.cpp
index 9923c07418a..7f760f62544 100644
--- a/TAO/tests/Bug_3768_Regression/TestCallback.cpp
+++ b/TAO/tests/Bug_3768_Regression/TestCallback.cpp
@@ -13,8 +13,8 @@ void
 TestCallback::start_threads_and_block (void)
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - start_threads_and_block\n"));
-  work_.activate(0,10);
-  ACE_OS::sleep(-1);
+  work_.activate(THR_NEW_LWP | THR_JOINABLE | THR_INHERIT_SCHED,10);
+  work_.wait (); // blocks forever as the worker threads never end
 }
 
 void
@@ -26,6 +26,6 @@ TestCallback::test_call (void)
 void
 TestCallback::shutdown (void)
 {
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - test completed\n"));
+  ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test completed\n"));
   exit (0);
 }
diff --git a/TAO/tests/Bug_3768_Regression/server.cpp b/TAO/tests/Bug_3768_Regression/server.cpp
index c18aac37313..e9226e4af11 100644
--- a/TAO/tests/Bug_3768_Regression/server.cpp
+++ b/TAO/tests/Bug_3768_Regression/server.cpp
@@ -103,7 +103,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // Run a CORBA worker thread
       Worker work (orb.in());
-      work.activate (0,1);
+      work.activate (THR_NEW_LWP | THR_JOINABLE | THR_INHERIT_SCHED, 1);
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - waiting for client to call\n"));
       ACE_OS::sleep (10);
       if (test_impl->got_callback() == false) {
@@ -123,6 +123,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - test completed\n"));
 
+      orb->shutdown (); // shutdown our ORB
+
+      work.wait (); // wait for the worker to finish
+
       root_poa->destroy (1, 1);
 
       orb->destroy ();
diff --git a/TAO/tests/Bug_3790_Regression/simple_test_i.h b/TAO/tests/Bug_3790_Regression/simple_test_i.h
index 4b82ae9c26f..0a5f17eeeda 100644
--- a/TAO/tests/Bug_3790_Regression/simple_test_i.h
+++ b/TAO/tests/Bug_3790_Regression/simple_test_i.h
@@ -18,7 +18,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3837_Regression/Hello.h b/TAO/tests/Bug_3837_Regression/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Bug_3837_Regression/Hello.h
+++ b/TAO/tests/Bug_3837_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3896_Regression/Hello.h b/TAO/tests/Bug_3896_Regression/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Bug_3896_Regression/Hello.h
+++ b/TAO/tests/Bug_3896_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3954_Regression/Hello.h b/TAO/tests/Bug_3954_Regression/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Bug_3954_Regression/Hello.h
+++ b/TAO/tests/Bug_3954_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_933_Regression/Messenger_i.h b/TAO/tests/Bug_933_Regression/Messenger_i.h
index c975b416424..486c2e3ee67 100644
--- a/TAO/tests/Bug_933_Regression/Messenger_i.h
+++ b/TAO/tests/Bug_933_Regression/Messenger_i.h
@@ -21,7 +21,7 @@ public:
 
   virtual void shutdown (void);
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/COIOP/Hello.h b/TAO/tests/COIOP/Hello.h
index 1d5e27d075f..3a25039b7ab 100644
--- a/TAO/tests/COIOP/Hello.h
+++ b/TAO/tests/COIOP/Hello.h
@@ -23,7 +23,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Cache_Growth_Test/Hello.h b/TAO/tests/Cache_Growth_Test/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Cache_Growth_Test/Hello.h
+++ b/TAO/tests/Cache_Growth_Test/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Client_Leaks/Process.h b/TAO/tests/Client_Leaks/Process.h
index dab625cabb5..7906a4a0d7d 100644
--- a/TAO/tests/Client_Leaks/Process.h
+++ b/TAO/tests/Client_Leaks/Process.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Client_Leaks/Process_Factory.h b/TAO/tests/Client_Leaks/Process_Factory.h
index 2131b6a37cf..1fc6c346097 100644
--- a/TAO/tests/Client_Leaks/Process_Factory.h
+++ b/TAO/tests/Client_Leaks/Process_Factory.h
@@ -27,7 +27,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.h b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.h
index 1d5e27d075f..3a25039b7ab 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.h
@@ -23,7 +23,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.h b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.h
index 1d5e27d075f..3a25039b7ab 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.h
@@ -23,7 +23,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.h b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.h
index 1d5e27d075f..3a25039b7ab 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.h
@@ -23,7 +23,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Collocated_DerivedIF/Hello.h b/TAO/tests/Collocated_DerivedIF/Hello.h
index a028b36b192..0ee5d3cc2da 100644
--- a/TAO/tests/Collocated_DerivedIF/Hello.h
+++ b/TAO/tests/Collocated_DerivedIF/Hello.h
@@ -25,7 +25,7 @@
 
 
   private:
-    /// Use an ORB reference to conver strings to objects and shutdown
+    /// Use an ORB reference to convert strings to objects and shutdown
     /// the application.
     CORBA::ORB_var orb_;
     ACE_thread_t thr_id_;
diff --git a/TAO/tests/Collocated_NoColl/Hello.h b/TAO/tests/Collocated_NoColl/Hello.h
index 1d5e27d075f..3a25039b7ab 100644
--- a/TAO/tests/Collocated_NoColl/Hello.h
+++ b/TAO/tests/Collocated_NoColl/Hello.h
@@ -23,7 +23,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Collocated_ThruP_Sp/Hello.h b/TAO/tests/Collocated_ThruP_Sp/Hello.h
index 1d5e27d075f..3a25039b7ab 100644
--- a/TAO/tests/Collocated_ThruP_Sp/Hello.h
+++ b/TAO/tests/Collocated_ThruP_Sp/Hello.h
@@ -23,7 +23,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.h b/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.h
index 1d5e27d075f..3a25039b7ab 100644
--- a/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.h
+++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.h
@@ -23,7 +23,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Collocation_Exception_Test/Hello.h b/TAO/tests/Collocation_Exception_Test/Hello.h
index 4f4b64b9646..884af0f60bb 100644
--- a/TAO/tests/Collocation_Exception_Test/Hello.h
+++ b/TAO/tests/Collocation_Exception_Test/Hello.h
@@ -36,7 +36,7 @@ public:
 private:
   void throw_internal_b (void);
 
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Collocation_Oneway_Tests/Hello.h b/TAO/tests/Collocation_Oneway_Tests/Hello.h
index afd234e120e..df2092153ed 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Hello.h
+++ b/TAO/tests/Collocation_Oneway_Tests/Hello.h
@@ -30,7 +30,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Collocation_Tests/Hello.h b/TAO/tests/Collocation_Tests/Hello.h
index 1d5e27d075f..3a25039b7ab 100644
--- a/TAO/tests/Collocation_Tests/Hello.h
+++ b/TAO/tests/Collocation_Tests/Hello.h
@@ -23,7 +23,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Connect_Strategy_Test/Hello.h b/TAO/tests/Connect_Strategy_Test/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Connect_Strategy_Test/Hello.h
+++ b/TAO/tests/Connect_Strategy_Test/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Hello.h b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h
index e2f9c1c9a8c..699055f9daf 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.h
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h
@@ -125,7 +125,7 @@ public:
   CORBA::ULong error_count () const;
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Hello.h b/TAO/tests/DII_Collocation_Tests/twoway/Hello.h
index 059d4f52de8..98fa55930f2 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Hello.h
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Hello.h
@@ -132,7 +132,7 @@ public:
   CORBA::ULong error_count () const;
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/DSI_AMH/Roundtrip.cpp b/TAO/tests/DSI_AMH/Roundtrip.cpp
index a3451a93331..3fd90cc406d 100644
--- a/TAO/tests/DSI_AMH/Roundtrip.cpp
+++ b/TAO/tests/DSI_AMH/Roundtrip.cpp
@@ -96,8 +96,7 @@ Roundtrip::_primary_interface (const PortableServer::ObjectId &,
 
 void
 Roundtrip::_dispatch (TAO_ServerRequest &request,
-                         void * //context
-                     )
+                      TAO::Portable_Server::Servant_Upcall * /* context */)
 {
   // No need to do any of this if the client isn't waiting.
   if (request.response_expected ())
@@ -148,8 +147,7 @@ Roundtrip::_dispatch (TAO_ServerRequest &request,
 }
 
 void
-Roundtrip::invoke (CORBA::ServerRequest_ptr request)
+Roundtrip::invoke (CORBA::ServerRequest_ptr)
 {
-  ACE_UNUSED_ARG (request);
   throw CORBA::NO_IMPLEMENT();
 }
diff --git a/TAO/tests/DSI_AMH/Roundtrip.h b/TAO/tests/DSI_AMH/Roundtrip.h
index 01296676961..f6436ec5f32 100644
--- a/TAO/tests/DSI_AMH/Roundtrip.h
+++ b/TAO/tests/DSI_AMH/Roundtrip.h
@@ -27,9 +27,9 @@ public:
 
   // = The DSI methods
 
+  /// Turns around and calls invoke, but using AMH style handler
   virtual void _dispatch (TAO_ServerRequest &request,
-                          void *context);
-  // Turns around and calls invoke, but using AMH style handler
+                          TAO::Portable_Server::Servant_Upcall *context);
 
   void invoke (CORBA::ServerRequest_ptr request);
 
@@ -40,7 +40,7 @@ public:
       PortableServer::POA_ptr poa);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp b/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp
index 5f7fecd6224..1b56a99114f 100644
--- a/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp
+++ b/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp
@@ -14,7 +14,7 @@
 #endif /* __ACE_INLINE__ */
 
 void
-DSI_Simple_Server::_dispatch (TAO_ServerRequest &request, void *)
+DSI_Simple_Server::_dispatch (TAO_ServerRequest &request, TAO::Portable_Server::Servant_Upcall *)
 {
   // No need to do any of this if the client isn't waiting.
   if (request.response_expected ())
diff --git a/TAO/tests/DSI_AMI_Gateway/test_dsi.h b/TAO/tests/DSI_AMI_Gateway/test_dsi.h
index 4f33fc644f8..8f43c163ba1 100644
--- a/TAO/tests/DSI_AMI_Gateway/test_dsi.h
+++ b/TAO/tests/DSI_AMI_Gateway/test_dsi.h
@@ -40,7 +40,7 @@ public:
    *
    */
   virtual void _dispatch (TAO_ServerRequest &request,
-                          void *context);
+                          TAO::Portable_Server::Servant_Upcall *context);
 
   // we need this because it is a pure virtual method in
   // its parent class
@@ -50,11 +50,9 @@ public:
 
   virtual CORBA::RepositoryId _primary_interface (
       const PortableServer::ObjectId &oid,
-      PortableServer::POA_ptr poa
-    );
+      PortableServer::POA_ptr poa);
 
-  virtual PortableServer::POA_ptr _default_POA (
-    );
+  virtual PortableServer::POA_ptr _default_POA (void);
 
 private:
   /// The ORB
diff --git a/TAO/tests/ForwardUponObjectNotExist/client.cpp b/TAO/tests/ForwardUponObjectNotExist/client.cpp
index 70666db32e1..33a50754c6d 100755
--- a/TAO/tests/ForwardUponObjectNotExist/client.cpp
+++ b/TAO/tests/ForwardUponObjectNotExist/client.cpp
@@ -6,9 +6,9 @@
 
 const ACE_TCHAR *ior = ACE_TEXT("file://test.ior");
 int nthreads = 1;
-int do_shutdown = 0;
+bool do_shutdown = 0;
 static const ACE_TCHAR corbaloc_prefix[] = ACE_TEXT("corbaloc:");
-int expected_object_not_exist = 0;
+bool expected_object_not_exist = false;
 
 int
 parse_args (int argc, ACE_TCHAR *argv[])
@@ -20,7 +20,7 @@ parse_args (int argc, ACE_TCHAR *argv[])
     switch (c)
       {
       case 'x':
-        do_shutdown = 1;
+        do_shutdown = true;
         break;
 
       case 'k':
@@ -54,22 +54,21 @@ parse_args (int argc, ACE_TCHAR *argv[])
 class Worker : public ACE_Task_Base
 {
 public:
+  /// Constructor
   Worker (CORBA::ORB_ptr orb);
-  // Constructor
 
+  /// The actual implementation of the test
   virtual void run_test (void);
-  // The actual implementation of the test
 
-  // = The Task_Base methods
   virtual int svc (void);
 
-  // Caught OBJECT_NOT_EXIST exception ?
-  int got_object_not_exist () const;
+  /// Caught OBJECT_NOT_EXIST exception ?
+  bool got_object_not_exist () const;
 
 private:
   CORBA::ORB_var orb_;
   // The ORB reference
-  int got_object_not_exist_;
+  bool got_object_not_exist_;
 };
 
 int
@@ -111,10 +110,12 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
           server->shutdown ();
         }
 
-      orb->destroy ();
+      orb->shutdown ();
 
       worker.thr_mgr ()->wait ();
 
+      orb->destroy ();
+
       if (worker.got_object_not_exist () != expected_object_not_exist)
       {
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -139,7 +140,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 Worker::Worker (CORBA::ORB_ptr orb)
   :  orb_ (CORBA::ORB::_duplicate (orb)),
-     got_object_not_exist_ (0)
+     got_object_not_exist_ (false)
 {
 }
 
@@ -152,7 +153,7 @@ Worker::svc (void)
     }
   catch (const CORBA::OBJECT_NOT_EXIST &)
     {
-      got_object_not_exist_ = 1;
+      got_object_not_exist_ = true;
     }
   catch (...)
     {
@@ -187,7 +188,7 @@ Worker::run_test (void)
                 r));
 }
 
-int
+bool
 Worker::got_object_not_exist () const
 {
   return got_object_not_exist_;
diff --git a/TAO/tests/Hello/Hello.h b/TAO/tests/Hello/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Hello/Hello.h
+++ b/TAO/tests/Hello/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/IDL_Inherited_Operation/InheritedOp.mpc b/TAO/tests/IDL_Inherited_Operation/InheritedOp.mpc
index ab64f74834c..40f1c93b523 100644
--- a/TAO/tests/IDL_Inherited_Operation/InheritedOp.mpc
+++ b/TAO/tests/IDL_Inherited_Operation/InheritedOp.mpc
@@ -26,7 +26,6 @@ project(*Server): taoserver {
   
   Inline_Files {
     InheritedOpC.inl
-    InheritedOpS.inl
   }
 
   IDL_Files {
diff --git a/TAO/tests/IDL_Test/IDL_Test.mpc b/TAO/tests/IDL_Test/IDL_Test.mpc
index 8c58bdf1d55..13d97910bce 100644
--- a/TAO/tests/IDL_Test/IDL_Test.mpc
+++ b/TAO/tests/IDL_Test/IDL_Test.mpc
@@ -59,13 +59,13 @@ project(*IDL): taoserver, messaging, gen_ostream {
     sequence.idl
     union.idl
     anyunion.idl
+    valuetype.idl
   }
 
   IDL_Files {
     idlflags += -GA -as
     anonymous.idl
     dif2.idl
-    valuetype.idl
   }
 
   IDL_Files {
@@ -210,7 +210,6 @@ project(*DLL): taoidldefaults, taolib, messaging {
     typeprefixS.cpp
     unionC.cpp
     unionS.cpp
-    valuetypeA.cpp
     valuetypeC.cpp
     valuetypeS.cpp
   }
diff --git a/TAO/tests/IDL_Test/attribute.idl b/TAO/tests/IDL_Test/attribute.idl
index f5dc3e90845..9762b92bed7 100644
--- a/TAO/tests/IDL_Test/attribute.idl
+++ b/TAO/tests/IDL_Test/attribute.idl
@@ -9,9 +9,15 @@ module Hello
     {
     };
 
+  typedef short MyType;
+
   // Sender/Receiver interface
   interface MyFoo
     {
+      attribute MyType rw_attrib_mytype
+        getraises (InternalErrorA)
+        setraises (InternalErrorB);
+
       attribute short rw_attrib
         getraises (InternalErrorA)
         setraises (InternalErrorB);
diff --git a/TAO/tests/IDL_Test/valuetype.idl b/TAO/tests/IDL_Test/valuetype.idl
index de7d0f56ea3..3213f6f4b03 100644
--- a/TAO/tests/IDL_Test/valuetype.idl
+++ b/TAO/tests/IDL_Test/valuetype.idl
@@ -1,5 +1,5 @@
+//=============================================================================
 
-//=============================================================================
 /**
  *  @file    valuetype.idl
  *
@@ -13,6 +13,7 @@
  *
  *  @author Gary Duzan <gduzan@bbn.com> Jeff Parsons <j.parsons@vanderbilt.edu>
  */
+
 //=============================================================================
 
 
@@ -23,6 +24,7 @@
 
 // A valuetype factory can have exceptions, so the declaration must pull in
 // an #include of SystemException.h.
+
 valuetype MyValueType
 {
   public string my_string_value;
@@ -72,4 +74,43 @@ module X
   typedef sequence<BXXX> BSeq;
 };
 
+// The original problem with the construct below was probably the
+// union member, but other features from the original example IDL
+// have been left in just in case.
+module ModSelection
+{
+  module SelectionDefns
+  {
+    abstract valuetype Criterion
+    {
+      void setCriterionRequiredAttributes (inout string theSelectedAttrs);
+      boolean isValid (in wstring theTrackSelectionAttrs);
+    };
+
+    valuetype CriterionExpr : Criterion
+    {
+      struct RightCriterionInfos
+      {
+        long theCriterionId;
+        CriterionExpr theRightExpr;
+      };
+
+      union RightCriterionExpr switch (boolean)
+      {
+        case TRUE: string theRightCriterionInfos;
+      };
+
+      public Criterion theLeftCriterion;
+      public RightCriterionExpr theRightCriterionExpr;
+
+      factory createWithCriterionLink (in Criterion theLeftCriterion,
+                                       in string link,
+                                       in CriterionExpr theRightCriterion);
+
+      factory createWithSingleCriterion (in Criterion theSingleCriterion);
+    };
+  };
+};
+
 #endif /* IDL_TEST_VALUETYPE_IDL */
+
diff --git a/TAO/tests/IPV6/Hello.h b/TAO/tests/IPV6/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/IPV6/Hello.h
+++ b/TAO/tests/IPV6/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/LongDouble/LongDoubleTest.h b/TAO/tests/LongDouble/LongDoubleTest.h
index 76b0674dd75..c48cd001181 100644
--- a/TAO/tests/LongDouble/LongDoubleTest.h
+++ b/TAO/tests/LongDouble/LongDoubleTest.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown ();
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/MT_Timeout/Sleep_Service.h b/TAO/tests/MT_Timeout/Sleep_Service.h
index 9a360fa9420..0107c5836ec 100644
--- a/TAO/tests/MT_Timeout/Sleep_Service.h
+++ b/TAO/tests/MT_Timeout/Sleep_Service.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Mixed_Sync_ASync_Events/MixedSyncASyncEvents.mpc b/TAO/tests/Mixed_Sync_ASync_Events/MixedSyncASyncEvents.mpc
new file mode 100644
index 00000000000..b8130b84a4d
--- /dev/null
+++ b/TAO/tests/Mixed_Sync_ASync_Events/MixedSyncASyncEvents.mpc
@@ -0,0 +1,23 @@
+// -*- MPC -*-
+// $Id$
+
+project(*idl): taoidldefaults, ami {
+  IDL_Files {
+    test.idl
+  }
+  custom_only = 1
+}
+
+project(*Exe): taoserver, messaging, ami {
+  exename = tester
+  after += *idl
+  Source_Files {
+    test_i.cpp
+    testS.cpp
+    testC.cpp
+    main.cpp
+  }
+  IDL_Files {
+  }
+}
+
diff --git a/TAO/tests/Mixed_Sync_ASync_Events/exclusive_rw.conf b/TAO/tests/Mixed_Sync_ASync_Events/exclusive_rw.conf
new file mode 100644
index 00000000000..d7ed9ec9d14
--- /dev/null
+++ b/TAO/tests/Mixed_Sync_ASync_Events/exclusive_rw.conf
@@ -0,0 +1,4 @@
+# $Id$
+
+static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBClientConnectionHandler RW -ORBConnectStrategy blocked"
+static Resource_Factory "-ORBFlushingStrategy blocking"
diff --git a/TAO/tests/Mixed_Sync_ASync_Events/exclusive_rw.conf.xml b/TAO/tests/Mixed_Sync_ASync_Events/exclusive_rw.conf.xml
new file mode 100644
index 00000000000..d9fdac7d3ae
--- /dev/null
+++ b/TAO/tests/Mixed_Sync_ASync_Events/exclusive_rw.conf.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0'?>
+<!-- Converted from ./tests/AMI/exclusive.conf by svcconf-convert.pl -->
+<ACE_Svc_Conf>
+ <!--  -->
+ <!--  $Id$ -->
+ <!--  -->
+ <static id="Client_Strategy_Factory" params="-ORBTransportMuxStrategy EXCLUSIVE -ORBclientconnectionhandler RW -ORBConnectStrategy blocked"/>
+ <static id="Resource_Factory" params="-ORBFlushingStrategy blocking"/>
+</ACE_Svc_Conf>
diff --git a/TAO/tests/Mixed_Sync_ASync_Events/main.cpp b/TAO/tests/Mixed_Sync_ASync_Events/main.cpp
new file mode 100644
index 00000000000..c5094d29282
--- /dev/null
+++ b/TAO/tests/Mixed_Sync_ASync_Events/main.cpp
@@ -0,0 +1,186 @@
+//=============================================================================
+/**
+ *  @file    main.cpp
+ *
+ *  $Id$
+ *
+ *  Implementation of the server.
+ *
+ *
+ *  @author Alexander Babu Arulanthu <alex@cs.wustl.edu>
+ *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
+ */
+//=============================================================================
+
+
+#include "test_i.h"
+#include "tao/debug.h"
+#include "ace/OS_NS_stdio.h"
+#include "ace/Get_Opt.h"
+#include "ace/OS_NS_unistd.h"
+
+const ACE_TCHAR *ior_output_file = 0;
+const ACE_TCHAR *input_ior = 0;
+A::RunMode mode_flag = A::RM_SLAVE;
+CORBA::ULong max_count = 20;
+
+int
+parse_args (int argc, ACE_TCHAR *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:k:c:dm"));
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'o':
+        ior_output_file = get_opts.opt_arg ();
+        break;
+      case 'k':
+        input_ior = get_opts.opt_arg ();
+        break;
+      case 'm':
+        mode_flag = A::RM_MASTER;
+        if (ior_output_file == 0)
+          ior_output_file = ACE_TEXT ("master.ior");
+        break;
+      case 'c':
+        max_count = ACE_OS::atoi (get_opts.opt_arg ());
+        break;
+      case 'd':
+        TAO_debug_level++;
+        break;
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-o <iorfile>"
+                           "\n",
+                           argv [0]),
+                          -1);
+        break;
+      }
+
+  if (ior_output_file == 0)
+    ior_output_file = ACE_TEXT ("slave.ior");
+
+  if (input_ior == 0)
+    input_ior = (mode_flag == A::RM_SLAVE ? ACE_TEXT ("file://master.ior") : ACE_TEXT ("file://slave.ior"));
+
+  // Indicates successful parsing of the command line
+  return 0;
+}
+
+int
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+{
+  try
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv);
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references("RootPOA");
+
+      if (CORBA::is_nil (poa_object.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize the POA.\n"),
+                          1);
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in ());
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager ();
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      // create, activate and initialize AMI reply handler
+      Test_Reply_i test_i_rh_srv(orb.in (),
+                                 max_count,
+                                 mode_flag);
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (&test_i_rh_srv);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
+      A::AMI_TestHandler_var rh =
+        A::AMI_TestHandler::_narrow (object.in ());
+
+      test_i_rh_srv.test_handler ().set_reply_handler (rh.in ());
+
+      // create and activate test servant
+      Test_i test_i_srv (orb.in (), rh.in (), max_count, mode_flag);
+
+      id = root_poa->activate_object (&test_i_srv);
+
+      object = root_poa->id_to_reference (id.in ());
+
+      A::Test_var test_var =
+        A::Test::_narrow (object.in ());
+
+      CORBA::String_var ior =
+        orb->object_to_string (test_var.in ());
+
+      ACE_DEBUG ((LM_DEBUG, "Servant activated\n"));
+
+      // If the ior_output_file exists, output the ior to it
+      if (ior_output_file != 0)
+        {
+          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          if (output_file == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Cannot open output file for writing IOR: %s",
+                               ior_output_file),
+                              1);
+          ACE_OS::fprintf (output_file, "%s", ior.in ());
+          ACE_OS::fclose (output_file);
+        }
+
+      poa_manager->activate ();
+
+      A::Test_var opponent;
+      do {
+        if (mode_flag == A::RM_SLAVE)
+          ACE_OS::sleep (ACE_Time_Value (0, 100));
+
+        // get object reference for opponent
+        object = orb->string_to_object (input_ior);
+        opponent =  A::Test::_narrow (object.in ());
+      } while (mode_flag == A::RM_SLAVE && CORBA::is_nil (opponent.in ()));
+
+      if (CORBA::is_nil (opponent.in ()))
+      {
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot resolve opponent IOR: %s",
+                           input_ior),
+                           1);
+      }
+
+      // register opponent
+      test_i_srv.set_opponent (opponent.in ());
+      test_i_rh_srv.test_handler ().set_opponent (opponent.in ());
+
+      // start the show
+      if (mode_flag == A::RM_MASTER)
+        test_i_rh_srv.test_handler ().start ();
+
+      orb->run ();
+
+      root_poa->destroy (1,  // ethernalize objects
+                         0  // wait for completion
+                        );
+
+      orb->destroy ();
+
+      ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Caught exception:");
+      return 1;
+    }
+
+  return 0;
+}
diff --git a/TAO/tests/Mixed_Sync_ASync_Events/run_exclusive_rw.pl b/TAO/tests/Mixed_Sync_ASync_Events/run_exclusive_rw.pl
new file mode 100755
index 00000000000..04c2c4777d9
--- /dev/null
+++ b/TAO/tests/Mixed_Sync_ASync_Events/run_exclusive_rw.pl
@@ -0,0 +1,122 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "$ENV{ACE_ROOT}/bin";
+use PerlACE::TestTarget;
+
+my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
+my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
+
+$client_conf_base = "exclusive_rw$PerlACE::svcconf_ext";
+$client_conf = $client->LocalFile ($client_conf_base);
+if ($client->PutFile ($client_conf_base) == -1) {
+    print STDERR "ERROR: cannot set file <$client_conf>\n";
+    exit 1;
+}
+$server_conf = $server->LocalFile ($client_conf_base);
+if ($server->PutFile ($client_conf_base) == -1) {
+    print STDERR "ERROR: cannot set file <$server_conf>\n";
+    exit 1;
+}
+
+$server_debug_level = '0';
+$client_debug_level = '0';
+
+foreach $i (@ARGV) {
+    if ($i eq '-debug') {
+        $server_debug_level = '10';
+        $client_debug_level = '10';
+    }
+}
+
+my $iorbase_master = "master.ior";
+my $iorbase_slave = "slave.ior";
+my $server_master_iorfile = $server->LocalFile ($iorbase_master);
+my $server_slave_iorfile = $server->LocalFile ($iorbase_slave);
+my $client_master_iorfile = $client->LocalFile ($iorbase_master);
+my $client_slave_iorfile = $client->LocalFile ($iorbase_slave);
+$server->DeleteFile($iorbase_master);
+$server->DeleteFile($iorbase_slave);
+$client->DeleteFile($iorbase_master);
+$client->DeleteFile($iorbase_slave);
+
+$SV = $server->CreateProcess ("tester", "-ORBsvcconf $server_conf -ORBdebuglevel $server_debug_level -o $server_slave_iorfile -k file://$server_master_iorfile");
+
+$server_status = $SV->Spawn ();
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    exit 1;
+}
+
+if ($server->WaitForFileTimed ($iorbase_slave,
+                               $server->ProcessStartWaitInterval()) == -1) {
+    print STDERR "ERROR: cannot find file <$server_slave_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+if ($server->GetFile ($iorbase_slave) == -1) {
+    print STDERR "ERROR: cannot get file <$server_slave_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+if ($client->PutFile ($iorbase_slave) == -1) {
+    print STDERR "ERROR: cannot set file <$client_slave_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+$CL = $client->CreateProcess ("tester",
+                              "-ORBsvcconf $client_conf "
+                              . "-ORBdebuglevel $client_debug_level"
+                              . " -o $client_master_iorfile"
+                              . " -m -k file://$client_slave_iorfile ");
+
+$client_status = $CL->Spawn ();
+
+if ($client_status != 0) {
+    print STDERR "ERROR: client returned $client_status\n";
+    $status = 1;
+}
+
+if ($client->WaitForFileTimed ($iorbase_master,
+                               $client->ProcessStartWaitInterval()) == -1) {
+    print STDERR "ERROR: cannot find file <$client_master_iorfile>\n";
+    $CL->Kill (); $CL->TimedWait (1);
+    exit 1;
+}
+if ($client->GetFile ($iorbase_master) == -1) {
+    print STDERR "ERROR: cannot get file <$client_master_iorfile>\n";
+    $CL->Kill (); $CL->TimedWait (1);
+    exit 1;
+}
+if ($server->PutFile ($iorbase_master) == -1) {
+    print STDERR "ERROR: cannot set file <$server_master_iorfile>\n";
+    $CL->Kill (); $CL->TimedWait (1);
+    exit 1;
+}
+
+$client_status = $CL->WaitKill ($client->ProcessStartWaitInterval());
+
+if ($client_status != 0) {
+    print STDERR "ERROR: client returned $client_status\n";
+    $status = 1;
+}
+
+$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval());
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    $status = 1;
+}
+
+$server->DeleteFile($iorbase_master);
+$server->DeleteFile($iorbase_slave);
+$client->DeleteFile($iorbase_master);
+$client->DeleteFile($iorbase_slave);
+
+exit $status;
diff --git a/TAO/tests/Mixed_Sync_ASync_Events/run_test.pl b/TAO/tests/Mixed_Sync_ASync_Events/run_test.pl
new file mode 100755
index 00000000000..6e5b4b10765
--- /dev/null
+++ b/TAO/tests/Mixed_Sync_ASync_Events/run_test.pl
@@ -0,0 +1,110 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "$ENV{ACE_ROOT}/bin";
+use PerlACE::TestTarget;
+
+my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
+my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
+
+
+$server_debug_level = '0';
+$client_debug_level = '0';
+
+foreach $i (@ARGV) {
+    if ($i eq '-debug') {
+        $server_debug_level = '10';
+        $client_debug_level = '10';
+    }
+}
+
+my $iorbase_master = "master.ior";
+my $iorbase_slave = "slave.ior";
+my $server_master_iorfile = $server->LocalFile ($iorbase_master);
+my $server_slave_iorfile = $server->LocalFile ($iorbase_slave);
+my $client_master_iorfile = $client->LocalFile ($iorbase_master);
+my $client_slave_iorfile = $client->LocalFile ($iorbase_slave);
+$server->DeleteFile($iorbase_master);
+$server->DeleteFile($iorbase_slave);
+$client->DeleteFile($iorbase_master);
+$client->DeleteFile($iorbase_slave);
+
+$SV = $server->CreateProcess ("tester", "-ORBdebuglevel $server_debug_level -o $server_slave_iorfile -k file://$server_master_iorfile");
+
+$server_status = $SV->Spawn ();
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    exit 1;
+}
+
+if ($server->WaitForFileTimed ($iorbase_slave,
+                               $server->ProcessStartWaitInterval()) == -1) {
+    print STDERR "ERROR: cannot find file <$server_slave_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+if ($server->GetFile ($iorbase_slave) == -1) {
+    print STDERR "ERROR: cannot get file <$server_slave_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+if ($client->PutFile ($iorbase_slave) == -1) {
+    print STDERR "ERROR: cannot set file <$client_slave_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+$CL = $client->CreateProcess ("tester",
+                              "-ORBdebuglevel $client_debug_level"
+                              . " -o $client_master_iorfile"
+                              . " -m -k file://$client_slave_iorfile ");
+
+$client_status = $CL->Spawn ();
+
+if ($client_status != 0) {
+    print STDERR "ERROR: client returned $client_status\n";
+    $status = 1;
+}
+
+if ($client->WaitForFileTimed ($iorbase_master,
+                               $client->ProcessStartWaitInterval()) == -1) {
+    print STDERR "ERROR: cannot find file <$client_master_iorfile>\n";
+    $CL->Kill (); $CL->TimedWait (1);
+    exit 1;
+}
+if ($client->GetFile ($iorbase_master) == -1) {
+    print STDERR "ERROR: cannot get file <$client_master_iorfile>\n";
+    $CL->Kill (); $CL->TimedWait (1);
+    exit 1;
+}
+if ($server->PutFile ($iorbase_master) == -1) {
+    print STDERR "ERROR: cannot set file <$server_master_iorfile>\n";
+    $CL->Kill (); $CL->TimedWait (1);
+    exit 1;
+}
+
+$client_status = $CL->WaitKill ($client->ProcessStartWaitInterval());
+
+if ($client_status != 0) {
+    print STDERR "ERROR: client returned $client_status\n";
+    $status = 1;
+}
+
+$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval());
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    $status = 1;
+}
+
+$server->DeleteFile($iorbase_master);
+$server->DeleteFile($iorbase_slave);
+$client->DeleteFile($iorbase_master);
+$client->DeleteFile($iorbase_slave);
+
+exit $status;
diff --git a/TAO/tests/Mixed_Sync_ASync_Events/test.idl b/TAO/tests/Mixed_Sync_ASync_Events/test.idl
new file mode 100644
index 00000000000..2479ae84d9e
--- /dev/null
+++ b/TAO/tests/Mixed_Sync_ASync_Events/test.idl
@@ -0,0 +1,41 @@
+//=============================================================================
+/**
+ *  @file    test.idl
+ *
+ *  $Id$
+ *
+ *  IDL description of the Test interface
+ *
+ *  @author Martin Corino <mcorino@remedy.nl>
+ */
+//=============================================================================
+
+module A
+  {
+    enum RunMode
+    {
+        RM_SLAVE,
+        RM_MASTER
+    };
+
+    enum RequestMode
+    {
+        RQM_SYNCH,
+        RQM_ASYNCH
+    };
+
+    enum FollowUp
+    {
+        FU_TIMER,
+        FU_NOTIFICATION
+    };
+
+    interface Test
+      {
+        void request (in RequestMode mode, inout unsigned long counter, out FollowUp follow_up);
+
+        void report (in string msg);
+
+        oneway void shutdown ();
+      };
+  };
diff --git a/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp b/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp
new file mode 100644
index 00000000000..1dfb79e253c
--- /dev/null
+++ b/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp
@@ -0,0 +1,275 @@
+//=============================================================================
+/**
+ *  @file    test_i.cpp
+ *
+ *  $Id$
+ *
+ *  Implementation of the Test interface.
+ *
+ */
+//=============================================================================
+
+#include "test_i.h"
+#include "tao/debug.h"
+#include "tao/ORB_Core.h"
+#include "ace/Reactor.h"
+#include "ace/OS_NS_time.h"
+
+Test_i::Test_i (CORBA::ORB_ptr orb,
+                A::AMI_TestHandler_ptr rh,
+                CORBA::ULong max_count,
+                A::RunMode mode)
+  :  orb_ (CORBA::ORB::_duplicate (orb)),
+     rh_ (A::AMI_TestHandler::_duplicate (rh)),
+     max_count_ (max_count),
+     mode_(mode)
+{
+  time_t _tm = ACE_OS::time ();
+  this->seed_ = (unsigned int)_tm;
+}
+
+void
+Test_i::set_opponent (A::Test_ptr opp)
+{
+  this->opponent_ = A::Test::_duplicate (opp);
+}
+
+void
+Test_i::request (
+  ::A::RequestMode reqmode,
+  ::CORBA::ULong & counter,
+  ::A::FollowUp_out follow_up)
+{
+  ++counter;
+
+  ACE_DEBUG ((LM_DEBUG,
+              "%N:%l:(%P:%t):Test_i::request: (%C)  %C - %d\n",
+              (reqmode == A::RQM_SYNCH ? "SYNCH" : "ASYNCH"),
+              (this->mode_ == A::RM_MASTER ? "master" : "slave"),
+              counter));
+
+  const char* follow_up_str;
+  switch (ACE_OS::rand_r (&this->seed_) % 2)
+  {
+  case 0:
+    follow_up = (reqmode == A::RQM_SYNCH ? A::FU_TIMER : A::FU_NOTIFICATION);
+    follow_up_str = (reqmode == A::RQM_SYNCH ? "TIMER" : "NOTIFICATION");
+    break;
+  case 1:
+  default:
+    follow_up = (reqmode == A::RQM_ASYNCH ? A::FU_TIMER : A::FU_NOTIFICATION);
+    follow_up_str = (reqmode == A::RQM_ASYNCH ? "TIMER" : "NOTIFICATION");
+    break;
+  }
+
+  if (!CORBA::is_nil(this->opponent_.in ()))
+  {
+    char buf[1024];
+    ACE_OS::snprintf (buf, sizeof(buf), "request #%d followup [%s]", counter, follow_up_str);
+
+    if (reqmode == A::RQM_SYNCH)
+    {
+      if (!CORBA::is_nil (this->rh_.in ()))
+        this->opponent_->sendc_report(this->rh_.in (), buf);
+    }
+    else
+    {
+      this->opponent_->report (buf);
+    }
+  }
+}
+
+void
+Test_i::report (
+  const char * msg)
+{
+  ACE_DEBUG ((LM_DEBUG,
+              "%N:%l:(%P:%t):Test_i::report: %C - %C\n",
+              (this->mode_ == A::RM_MASTER ? "master" : "slave"),
+              msg));
+}
+
+void
+Test_i::shutdown (void)
+{
+  if (this->mode_ == A::RM_SLAVE && !CORBA::is_nil (this->opponent_.in ()))
+  {
+    this->opponent_->shutdown ();
+  }
+  this->orb_->shutdown (0);
+}
+
+Test_Reply_i::Test_Reply_i (CORBA::ORB_ptr orb,
+    CORBA::ULong max_count,
+    A::RunMode mode)
+  : evh_ (orb, max_count, mode)
+{
+}
+
+void
+Test_Reply_i::request (
+  ::CORBA::ULong counter,
+  ::A::FollowUp follow_up)
+{
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "%N:%l:(%P:%t):Test_Reply_i::request\n"));
+
+  this->evh_.handle_followup (follow_up, counter);
+}
+
+void Test_Reply_i::request_excep (
+  ::Messaging::ExceptionHolder * )
+{
+  ACE_DEBUG ((LM_ERROR,
+              "%N:%l:(%P:%t):Test_Reply_i::request_excep: %C - unexpected exception\n",
+              (this->evh_.mode () == A::RM_MASTER ? "master" : "slave")));
+  if (!CORBA::is_nil (this->evh_.opponent ()))
+    this->evh_.opponent ()->shutdown ();
+  if (this->evh_.mode () == A::RM_SLAVE)
+    this->evh_.orb ()->shutdown (0);
+}
+
+void
+Test_Reply_i::report (
+  void)
+{
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "%N:%l:(%P:%t):Test_Reply_i::report\n"));
+}
+
+void
+Test_Reply_i::report_excep (
+  ::Messaging::ExceptionHolder * )
+{
+  ACE_DEBUG ((LM_ERROR,
+              "%N:%l:(%P:%t):Test_Reply_i::report_excep: %C - unexpected exception\n",
+              (this->evh_.mode () == A::RM_MASTER ? "master" : "slave")));
+  if (!CORBA::is_nil (this->evh_.opponent ()))
+    this->evh_.opponent ()->shutdown ();
+  if (this->evh_.mode () == A::RM_SLAVE)
+    this->evh_.orb ()->shutdown (0);
+}
+
+TestHandler::TestHandler (CORBA::ORB_ptr orb,
+                          CORBA::ULong max_count,
+                          A::RunMode mode)
+  : orb_ (CORBA::ORB::_duplicate (orb)),
+    max_count_ (max_count),
+    mode_ (mode),
+    counter_ (0)
+{
+  time_t _tm = ACE_OS::time ();
+  this->seed_ = (unsigned int)_tm;
+}
+
+void
+TestHandler::set_counter (CORBA::ULong counter)
+{
+  this->counter_ = counter;
+}
+
+void
+TestHandler::set_opponent (A::Test_ptr opp)
+{
+  this->opponent_ = A::Test::_duplicate (opp);
+}
+
+void
+TestHandler::set_reply_handler (A::AMI_TestHandler_ptr rh)
+{
+  this->rh_ = A::AMI_TestHandler::_duplicate (rh);
+}
+
+int
+TestHandler::handle_timeout (const ACE_Time_Value &,
+                            const void *)
+{
+  this->orb_->orb_core ()->reactor ()->cancel_timer (this);
+  if ((ACE_OS::rand_r (&this->seed_) % 2) == 0)
+  {
+    A::FollowUp followup;
+    if (!CORBA::is_nil (this->opponent_))
+    {
+      this->opponent_->request(A::RQM_SYNCH, this->counter_, followup);
+      this->handle_followup (followup, this->counter_);
+    }
+  }
+  else
+  {
+    if (!CORBA::is_nil (this->opponent_))
+    {
+      this->opponent_->sendc_request(this->rh_.in (), A::RQM_ASYNCH, this->counter_);
+    }
+  }
+  return 0;
+}
+
+int
+TestHandler::handle_exception (ACE_HANDLE)
+{
+  if ((ACE_OS::rand_r (&this->seed_) % 2) == 0)
+  {
+    A::FollowUp followup;
+    if (!CORBA::is_nil (this->opponent_))
+    {
+      this->opponent_->request(A::RQM_SYNCH, this->counter_, followup);
+      this->handle_followup (followup, this->counter_);
+    }
+  }
+  else
+  {
+    if (!CORBA::is_nil (this->opponent_))
+    {
+      this->opponent_->sendc_request(this->rh_.in (), A::RQM_ASYNCH, this->counter_);
+    }
+  }
+  return 0;
+}
+
+void TestHandler::start ()
+{
+  this->orb_->orb_core ()->reactor ()->notify (this);
+}
+
+void
+TestHandler::handle_followup (A::FollowUp fup, CORBA::ULong counter)
+{
+  if (counter > this->max_count_)
+  {
+    if (this->mode_ == A::RM_MASTER && !CORBA::is_nil (this->opponent_))
+    {
+      this->opponent_->shutdown ();
+    }
+  }
+  else
+  {
+    if (this->mode_ == A::RM_MASTER && !CORBA::is_nil (this->opponent_))
+    {
+      char buf[1024];
+      ACE_OS::snprintf (buf, sizeof(buf), "request #%d followup [%s]",
+                                          counter,
+                                          (fup == A::FU_TIMER ? "TIMER" : "NOTIFICATION"));
+      this->opponent_->report (buf);
+    }
+
+    if (TAO_debug_level > 0)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "%N:%l:(%P:%t):TestHandler::handle_followup\n"));
+    }
+
+    this->set_counter (counter);
+    if (fup == A::FU_TIMER)
+    {
+      this->orb_->orb_core ()->reactor ()->schedule_timer (this, 0,
+                                                           ACE_Time_Value (0, 100),
+                                                           ACE_Time_Value (0, 100));
+    }
+    else
+    {
+      this->orb_->orb_core ()->reactor ()->notify (this);
+    }
+  }
+}
diff --git a/TAO/tests/Mixed_Sync_ASync_Events/test_i.h b/TAO/tests/Mixed_Sync_ASync_Events/test_i.h
new file mode 100644
index 00000000000..1110efb4ead
--- /dev/null
+++ b/TAO/tests/Mixed_Sync_ASync_Events/test_i.h
@@ -0,0 +1,125 @@
+
+//=============================================================================
+/**
+ *  @file   test_i.h
+ *
+ *  $Id$
+ *
+ */
+//=============================================================================
+
+#ifndef TAO_MSAE_TEST_I_H
+#define TAO_MSAE_TEST_I_H
+
+#include "testS.h"
+
+/**
+ * @class Test_i
+ *
+ * @brief Test implementation
+ *
+ * Implements the Test interface in test.idl
+ */
+class Test_i : public POA_A::Test
+{
+public:
+  /// ctor
+  Test_i (CORBA::ORB_ptr orb,
+          A::AMI_TestHandler_ptr rh,
+          CORBA::ULong max_count = 10,
+          A::RunMode mode = A::RM_SLAVE);
+
+  void set_opponent (A::Test_ptr opp);
+
+  virtual void request (
+    ::A::RequestMode mode,
+    ::CORBA::ULong & counter,
+    ::A::FollowUp_out follow_up);
+
+  virtual void report (
+    const char * msg);
+
+  void shutdown (void);
+
+private:
+  CORBA::ORB_var orb_;
+
+  A::AMI_TestHandler_var rh_;
+
+  A::Test_var opponent_;
+
+  CORBA::ULong max_count_;
+
+  A::RunMode mode_;
+
+  unsigned int seed_;
+};
+
+class TestHandler
+  : public ACE_Event_Handler
+{
+public:
+  TestHandler (CORBA::ORB_ptr orb,
+               CORBA::ULong max_count,
+               A::RunMode mode);
+
+  void set_counter (CORBA::ULong counter);
+
+  void set_opponent (A::Test_ptr opp);
+
+  void set_reply_handler (A::AMI_TestHandler_ptr rh);
+
+  virtual int handle_timeout (const ACE_Time_Value &tv,
+                              const void *arg);
+
+  virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
+
+  void handle_followup (A::FollowUp fup, CORBA::ULong counter);
+
+  void start ();
+
+  CORBA::ORB_ptr orb () { return this->orb_.in (); }
+  A::Test_ptr opponent () { return this->opponent_.in (); }
+  CORBA::ULong max_count () { return this->max_count_; }
+  A::RunMode mode () { return this->mode_; }
+
+private:
+  CORBA::ORB_var orb_;
+  A::Test_var opponent_;
+  A::AMI_TestHandler_var rh_;
+  CORBA::ULong max_count_;
+  A::RunMode mode_;
+  CORBA::ULong counter_;
+  unsigned int seed_;
+};
+
+class Test_Reply_i : public POA_A::AMI_TestHandler
+{
+public:
+  Test_Reply_i (CORBA::ORB_ptr orb,
+      CORBA::ULong max_count,
+      A::RunMode mode);
+
+  virtual void request (
+    ::CORBA::ULong counter,
+    ::A::FollowUp follow_up);
+
+  virtual void request_excep (
+    ::Messaging::ExceptionHolder * excep_holder);
+
+  virtual void report (
+    void);
+
+  virtual void report_excep (
+    ::Messaging::ExceptionHolder * excep_holder);
+
+  TestHandler& test_handler () { return this->evh_; }
+
+private:
+  TestHandler evh_;
+};
+
+
+
+#endif /* TAO_MSAE_TEST_I_H */
+
diff --git a/TAO/tests/Monitor/Marshal_Buffer/marshal_buffer.mpc b/TAO/tests/Monitor/Marshal_Buffer/marshal_buffer.mpc
index c96fdb5f6f3..200b4ec6fa6 100644
--- a/TAO/tests/Monitor/Marshal_Buffer/marshal_buffer.mpc
+++ b/TAO/tests/Monitor/Marshal_Buffer/marshal_buffer.mpc
@@ -50,7 +50,6 @@ project(*server): taoserver {
 
   Inline_Files {
     testC.inl
-    testS.inl
   }
 }
 
diff --git a/TAO/tests/Multiple/Multiple_Impl.h b/TAO/tests/Multiple/Multiple_Impl.h
index e53381aef39..cb1cf3bc6c6 100644
--- a/TAO/tests/Multiple/Multiple_Impl.h
+++ b/TAO/tests/Multiple/Multiple_Impl.h
@@ -12,8 +12,6 @@
  */
 //=============================================================================
 
-
-
 #ifndef TAO_MULTIPLE_IMPL_H_
 #define TAO_MULTIPLE_IMPL_H_
 
@@ -32,7 +30,6 @@ class Bottom_Impl : public virtual POA_Multiple::Bottom
 {
 
 public:
-
   // Ctor-Dtor
   Bottom_Impl (CORBA::ORB_ptr orb);
   virtual ~Bottom_Impl (void);
@@ -49,11 +46,8 @@ public:
   virtual void shutdown (void);
 private:
   CORBA::ORB_var orb_;
-
 };
 
-
-
 /**
  * @class Delegated_Bottom_Impl
  *
diff --git a/TAO/tests/Multiple/server.cpp b/TAO/tests/Multiple/server.cpp
index a3ee10f8edd..c20b1a7d488 100644
--- a/TAO/tests/Multiple/server.cpp
+++ b/TAO/tests/Multiple/server.cpp
@@ -71,7 +71,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       Multiple::Bottom_var bottom =
         Multiple::Bottom::_narrow (object_act.in ());
 
-      // Now we stringfy the object reference.
+      // Now we stringify the object reference.
       CORBA::String_var ior =
         orb->object_to_string (bottom.in ());
 
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/ORB_shutdown/Foo_Bar.h b/TAO/tests/ORB_shutdown/Foo_Bar.h
index 36a17fc941d..aaa691f51c8 100644
--- a/TAO/tests/ORB_shutdown/Foo_Bar.h
+++ b/TAO/tests/ORB_shutdown/Foo_Bar.h
@@ -21,7 +21,7 @@ public:
 
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Ondemand_Write/Hello.h b/TAO/tests/Ondemand_Write/Hello.h
index 9f8734f5684..04fb3af1932 100644
--- a/TAO/tests/Ondemand_Write/Hello.h
+++ b/TAO/tests/Ondemand_Write/Hello.h
@@ -26,7 +26,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/POA/DSI/server.cpp b/TAO/tests/POA/DSI/server.cpp
index f702a4a42c8..4d74ddfce0a 100644
--- a/TAO/tests/POA/DSI/server.cpp
+++ b/TAO/tests/POA/DSI/server.cpp
@@ -60,6 +60,9 @@ write_iors_to_file (const char *first_ior)
   result = ACE_OS::fprintf (output_file,
                             "%s",
                             first_ior);
+
+  ACE_OS::fclose (output_file);
+
   if (result < 0 ||
       static_cast<size_t> (result) != ACE_OS::strlen (first_ior))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -68,8 +71,6 @@ write_iors_to_file (const char *first_ior)
                        ior_output_file),
                       -1);
 
-  ACE_OS::fclose (output_file);
-
   return 0;
 }
 
diff --git a/TAO/tests/POA/Deactivate_Object/Hello.h b/TAO/tests/POA/Deactivate_Object/Hello.h
index b81881e71cb..594576de08e 100644
--- a/TAO/tests/POA/Deactivate_Object/Hello.h
+++ b/TAO/tests/POA/Deactivate_Object/Hello.h
@@ -20,7 +20,7 @@ public:
   virtual char * get_string (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/POA/EndpointPolicy/Hello.h b/TAO/tests/POA/EndpointPolicy/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/POA/EndpointPolicy/Hello.h
+++ b/TAO/tests/POA/EndpointPolicy/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/POA/Explicit_Activation/server.cpp b/TAO/tests/POA/Explicit_Activation/server.cpp
index 54d1e76aa4d..b82f4b1bdef 100644
--- a/TAO/tests/POA/Explicit_Activation/server.cpp
+++ b/TAO/tests/POA/Explicit_Activation/server.cpp
@@ -78,6 +78,9 @@ write_iors_to_file (const char *first_ior,
   result = ACE_OS::fprintf (output_file_1,
                             "%s",
                             first_ior);
+
+  ACE_OS::fclose (output_file_1);
+
   if (result != ACE_OS::strlen (first_ior))
     ACE_ERROR_RETURN ((LM_ERROR,
                        "ACE_OS::fprintf failed while writing %C to %s\n",
@@ -88,6 +91,9 @@ write_iors_to_file (const char *first_ior,
   result = ACE_OS::fprintf (output_file_2,
                             "%s",
                             second_ior);
+
+  ACE_OS::fclose (output_file_2);
+
   if (result != ACE_OS::strlen (second_ior))
     ACE_ERROR_RETURN ((LM_ERROR,
                        "ACE_OS::fprintf failed while writing %C to %s\n",
@@ -98,6 +104,9 @@ write_iors_to_file (const char *first_ior,
   result = ACE_OS::fprintf (output_file_3,
                             "%s",
                             third_ior);
+
+  ACE_OS::fclose (output_file_3);
+
   if (result != ACE_OS::strlen (third_ior))
     ACE_ERROR_RETURN ((LM_ERROR,
                        "ACE_OS::fprintf failed while writing %C to %s\n",
@@ -105,9 +114,6 @@ write_iors_to_file (const char *first_ior,
                        ior_output_file_3),
                       -1);
 
-  ACE_OS::fclose (output_file_1);
-  ACE_OS::fclose (output_file_2);
-  ACE_OS::fclose (output_file_3);
 
   return 0;
 }
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp
index 687ad1e98b6..09ccb0a27f0 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp
@@ -20,6 +20,9 @@ write_iors_to_file (const char *first_ior)
   int result = ACE_OS::fprintf (output_file,
                                 "%s",
                                 first_ior);
+
+  ACE_OS::fclose (output_file);
+
   if (result <= 0
       || static_cast<size_t> (result) != ACE_OS::strlen (first_ior))
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -28,7 +31,6 @@ write_iors_to_file (const char *first_ior)
                        ior_output_file),
                       -1);
 
-  ACE_OS::fclose (output_file);
   return 0;
 }
 
diff --git a/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp
index d7ae92ac6a8..bc7526091aa 100644
--- a/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp
+++ b/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp
@@ -54,8 +54,8 @@ int
 Server_i::write_iors_to_file (const char *first_ior,
                               const char *second_ior)
 {
+  // No filename was specified; simply return
   if (ior_output_file_ == 0)
-    // No filename was specified; simply return
     return 0;
 
   ACE_TCHAR ior_output_file_1[BUFSIZ];
@@ -83,10 +83,11 @@ Server_i::write_iors_to_file (const char *first_ior,
   int result = ACE_OS::fprintf (output_file_1,
                                 "%s",
                                 first_ior);
+  ACE_OS::fclose (output_file_1);
   if (result <= 0
       || static_cast<size_t> (result) != ACE_OS::strlen (first_ior))
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "ACE_OS::fprintf failed while writing %s to %s\n",
+                       "ACE_OS::fprintf failed while writing %C to %s\n",
                        first_ior,
                        ior_output_file_1),
                       -1);
@@ -94,24 +95,21 @@ Server_i::write_iors_to_file (const char *first_ior,
   result = ACE_OS::fprintf (output_file_2,
                             "%s",
                             second_ior);
+  ACE_OS::fclose (output_file_2);
   if (result <= 0
       || static_cast<size_t> (result) != ACE_OS::strlen (second_ior))
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "ACE_OS::fprintf failed while writing %s to %s\n",
+                       "ACE_OS::fprintf failed while writing %C to %s\n",
                        second_ior,
                        ior_output_file_2),
                       -1);
-  ACE_OS::fclose (output_file_1);
-  ACE_OS::fclose (output_file_2);
   return 0;
 }
 
-// Initialisation of the ORB and POA.
-
+// Initialization of the ORB and POA.
 int
 Server_i::init (int argc, ACE_TCHAR **argv)
 {
-
   try
     {
       // Initialize the ORB.
diff --git a/TAO/tests/POA/Reference_Counted_Servant/server.cpp b/TAO/tests/POA/Reference_Counted_Servant/server.cpp
index 73ec73fae99..e11da6ae7f1 100644
--- a/TAO/tests/POA/Reference_Counted_Servant/server.cpp
+++ b/TAO/tests/POA/Reference_Counted_Servant/server.cpp
@@ -87,6 +87,8 @@ write_iors_to_file (const char *ior)
   result = ACE_OS::fprintf (output_file,
                             "%s",
                             ior);
+  ACE_OS::fclose (output_file);
+
   if (result != ACE_OS::strlen (ior))
     ACE_ERROR_RETURN ((LM_ERROR,
                        "ACE_OS::fprintf failed while writing %C to %s\n",
@@ -94,8 +96,6 @@ write_iors_to_file (const char *ior)
                        ior_output_file),
                       -1);
 
-  ACE_OS::fclose (output_file);
-
   return 0;
 }
 
diff --git a/TAO/tests/Parallel_Connect_Strategy/Test_i.h b/TAO/tests/Parallel_Connect_Strategy/Test_i.h
index 516e746b2f9..1017fb7be50 100644
--- a/TAO/tests/Parallel_Connect_Strategy/Test_i.h
+++ b/TAO/tests/Parallel_Connect_Strategy/Test_i.h
@@ -24,7 +24,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Param_Test/Param_Test.mpc b/TAO/tests/Param_Test/Param_Test.mpc
index 97a74931b30..0b887ef7890 100644
--- a/TAO/tests/Param_Test/Param_Test.mpc
+++ b/TAO/tests/Param_Test/Param_Test.mpc
@@ -26,7 +26,6 @@ project(*Server): taoserver, codeset, avoids_minimum_corba, avoids_corba_e_compa
   }
 
   Inline_Files {
-    param_testS.inl
     param_testC.inl
   }
 
diff --git a/TAO/tests/Policies/Manipulation.cpp b/TAO/tests/Policies/Manipulation.cpp
index 7e1169fb0f6..28603617dc6 100644
--- a/TAO/tests/Policies/Manipulation.cpp
+++ b/TAO/tests/Policies/Manipulation.cpp
@@ -114,6 +114,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "threads finished\n"));
 
+      orb->destroy ();
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/Hello.h b/TAO/tests/Portable_Interceptors/Bug_2133/Hello.h
index 782b1b2f573..af231fe1540 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/Hello.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown ();
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/RTCORBA/Banded_Connections/client.cpp b/TAO/tests/RTCORBA/Banded_Connections/client.cpp
index 77b7ba0bb6f..fb15c1bfa9d 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/client.cpp
+++ b/TAO/tests/RTCORBA/Banded_Connections/client.cpp
@@ -272,14 +272,10 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   try
     {
       // Initialize ORB.
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv);
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
       // Parse arguments.
-      int result =
-        parse_args (argc,
-                    argv);
+      int result = parse_args (argc, argv);
       if (result != 0)
         return result;
 
@@ -324,6 +320,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       result =
         thread_manager.wait ();
       ACE_ASSERT (result != -1);
+
+      orb->destroy ();
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
index e38d91d6d8f..540c1e002a2 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
+++ b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
@@ -85,6 +85,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         {
           test->shutdown ();
         }
+
+      orb->destroy ();
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/RTCORBA/Policies/Policies.cpp b/TAO/tests/RTCORBA/Policies/Policies.cpp
index 78b61e238c8..cd99d329e8a 100644
--- a/TAO/tests/RTCORBA/Policies/Policies.cpp
+++ b/TAO/tests/RTCORBA/Policies/Policies.cpp
@@ -173,6 +173,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                   "%s successful\n",
                   argv[0]));
 
+      orb->destroy ();
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h b/TAO/tests/Reliable_Oneways/Oneway_Receiver.h
index 2b4a9a6518a..6808ff66e5c 100644
--- a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h
+++ b/TAO/tests/Reliable_Oneways/Oneway_Receiver.h
@@ -24,7 +24,7 @@ public:
   virtual Test::Shutdown_Helper_ptr get_shutdown_helper (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Reliable_Oneways/Shutdown_Helper.h b/TAO/tests/Reliable_Oneways/Shutdown_Helper.h
index 44fb581fce5..7262e575081 100644
--- a/TAO/tests/Reliable_Oneways/Shutdown_Helper.h
+++ b/TAO/tests/Reliable_Oneways/Shutdown_Helper.h
@@ -20,7 +20,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Servant_To_Reference_Test/Test_i.h b/TAO/tests/Servant_To_Reference_Test/Test_i.h
index 23c41190da1..c478d11253c 100644
--- a/TAO/tests/Servant_To_Reference_Test/Test_i.h
+++ b/TAO/tests/Servant_To_Reference_Test/Test_i.h
@@ -19,7 +19,7 @@ public:
   virtual char * get_string (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
@@ -35,7 +35,7 @@ public:
   virtual char * get_string (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
@@ -51,7 +51,7 @@ public:
   virtual char * get_string (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Server_Leaks/Ping_Service.h b/TAO/tests/Server_Leaks/Ping_Service.h
index 06ebbe49590..b1f459c1cf2 100644
--- a/TAO/tests/Server_Leaks/Ping_Service.h
+++ b/TAO/tests/Server_Leaks/Ping_Service.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Server_Port_Zero/Hello.h b/TAO/tests/Server_Port_Zero/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Server_Port_Zero/Hello.h
+++ b/TAO/tests/Server_Port_Zero/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Skeleton_Inheritance/client.cpp b/TAO/tests/Skeleton_Inheritance/client.cpp
new file mode 100644
index 00000000000..d09c7da24f6
--- /dev/null
+++ b/TAO/tests/Skeleton_Inheritance/client.cpp
@@ -0,0 +1,102 @@
+// $Id$
+
+#include "idl_3C.h"
+
+#include "ace/Get_Opt.h"
+
+const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
+
+int
+parse_args (int argc, ACE_TCHAR *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:"));
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'k':
+        ior = get_opts.opt_arg ();
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-k <ior> "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates successful parsing of the command line
+  return 0;
+}
+
+int
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+{
+  try
+    {
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      CORBA::Object_var tmp = orb->string_to_object(ior);
+
+      ::Skeleton_Inheritance::Interface_3_var if_3 =
+        ::Skeleton_Inheritance::Interface_3::_narrow(tmp.in ());
+
+      if (CORBA::is_nil (if_3.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_DEBUG,
+                             "Nil ::Skeleton_Inheritance::Interface_1 "
+                             "reference <%s>\n",
+                             ior),
+                            1);
+        }
+
+      ACE_DEBUG ((LM_DEBUG, "Invoking operation 3\n"));
+      CORBA::String_var if_result_3 = if_3->operation_3 ();
+      ACE_DEBUG ((LM_DEBUG, "Invoking operation 2\n"));
+      CORBA::String_var if_result_2 = if_3->operation_2 ();
+      ACE_DEBUG ((LM_DEBUG, "Invoking operation 1\n"));
+      CORBA::String_var if_result_1 = if_3->operation_1 ();
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - strings returned:\n\t<%C>\n\t<%C>\n\t<%C>\n",
+                  if_result_1.in (),
+                  if_result_2.in (),
+                  if_result_3.in ()));
+
+      if (if_3->_is_a("no_name"))
+        {
+          ACE_ERROR ((LM_ERROR, "ERROR: no_name is known.\n"));
+        }
+      else
+        {
+          ACE_DEBUG ((LM_DEBUG, "OK: no_name is unknown.\n"));
+        }
+      const char * name = "IDL:Skeleton_Inheritance/Interface_1:1.0";
+      if (if_3->_is_a(name))
+        {
+          ACE_DEBUG ((LM_DEBUG, "OK: <%C> is known.\n",
+                      name));
+        }
+      else
+        {
+          ACE_ERROR ((LM_ERROR, "ERROR: <%C> is unknown\n",
+                      name));
+        }
+
+      if_3->shutdown ();
+
+      orb->destroy ();
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Exception caught:");
+      return 1;
+    }
+
+  return 0;
+}
diff --git a/TAO/tests/Skeleton_Inheritance/idl_1.idl b/TAO/tests/Skeleton_Inheritance/idl_1.idl
new file mode 100644
index 00000000000..d9f1d7950c4
--- /dev/null
+++ b/TAO/tests/Skeleton_Inheritance/idl_1.idl
@@ -0,0 +1,13 @@
+//
+// $Id$
+//
+
+module Skeleton_Inheritance
+{
+  interface Interface_1
+  {
+    string operation_1 ();
+
+    attribute long attribute_1;
+  };
+};
diff --git a/TAO/tests/Skeleton_Inheritance/idl_2.idl b/TAO/tests/Skeleton_Inheritance/idl_2.idl
new file mode 100644
index 00000000000..ccf628c4436
--- /dev/null
+++ b/TAO/tests/Skeleton_Inheritance/idl_2.idl
@@ -0,0 +1,15 @@
+//
+// $Id$
+//
+
+#include "idl_1.idl"
+
+module Skeleton_Inheritance
+{
+  interface Interface_2 : Interface_1
+  {
+    string operation_2 ();
+
+    readonly attribute string attribute_2;
+  };
+};
diff --git a/TAO/tests/Skeleton_Inheritance/idl_3.idl b/TAO/tests/Skeleton_Inheritance/idl_3.idl
new file mode 100644
index 00000000000..edb70e292f6
--- /dev/null
+++ b/TAO/tests/Skeleton_Inheritance/idl_3.idl
@@ -0,0 +1,17 @@
+//
+// $Id$
+//
+
+#include "idl_2.idl"
+
+module Skeleton_Inheritance
+{
+  interface Interface_3 : Interface_2
+  {
+    string operation_3 ();
+
+    oneway void shutdown ();
+
+    attribute short attribute_3;
+  };
+};
diff --git a/TAO/tests/Skeleton_Inheritance/interface_3_i.cpp b/TAO/tests/Skeleton_Inheritance/interface_3_i.cpp
new file mode 100644
index 00000000000..d4a5267eea0
--- /dev/null
+++ b/TAO/tests/Skeleton_Inheritance/interface_3_i.cpp
@@ -0,0 +1,68 @@
+// $Id$
+#include "interface_3_i.h"
+
+interface_3_i::interface_3_i (CORBA::ORB_ptr orb)
+  : orb_ (CORBA::ORB::_duplicate (orb))
+{
+}
+
+// INTERFACE 1
+char *
+interface_3_i::operation_1 (void)
+{
+  return CORBA::string_dup ("Invoked operation one");
+}
+
+::CORBA::Long
+interface_3_i::attribute_1 (void)
+{
+  return 10;
+}
+
+void
+interface_3_i::attribute_1 (::CORBA::Long attribute_1)
+{
+  ACE_UNUSED_ARG (attribute_1);
+}
+
+// INTERFACE 2
+
+char *
+interface_3_i::operation_2 (void)
+{
+  return CORBA::string_dup ("Invoked operation two");
+}
+
+char *
+interface_3_i::attribute_2 (void)
+{
+  return CORBA::string_dup ("Returning attribute_2");
+}
+
+//INTERFACE 3
+
+char *
+interface_3_i::operation_3 (void)
+{
+  return CORBA::string_dup ("Invoked operation three");
+}
+
+void
+interface_3_i::shutdown (void)
+{
+  this->orb_->shutdown ();
+}
+
+::CORBA::Short
+interface_3_i::attribute_3 (void)
+{
+  return 10;
+}
+
+void
+interface_3_i::attribute_3 (::CORBA::Short attribute_3)
+{
+  ACE_UNUSED_ARG (attribute_3);
+}
+
+
diff --git a/TAO/tests/Skeleton_Inheritance/interface_3_i.h b/TAO/tests/Skeleton_Inheritance/interface_3_i.h
new file mode 100644
index 00000000000..632ffeb6f6e
--- /dev/null
+++ b/TAO/tests/Skeleton_Inheritance/interface_3_i.h
@@ -0,0 +1,39 @@
+//
+// $Id$
+//
+
+#ifndef INTERFACE_3_I_H_
+#define INTERFACE_3_I_H_
+#include /**/ "ace/pre.h"
+
+#include "idl_3S.h"
+
+class interface_3_i
+  : public virtual POA_Skeleton_Inheritance::Interface_3
+{
+public:
+  /// Constructor
+  interface_3_i (CORBA::ORB_ptr orb);
+
+  virtual char * operation_1 (void);
+  virtual char * operation_2 (void);
+  virtual char * operation_3 (void);
+
+  virtual void shutdown (void);
+
+  virtual ::CORBA::Long attribute_1 (void);
+  virtual void attribute_1 (::CORBA::Long attribute_1);
+
+  virtual char * attribute_2 (void);
+
+  virtual ::CORBA::Short attribute_3 (void);
+  virtual void attribute_3 (::CORBA::Short attribute_3);
+
+private:
+  /// Use an ORB reference to convert strings to objects and shutdown
+  /// the application.
+  CORBA::ORB_var orb_;
+};
+
+#include /**/ "ace/post.h"
+#endif /* INTERFACE_3_I_H_ */
diff --git a/TAO/tests/Skeleton_Inheritance/run_test.pl b/TAO/tests/Skeleton_Inheritance/run_test.pl
new file mode 100755
index 00000000000..f45d4729c86
--- /dev/null
+++ b/TAO/tests/Skeleton_Inheritance/run_test.pl
@@ -0,0 +1,76 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+     & eval 'exec perl -S $0 $argv:q'
+     if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "$ENV{ACE_ROOT}/bin";
+use PerlACE::TestTarget;
+
+$status = 0;
+$debug_level = '0';
+$cdebug_level = '0';
+foreach $i (@ARGV) {
+    if ($i eq '-debug') {
+        $debug_level = '10';
+    }
+    if ($i eq '-cdebug') {
+      $cdebug_level = '10';
+    }
+}
+
+my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
+my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
+
+my $iorbase = "server.ior";
+my $server_iorfile = $server->LocalFile ($iorbase);
+my $client_iorfile = $client->LocalFile ($iorbase);
+$server->DeleteFile($iorbase);
+$client->DeleteFile($iorbase);
+
+$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile");
+$CL = $client->CreateProcess ("client", "-ORBdebuglevel $cdebug_level -k file://$client_iorfile");
+$server_status = $SV->Spawn ();
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    exit 1;
+}
+
+if ($server->WaitForFileTimed ($iorbase,
+                               $server->ProcessStartWaitInterval()) == -1) {
+    print STDERR "ERROR: cannot find file <$server_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+if ($server->GetFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+if ($client->PutFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot set file <$client_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval());
+
+if ($client_status != 0) {
+    print STDERR "ERROR: client returned $client_status\n";
+    $status = 1;
+}
+
+$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval());
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    $status = 1;
+}
+
+$server->DeleteFile($iorbase);
+$client->DeleteFile($iorbase);
+
+exit $status;
diff --git a/TAO/tests/Skeleton_Inheritance/server.cpp b/TAO/tests/Skeleton_Inheritance/server.cpp
new file mode 100644
index 00000000000..d9b0660b7a4
--- /dev/null
+++ b/TAO/tests/Skeleton_Inheritance/server.cpp
@@ -0,0 +1,103 @@
+// $Id$
+
+#include "interface_3_i.h"
+
+#include "ace/Get_Opt.h"
+#include "ace/OS_NS_stdio.h"
+
+const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
+
+int
+parse_args (int argc, ACE_TCHAR *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:"));
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'o':
+        ior_output_file = get_opts.opt_arg ();
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-o <iorfile>"
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates successful parsing of the command line
+  return 0;
+}
+
+int
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+{
+  try
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv);
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references("RootPOA");
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in ());
+
+      if (CORBA::is_nil (root_poa.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Panic: nil RootPOA\n"),
+                          1);
+
+      PortableServer::POAManager_var poa_manager = root_poa->the_POAManager ();
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      interface_3_i *if_3_impl = 0;
+      ACE_NEW_RETURN (if_3_impl,
+                      interface_3_i (orb.in ()),
+                      1);
+      PortableServer::ServantBase_var owner_transfer(if_3_impl);
+
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (if_3_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
+      ::Skeleton_Inheritance::Interface_3_var if_3 =
+        ::Skeleton_Inheritance::Interface_3::_narrow (object.in ());
+
+      CORBA::String_var ior = orb->object_to_string (if_3.in ());
+
+      // Output the IOR to the <ior_output_file>
+      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      if (output_file == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot open output file for writing IOR: %s\n",
+                           ior_output_file),
+                           1);
+      ACE_OS::fprintf (output_file, "%s", ior.in ());
+      ACE_OS::fclose (output_file);
+
+      poa_manager->activate ();
+
+      orb->run ();
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
+
+      root_poa->destroy (1, 1);
+
+      orb->destroy ();
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Exception caught:");
+      return 1;
+    }
+
+  return 0;
+}
diff --git a/TAO/tests/Skeleton_Inheritance/skel_inheritance.mpc b/TAO/tests/Skeleton_Inheritance/skel_inheritance.mpc
new file mode 100644
index 00000000000..78d643353fd
--- /dev/null
+++ b/TAO/tests/Skeleton_Inheritance/skel_inheritance.mpc
@@ -0,0 +1,209 @@
+// -*- MPC -*-
+// $Id$
+
+project(idl_one_gen): taoidldefaults {
+  custom_only = 1
+
+  idlflags += -Wb,stub_export_macro=SKELETON_INHERITANCE_STUB_1_Export \
+              -Wb,stub_export_include=skeleton_inheritance_stub_1_export.h \
+              -Wb,skel_export_macro=SKELETON_INHERITANCE_SKEL_1_Export \
+              -Wb,skel_export_include=skeleton_inheritance_skel_1_export.h \
+              -Gxhst -Gxhsk -Gd
+
+  IDL_Files {
+    idl_1.idl
+  }
+}
+
+project(idl_two_gen): taoidldefaults {
+  custom_only = 1
+
+  idlflags += -Wb,stub_export_macro=SKELETON_INHERITANCE_STUB_2_Export \
+              -Wb,stub_export_include=skeleton_inheritance_stub_2_export.h \
+              -Wb,skel_export_macro=SKELETON_INHERITANCE_SKEL_2_Export \
+              -Wb,skel_export_include=skeleton_inheritance_skel_2_export.h \
+              -Gxhst -Gxhsk -Gd
+
+  IDL_Files {
+    idl_2.idl
+  }
+}
+
+project(idl_three_gen): taoidldefaults {
+  custom_only = 1
+
+  idlflags += -Wb,stub_export_macro=SKELETON_INHERITANCE_STUB_3_Export \
+              -Wb,stub_export_include=skeleton_inheritance_stub_3_export.h \
+              -Wb,skel_export_macro=SKELETON_INHERITANCE_SKEL_3_Export \
+              -Wb,skel_export_include=skeleton_inheritance_skel_3_export.h \
+              -Gxhst -Gxhsk -Gd
+
+  IDL_Files {
+    idl_3.idl
+  }
+}
+
+project(stub_one): taolib {
+  sharedname = stub_one
+  after += idl_one_gen
+
+  dynamicflags += SKELETON_INHERITANCE_STUB_1_BUILD_DLL
+
+  Source_Files {
+    idl_1C.cpp
+  }
+
+  Header_Files {
+    idl_1C.h
+  skeleton_inheritance_stub_1_export.h
+  }
+
+  Inline_Files {
+  idl_1C.inl
+  }
+}
+
+project(skel_one): taolib, portableserver {
+  after += idl_one_gen stub_one
+  libs += stub_one
+
+  sharedname = skel_one
+  dynamicflags += SKELETON_INHERITANCE_SKEL_1_BUILD_DLL
+
+  Source_Files {
+    idl_1S.cpp
+  }
+
+  Header_Files {
+    idl_1S.h
+  skeleton_inheritance_skel_1_export.h
+  }
+
+  Inline_Files {
+  idl_1S.inl
+  }
+}
+
+
+project(stub_two): taolib {
+  sharedname = stub_two
+  after += idl_two_gen idl_one_gen stub_one
+  libs += stub_one
+
+  dynamicflags += SKELETON_INHERITANCE_STUB_2_BUILD_DLL
+
+  Source_Files {
+    idl_2C.cpp
+  }
+
+  Header_Files {
+    idl_2C.h
+  skeleton_inheritance_stub_2_export.h
+  }
+
+  Inline_Files {
+  idl_2C.inl
+  }
+}
+
+project(skel_two): taolib, portableserver {
+  after += idl_two_gen stub_two skel_one
+  libs += stub_two skel_one stub_one
+
+  sharedname = skel_two
+  dynamicflags += SKELETON_INHERITANCE_SKEL_2_BUILD_DLL
+
+  Source_Files {
+    idl_2S.cpp
+  }
+
+  Header_Files {
+    idl_2S.h
+  skeleton_inheritance_skel_2_export.h
+  }
+
+  Inline_Files {
+  idl_2S.inl
+  }
+}
+
+
+project(stub_three): taolib {
+  sharedname = stub_three
+  after += idl_three_gen idl_two_gen idl_one_gen \
+           stub_one stub_two
+  libs += stub_two stub_one
+
+  dynamicflags += SKELETON_INHERITANCE_STUB_3_BUILD_DLL
+
+  Source_Files {
+    idl_3C.cpp
+  }
+
+  Header_Files {
+    idl_3C.h
+  skeleton_inheritance_stub_3_export.h
+  }
+
+  Inline_Files {
+  idl_3C.inl
+  }
+}
+
+project(skel_three): taolib, portableserver {
+  after += idl_three_gen stub_three skel_one skel_two
+  libs += stub_three skel_two stub_two skel_one stub_one
+
+  sharedname = skel_three
+  dynamicflags += SKELETON_INHERITANCE_SKEL_3_BUILD_DLL
+
+  Source_Files {
+    idl_3S.cpp
+  }
+
+  Header_Files {
+    idl_3S.h
+  skeleton_inheritance_skel_3_export.h
+  }
+
+  Inline_Files {
+  idl_3S.inl
+  }
+}
+
+project(*Server): taoserver {
+  after +=  idl_gen \
+            stub_one skel_one \
+            stub_two skel_two \
+            stub_three skel_three
+  libs +=   skel_three stub_three  \
+            stub_two skel_two \
+            skel_one stub_one
+
+  Source_Files {
+    interface_3_i.cpp
+    server.cpp
+  }
+
+  Header_Files {
+    interface_3_i.h
+  }
+  IDL_Files {
+  }
+}
+
+project(*Client): taoclient {
+  after +=  idl_gen \
+            stub_one \
+            stub_two \
+            stub_three
+  libs +=   stub_three stub_two stub_one
+
+  Source_Files {
+    client.cpp
+  }
+
+  IDL_Files {
+  }
+}
+
diff --git a/TAO/tests/Two_Objects/First_i.h b/TAO/tests/Two_Objects/First_i.h
index 618fcf042be..2c66560aa93 100644
--- a/TAO/tests/Two_Objects/First_i.h
+++ b/TAO/tests/Two_Objects/First_i.h
@@ -26,7 +26,7 @@ public:
 
 private:
 
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
   ACE_Auto_Event &two_way_done_;
diff --git a/TAO/tests/Two_Objects/Object_Factory_i.h b/TAO/tests/Two_Objects/Object_Factory_i.h
index 6599e00f80f..5735a295a6b 100644
--- a/TAO/tests/Two_Objects/Object_Factory_i.h
+++ b/TAO/tests/Two_Objects/Object_Factory_i.h
@@ -26,7 +26,7 @@ public:
   Two_Objects_Test::Second_ptr create_second (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
   CORBA::ULong length_;
diff --git a/TAO/tests/Two_Objects/Second_i.h b/TAO/tests/Two_Objects/Second_i.h
index 214b9be1ece..b14d017012f 100644
--- a/TAO/tests/Two_Objects/Second_i.h
+++ b/TAO/tests/Two_Objects/Second_i.h
@@ -26,7 +26,7 @@ public:
   void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
   CORBA::ULong length_;
diff --git a/TAO/tests/ZIOP/Hello.h b/TAO/tests/ZIOP/Hello.h
index 6209a6541e8..239f659a2a0 100644
--- a/TAO/tests/ZIOP/Hello.h
+++ b/TAO/tests/ZIOP/Hello.h
@@ -25,7 +25,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ULong length_;
 
diff --git a/TAO/utils/logWalker/HostProcess.cpp b/TAO/utils/logWalker/HostProcess.cpp
index 40c99037617..d68d518bfd8 100644
--- a/TAO/utils/logWalker/HostProcess.cpp
+++ b/TAO/utils/logWalker/HostProcess.cpp
@@ -14,6 +14,11 @@ PeerNode::PeerNode (long h, PeerProcess *p)
 {
 }
 
+PeerNode::~PeerNode (void)
+{
+  delete peer_;
+}
+
 HostProcess::HostProcess (const ACE_CString &src, long pid)
   : pid_(pid),
     logfile_name_(src)
@@ -34,15 +39,24 @@ HostProcess::~HostProcess (void)
     {
       delete reinterpret_cast<Thread *>(i.next()->item_);
     }
-#if 0
-  for (PeerProcs::ITERATOR i = by_addr_.begin(); i != servers_.end(); i++)
+
+  for (PeerArray::ITERATOR i(this->by_handle_); !i.done(); i++)
     {
-      PeerProcs::ENTRY *entry;
+      ACE_DLList_Node *entry;
       if (i.next(entry) == 0)
         break;
-      delete entry->item();
+      //i.remove ();
+
+      PeerNode *node = reinterpret_cast<PeerNode*>(entry->item_);
+      PeerProcess *pp = node->peer_;
+      const ACE_CString &addr = pp->is_server() ?
+        pp->server_addr() : pp->last_client_addr();
+      this->by_addr_.unbind (addr);
+      delete node;
     }
-#endif
+
+  this->by_addr_.close();
+
 }
 
 void
diff --git a/TAO/utils/logWalker/HostProcess.h b/TAO/utils/logWalker/HostProcess.h
index 045d2ce0ab9..d92e9dd2630 100644
--- a/TAO/utils/logWalker/HostProcess.h
+++ b/TAO/utils/logWalker/HostProcess.h
@@ -27,6 +27,7 @@ class Thread;
 struct PeerNode
 {
   PeerNode (long h, PeerProcess *p);
+  ~PeerNode (void);
   long handle_;
   PeerProcess *peer_;
   bool closed_;
diff --git a/TAO/utils/logWalker/Invocation.cpp b/TAO/utils/logWalker/Invocation.cpp
index fd357bf9d0e..7e8dc980154 100644
--- a/TAO/utils/logWalker/Invocation.cpp
+++ b/TAO/utils/logWalker/Invocation.cpp
@@ -21,6 +21,8 @@ static const char *size_leadin = 0;
 static size_t leadin_len = 0;
 static const size_t giop_header_len = 12;
 
+static const int date_format = 2;
+
 // GIOP 1.2 header: 12 bytes
 // Magic: 4
 // ver:   2
@@ -138,6 +140,12 @@ Invocation::GIOP_Buffer::GIOP_Buffer(const char *text,
       ACE_OS::strncpy(timebuf, text, (time_tok - text));
       timebuf[time_tok - text] = 0;
       char *hms = ACE_OS::strchr (timebuf,' ');
+      if (Session::date_format() == 2) // MMM DD hh:mm:ss.msec YYYY
+        {
+          if (hms != 0)
+            hms = ACE_OS::strchr (hms+1,' ');
+        }
+
       if (hms != 0)
         {
           int hr, min, sec, msec;
diff --git a/TAO/utils/logWalker/Log.cpp b/TAO/utils/logWalker/Log.cpp
index b8ebdb070a9..0f2ebfa7889 100644
--- a/TAO/utils/logWalker/Log.cpp
+++ b/TAO/utils/logWalker/Log.cpp
@@ -629,6 +629,60 @@ Log::parse_handler_open (Log *this_, char *line, size_t offset)
 }
 
 void
+Log::parse_SSLIOP_from_client (Log *this_, char *line, size_t offset)
+{
+  long pid = 0;
+  long tid = 0;
+  this_->get_pid_tid(pid,tid,line);
+
+  HostProcess *hp = this_->get_host(pid);
+  Thread *thr = hp == 0 ? 0 : hp->find_thread (tid);
+
+  char *addr = ACE_OS::strchr(line,'<') +1;
+  char *c = ACE_OS::strchr(addr,'>');
+  *c = '\0';
+  c = ACE_OS::strstr(c+1,"on [");
+
+  PeerProcess *pp = thr->pending_peer();
+  if (pp == 0)
+    {
+      pp = new PeerProcess (offset, false);
+      thr->pending_peer (pp);
+    }
+
+  pp->set_server_addr(addr);
+}
+void
+Log::parse_SSLIOP_from_server (Log *this_, char *line, size_t offset)
+{
+  long pid = 0;
+  long tid = 0;
+  this_->get_pid_tid(pid,tid,line);
+
+  HostProcess *hp = this_->get_host(pid);
+  Thread *thr = hp == 0 ? 0 : hp->find_thread (tid);
+
+  char *addr = ACE_OS::strchr(line,'<') +1;
+  char *c = ACE_OS::strchr(addr,'>');
+  *c = '\0';
+  c = ACE_OS::strstr(c+1,"on [");
+  long handle = ACE_OS::strtol(c + 4,0,10);
+  PeerProcess *pp = thr->pending_peer();
+  if (pp == 0)
+    {
+      ACE_ERROR ((LM_ERROR,"%d: no pending peer for file %s\n",
+                  offset, this_->origin_.c_str()));
+     return;
+    }
+
+  Transport *trans = new Transport (addr,false,offset);
+  pp->add_transport(trans);
+  trans->handle_ = handle;
+  thr->pending_peer(0);
+  hp->add_peer(handle,pp);
+}
+
+void
 Log::parse_begin_connection (Log *this_, char *line, size_t offset)
 {
   long pid = 0;
@@ -651,6 +705,20 @@ Log::parse_begin_connection (Log *this_, char *line, size_t offset)
 }
 
 void
+Log::parse_SSLIOP_begin_connection (Log *this_, char *line, size_t offset)
+{
+  long pid = 0;
+  long tid = 0;
+  this_->get_pid_tid(pid,tid,line);
+
+  HostProcess *hp = this_->get_host(pid);
+  Thread *thr = hp == 0 ? 0 : hp->find_thread (tid);
+
+  PeerProcess *pp = new PeerProcess(offset,true);
+  thr->pending_peer (pp);
+}
+
+void
 Log::parse_local_addr (Log *this_, char *line, size_t offset)
 {
   long pid = 0;
@@ -711,6 +779,7 @@ Log::parse_line (char *line, size_t offset)
       { "GIOP_Message_Base::dump_msg,", parse_dump_msg },
       { "GIOP message - HEXDUMP", parse_HEXDUMP },
       { "open_i, listening on:", parse_open_listener },
+      { "open_i - listening on:", parse_open_listener },
       { "Muxed_TMS[", parse_muxed_tms },
       { "Exclusive_TMS::request_id", parse_exclusive_tms },
       { "process_parsed_messages", parse_process_parsed_msgs },
@@ -718,6 +787,9 @@ Log::parse_line (char *line, size_t offset)
       { "Wait_On_Read", parse_wait_on_read },
       { "::cleanup_queue, byte_count", parse_cleanup_queue },
       { "close_connection_eh", parse_close_connection },
+      { "ssliop_connect, making a new ", parse_SSLIOP_begin_connection },
+      { "SSLIOP connection from client", parse_SSLIOP_from_client },
+      { "SSLIOP connection accepted from server", parse_SSLIOP_from_server },
       { "IIOP_Connector::begin_connection, to ", parse_begin_connection },
       { "IIOP_Connection_Handler::open, The local addr is", parse_local_addr },
       { "opened as TAO_SERVER_ROLE", parse_open_as_server },
diff --git a/TAO/utils/logWalker/Log.h b/TAO/utils/logWalker/Log.h
index 6d4e2b4da09..3aaffa8853d 100644
--- a/TAO/utils/logWalker/Log.h
+++ b/TAO/utils/logWalker/Log.h
@@ -45,6 +45,7 @@ private:
   void parse_line (char* line, size_t offset);
 
   static void parse_handler_open (Log *this_, char *line, size_t offset);
+  static void parse_SSLIOP_handler_open (Log *this_, char *line, size_t offset);
   static void parse_dump_msg (Log *this_, char *line, size_t offset);
   static void parse_HEXDUMP (Log *this_, char *line, size_t offset);
   static void parse_open_listener (Log *this_, char *line, size_t offset);
@@ -57,6 +58,9 @@ private:
   static void parse_cleanup_queue (Log *this_, char *line, size_t offset);
   static void parse_close_connection (Log *this_, char *line, size_t offset);
   static void parse_begin_connection (Log *this_, char *line, size_t offset);
+  static void parse_SSLIOP_begin_connection (Log *this_, char *line, size_t offset);
+  static void parse_SSLIOP_from_client (Log *this_, char *line, size_t offset);
+  static void parse_SSLIOP_from_server (Log *this_, char *line, size_t offset);
   static void parse_local_addr (Log *this_, char *line, size_t offset);
   static void parse_open_as_server (Log *this_, char *line, size_t offset);
 
diff --git a/TAO/utils/logWalker/PeerProcess.cpp b/TAO/utils/logWalker/PeerProcess.cpp
index a2d76cd08d8..10669845dda 100644
--- a/TAO/utils/logWalker/PeerProcess.cpp
+++ b/TAO/utils/logWalker/PeerProcess.cpp
@@ -54,6 +54,14 @@ PeerProcess::~PeerProcess (void)
         break;
       delete entry->item();
     }
+  for (TransportList::ITERATOR i(this->transports_); !i.done(); i++)
+    {
+      ACE_DLList_Node *entry;
+      if (i.next(entry) == 0)
+        break;
+      //i.remove ();
+      delete reinterpret_cast<Transport*>(entry->item_);
+    }
 }
 
 void
diff --git a/TAO/utils/logWalker/Session.cpp b/TAO/utils/logWalker/Session.cpp
index 898be5e84c6..ad497703eb9 100644
--- a/TAO/utils/logWalker/Session.cpp
+++ b/TAO/utils/logWalker/Session.cpp
@@ -9,6 +9,8 @@
 
 long
 Session::tao_version_ = 200;
+int
+Session::date_format_ = 1;
 
 Session::Session (void)
 {
@@ -51,6 +53,24 @@ Session::tao_version (void)
   return tao_version_;
 }
 
+bool
+Session::set_date_format (ACE_TCHAR *str)
+{
+  if (ACE_OS::strncmp(str, ACE_TEXT("1"), 1)== 0)
+    date_format_ = 1;
+  else if (ACE_OS::strncmp (str, ACE_TEXT("2"), 1) == 0)
+    date_format_ = 2;
+   else
+    return false;
+  return true;
+}
+
+int
+Session::date_format (void)
+{
+  return date_format_;
+}
+
 void
 Session::add_process (HostProcess *proc)
 {
diff --git a/TAO/utils/logWalker/Session.h b/TAO/utils/logWalker/Session.h
index 2219921469a..7e944fc5701 100644
--- a/TAO/utils/logWalker/Session.h
+++ b/TAO/utils/logWalker/Session.h
@@ -33,6 +33,9 @@ public:
 
   static bool set_tao_version (ACE_TCHAR *str);
   static long tao_version (void);
+  static int date_format (void);
+  static bool set_date_format (ACE_TCHAR *ser);
+
   void alternate_address (const char *string);
   void default_service (const char *string);
 
@@ -53,6 +56,7 @@ private:
   ACE_CString base_dir_;
   ACE_CString outfile_;
   static long tao_version_;
+  static int date_format_;
 };
 
 #endif // LOG_WALKER_SESSION_H
diff --git a/TAO/utils/logWalker/logWalker.cpp b/TAO/utils/logWalker/logWalker.cpp
index 4e99f33de40..cbd0c7375c3 100644
--- a/TAO/utils/logWalker/logWalker.cpp
+++ b/TAO/utils/logWalker/logWalker.cpp
@@ -111,12 +111,13 @@ void
 print_help (void)
 {
   ACE_DEBUG ((LM_DEBUG, "tao_logWalker recongizes the following arguments\n"));
-  ACE_DEBUG ((LM_DEBUG, "-o <filename> - write all output to specified file\n"));
-  ACE_DEBUG ((LM_DEBUG, "-d <directory> - create separate output files, one per log, and put them in specified directory.\n   Either -o or -d may be set but not both. Default output to stdout.\n"));
-  ACE_DEBUG ((LM_DEBUG, "-m <manifest> - Take inputs from named manifest file\n"));
-  ACE_DEBUG ((LM_DEBUG, "-t <1.5 .. 2.0>  - set source TAO version, default 2.0\n"));
-  ACE_DEBUG ((LM_DEBUG, "-a <name=address> - bind an alias to a host address.\n   Repeat as many times as necessary.\n"));
-  ACE_DEBUG ((LM_DEBUG, "-p <service=address> - bind a service such as Naming to a specific endpoint address\n"));
+  ACE_DEBUG ((LM_DEBUG, "-outfile <filename> - write all output to specified file\n"));
+  ACE_DEBUG ((LM_DEBUG, "-dir <directory> - create separate output files, one per log, and put them in specified directory.\n   Either -outfile or -dir may be set but not both. Default output to stdout.\n"));
+  ACE_DEBUG ((LM_DEBUG, "-manifest <manifest> - Take inputs from named manifest file\n"));
+  ACE_DEBUG ((LM_DEBUG, "-tao <1.5 .. 2.0>  - set source TAO version, default 2.0\n"));
+  ACE_DEBUG ((LM_DEBUG, "-date <1|2> - interpret dates as 1) YYYY-MM-DD hh:mm:ss.sss, or 2) MMM DD hh:mm:ss.sss YYYY\n"));
+  ACE_DEBUG ((LM_DEBUG, "-alias <name=address> - bind an alias to a host address.\n   Repeat as many times as necessary.\n"));
+  ACE_DEBUG ((LM_DEBUG, "-proc <service=address> - bind a service such as Naming to a specific endpoint address\n"));
 }
 
 int
@@ -131,7 +132,8 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv)
   Session session;
   for (int i = 1; i < argc; i++)
     {
-      if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-o")) == 0)
+      if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-outfile")) == 0 ||
+          ACE_OS::strcasecmp (argv[i], ACE_TEXT("-o")) == 0)
         {
           if (session.has_dir())
             ACE_ERROR_RETURN ((LM_ERROR,
@@ -140,7 +142,8 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv)
           session.outfile(ACE_TEXT_ALWAYS_CHAR(argv[++i]));
           continue;
         }
-      if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-d")) == 0)
+      if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-dir")) == 0 ||
+          ACE_OS::strcasecmp (argv[i], ACE_TEXT("-d")) == 0)
         {
           if (session.has_outfile())
             ACE_ERROR_RETURN ((LM_ERROR,
@@ -149,12 +152,14 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv)
           session.make_dir (ACE_TEXT_ALWAYS_CHAR(argv[++i]));
           continue;
         }
-      if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-m")) == 0)
+      if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-manifest")) == 0 ||
+          ACE_OS::strcasecmp (argv[i], ACE_TEXT("-m")) == 0)
         {
           parse_manifest (session, argv[++i]);
           continue;
         }
-      if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-t")) == 0)
+      if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-tao")) == 0 ||
+          ACE_OS::strcasecmp (argv[i], ACE_TEXT("-t")) == 0)
         {
           if (Session::set_tao_version (argv[++i]))
             continue;
@@ -162,12 +167,23 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv)
             ACE_ERROR_RETURN ((LM_ERROR,
                                ACE_TEXT("TAO version must be 1.5, 1.6, 1.7, 1.8, or 2.0 \n")), 0);
         }
-      if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-a")) == 0)
+      if (ACE_OS::strcasecmp (argv[i], ACE_TEXT ("-date")) == 0)
+        {
+          if (Session::set_date_format (argv[++i]))
+            continue;
+          else
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               ACE_TEXT("Date format option must be 1 or 2\n")), 0);
+        }
+
+      if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-alias")) == 0 ||
+          ACE_OS::strcasecmp (argv[i], ACE_TEXT("-a")) == 0)
         {
           session.alternate_address (ACE_TEXT_ALWAYS_CHAR (argv[++i]));
           continue;
         }
-      if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-p")) == 0)
+      if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-proc")) == 0 ||
+          ACE_OS::strcasecmp (argv[i], ACE_TEXT("-p")) == 0)
         {
           session.default_service (ACE_TEXT_ALWAYS_CHAR (argv[++i]));
           continue;