start work branch

180 files changed, 16823 insertions, 9184 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 bfb39998bf7..e879e6bd458 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,1532 +1,69 @@
-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.
+Mon Dec 12 07:33:25 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         === 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.
+        Fri Dec  9 10:41:02 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
-                * bin/mwc.pl:
-                  Removed unnecessary STDERR.
+                * docs/svn/config:
+                  Subversion should ignore *_svnt_T.*.
 
         === 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:
+Mon Dec  5 22:23:25 UTC 2011  Steve Huston  <shuston@riverace.com>
 
-          Fix some inconsistencies in the new android-specific wrappers.
+        * ace/DLL.h:
+        * ace/DLL_Manager.h: Corrected and expanded the descriptions of how
+          DLL/library names are handled, decorated, and located.
 
-        * ace/config-android.h:
+Mon Dec  5 20:16:51 UTC 2011  Steve Huston  <shuston@riverace.com>
 
-          Android does not supply std::wstring
+        * 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.
 
-        * include/makeinclude/platform_linux_android.GNU:
+        * tests/Atomic_Op_Test.cpp: Added test for exchange().
 
-          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.
+        * NEWS: Added description of the new exchange() method.
 
-Thu Aug  4 22:11:26 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+Mon Dec  5 12:27:54 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * 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/ChangeLog.BRANCH b/ACE/ChangeLog.BRANCH
deleted file mode 100644
index c9e73ef16bb..00000000000
--- a/ACE/ChangeLog.BRANCH
+++ /dev/null
@@ -1,11 +0,0 @@
-Fri Dec  9 10:41:02 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * docs/svn/config:
-          Subversion should ignore *_svnt_T.*.
-
-
-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/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 5e0319c01f6..72f40092433 100644
--- a/ACE/NEWS
+++ b/ACE/NEWS
@@ -1,4 +1,12 @@
-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
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/Countdown_Time.cpp b/ACE/ace/Countdown_Time.cpp
index dded80fc592..335931514e4 100644
--- a/ACE/ace/Countdown_Time.cpp
+++ b/ACE/ace/Countdown_Time.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Countdown_Time.h"
+#include "ace/OS_NS_sys_time.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Countdown_Time.inl"
@@ -8,11 +9,9 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_Countdown_Time::ACE_Countdown_Time (ACE_Time_Value *max_wait_time,
-                                        ACE_Time_Value (*gettimeofday)(void))
-: max_wait_time_ (max_wait_time),
-  stopped_ (false),
-  gettimeofday_ (gettimeofday)
+ACE_Countdown_Time::ACE_Countdown_Time (ACE_Time_Value *max_wait_time)
+  : max_wait_time_ (max_wait_time),
+    stopped_ (false)
 {
   this->start ();
 }
@@ -27,7 +26,7 @@ ACE_Countdown_Time::start (void)
 {
   if (this->max_wait_time_ != 0)
     {
-      this->start_time_ = this->gettimeofday ();
+      this->start_time_ = ACE_OS::gettimeofday ();
       this->stopped_ = false;
     }
 }
@@ -38,7 +37,7 @@ ACE_Countdown_Time::stop (void)
   if (this->max_wait_time_ != 0 && !this->stopped_)
     {
       ACE_Time_Value const elapsed_time =
-        this->gettimeofday () - this->start_time_;
+        ACE_OS::gettimeofday () - this->start_time_;
 
       if (elapsed_time >= ACE_Time_Value::zero &&
           *this->max_wait_time_ > elapsed_time)
diff --git a/ACE/ace/Countdown_Time.h b/ACE/ace/Countdown_Time.h
index b4630e9dc22..1d17c3aead7 100644
--- a/ACE/ace/Countdown_Time.h
+++ b/ACE/ace/Countdown_Time.h
@@ -23,7 +23,6 @@
 
 #include "ace/Time_Value.h"
 #include "ace/Copy_Disabled.h"
-#include "ace/OS_NS_sys_time.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -39,10 +38,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Export ACE_Countdown_Time : private ACE_Copy_Disabled
 {
 public:
-  /// Cache the @a max_wait_time and call @c start(), use
-  /// application supplied gettimeofday function.
-  explicit ACE_Countdown_Time (ACE_Time_Value *max_wait_time,
-                               ACE_Time_Value (*gettimeofday)(void) = 0);
+  /// Cache the @a max_wait_time and call @c start().
+  ACE_Countdown_Time (ACE_Time_Value *max_wait_time);
 
   /// Destructor, makes sure the max_wait_time that got passed as pointer
   /// to the constructor is updated with the time elapsed.
@@ -62,13 +59,6 @@ public:
   /// Returns true if we've already been stopped, else false.
   bool stopped (void) const;
 
-  /**
-   * Returns the current time of day.  This method allows different
-   * instantiations of the countdown to use special high resolution
-   * timers.
-   */
-  ACE_Time_Value gettimeofday (void);
-
 private:
   /// Maximum time we were willing to wait.
   ACE_Time_Value *max_wait_time_;
@@ -78,9 +68,6 @@ private:
 
   /// Keeps track of whether we've already been stopped.
   bool stopped_;
-
-  /// Pointer to function that returns the current time of day.
-  ACE_Time_Value (*gettimeofday_)(void);
 };
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Countdown_Time.inl b/ACE/ace/Countdown_Time.inl
index 95a755cf291..3911ca85bda 100644
--- a/ACE/ace/Countdown_Time.inl
+++ b/ACE/ace/Countdown_Time.inl
@@ -17,13 +17,4 @@ ACE_Countdown_Time::update (void)
   this->start ();
 }
 
-ACE_INLINE ACE_Time_Value
-ACE_Countdown_Time::gettimeofday (void)
-{
-  if (this->gettimeofday_)
-    return this->gettimeofday_ ();
-  else
-    return ACE_OS::gettimeofday ();
-}
-
 ACE_END_VERSIONED_NAMESPACE_DECL
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/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/Timer_Queue_T.h b/ACE/ace/Timer_Queue_T.h
index 1fe1e270feb..4ed6fd4a30f 100644
--- a/ACE/ace/Timer_Queue_T.h
+++ b/ACE/ace/Timer_Queue_T.h
@@ -210,9 +210,6 @@ public:
   /// Type of Iterator.
   typedef ACE_Timer_Queue_Iterator_T<TYPE, FUNCTOR, ACE_LOCK> ITERATOR;
 
-  /// Timer method type
-  typedef ACE_Time_Value (* TIMER_METHOD)(void);
-
   // = Initialization and termination methods.
   /**
    * Default constructor. @a upcall_functor is the instance of the
@@ -351,11 +348,7 @@ public:
 
   /// Allows applications to control how the timer queue gets the time
   /// of day.
-  void gettimeofday (TIMER_METHOD gettimeofday);
-
-  /// Allows to propagate application defined timer method to other
-  /// timing methods/objects.
-  TIMER_METHOD get_timer_method (void) const;
+  void gettimeofday (ACE_Time_Value (*gettimeofday)(void));
 
   /// Determine the next event to timeout.  Returns @a max if there are
   /// no pending timers or if all pending timers are longer than max.
@@ -450,7 +443,7 @@ protected:
   ACE_Free_List<ACE_Timer_Node_T<TYPE> > *free_list_;
 
   /// Pointer to function that returns the current time of day.
-  TIMER_METHOD gettimeofday_;
+  ACE_Time_Value (*gettimeofday_)(void);
 
   /// Upcall functor
   FUNCTOR *upcall_functor_;
diff --git a/ACE/ace/Timer_Queue_T.inl b/ACE/ace/Timer_Queue_T.inl
index 30e32862618..7275119e2e1 100644
--- a/ACE/ace/Timer_Queue_T.inl
+++ b/ACE/ace/Timer_Queue_T.inl
@@ -208,17 +208,11 @@ ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK>::gettimeofday (void)
 }
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_INLINE void
-ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK>::gettimeofday (TIMER_METHOD gettimeofday)
+ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK>::gettimeofday (ACE_Time_Value (*gettimeofday)(void))
 {
   this->gettimeofday_ = gettimeofday;
 }
 
-template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_INLINE typename ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK>::TIMER_METHOD
-ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK>::get_timer_method (void) const
-{
-  return this->gettimeofday_;
-}
-
 template <class TYPE, class FUNCTOR, class ACE_LOCK> ACE_INLINE FUNCTOR &
 ACE_Timer_Queue_T<TYPE, FUNCTOR, ACE_LOCK>::upcall_functor (void)
 {
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/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/fuzz.pl b/ACE/bin/fuzz.pl
index e8abaadfaf7..44fa50a5d54 100755
--- a/ACE/bin/fuzz.pl
+++ b/ACE/bin/fuzz.pl
@@ -1963,7 +1963,6 @@ sub check_for_non_bool_operators ()
 }
 
 # This test verifies that all filenames are short enough
-
 sub check_for_long_file_names ()
 {
     my $max_filename = 50;
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 2c3756ba5b8..ee52484b4b2 100644
--- a/ACE/docs/bczar/bczar.html
+++ b/ACE/docs/bczar/bczar.html
@@ -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/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/CIAO/ChangeLog b/CIAO/ChangeLog
index 8442c721afb..b9e8f1970c3 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,2166 +1,306 @@
-Tue Nov 29 09:55:32 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Dec 12 07:33:25 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
+        Merged changes from our work branch. Facet servants are now generated
+        as C++ template at the moment the interface is declared, this reduces
+        the amount of code generated heavily. Component/Connector context is
+        now also generated as C++ template
 
         === start changelog ===
 
-        Thu Nov 24 12:31:23 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+        Fri Dec  9 16:07:48 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
-                * tests/IDL_Test/Inherited_Servants/Derived.mpc:
-                  Fixed afters.
+                * connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.idl:
+                * connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc:
+                * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc:
+                  Fixed compile errors.
 
-        Thu Nov 24 07:40:14 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+        Fri Dec  9 15:41:59 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.
+                * connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.idl:
+                * connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc:
+                * connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc:
+                  Also generate a Single_Service_Common lem.
 
-        Fri Nov  4 15:47:29 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+        Fri Dec  9 14:28:24 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
-                * *.mpc:
-                  Removed all S.inl entries.
+                * tests/Bug_3834_Regression/Moo.mpc:
+                  Fixed afters and linker errors on windows.
 
-        Fri Nov  4 16:16:35 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+        Fri Dec  9 14:15:16 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
-                * bin/generate_component_mpc.pl:
-                  Removed reference to S.inl
+                * tests/Bug_3834_Regression/CompA.mpc:
+                * tests/Bug_3834_Regression/Moo.mpc:
+                  Fixed link issues on windows.
 
-        Mon Nov 21 15:21:00 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+        Fri Dec  9 13:42:40 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
-                * tests/IDL_Test/Inherited_Servants/Derived.mpc:
-                  Fixed mpc issue
+                * tests/Bug_3834_Regression/CompA.idl:
+                * tests/Bug_3834_Regression/CompA.mpc:
+                * tests/Bug_3834_Regression/Moo.idl:
+                * tests/Bug_3834_Regression/Moo.mpc:
+                  Fixed compile issues on Linux.
 
-        Thu Nov 17 10:54:54 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+        Fri Dec  9 13:24:31 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.
+                * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc:
+                * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc:
+                * tests/Bug_3834_Regression/CompA.mpc:
+                * tests/Bug_3834_Regression/CompB.mpc:
+                  Removed the -Glfa option since it is obsolete.
 
-        === end changelog ===
+        Fri Dec  9 11:48:53 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
-Tue Nov 22 14:04:21 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+                * connectors/tests/AMIDDS/Base/AmiDds_Base.mpc:
+                * tests/DAnCE/Components/SimpleCommon.mpc:
+                * tests/IDL_Test/Reused_Facet_Interface/Basic.mpc:
+                  Fixed compile errors related to the movement of the facet
+                  servants.
 
-        * ciao/Servants/Home_Servant_Impl_T.h:
-        * ciao/Servants/Home_Servant_Impl_T.cpp:
+        Fri Dec  9 10:41:34 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
-          Implemented separate method for removal of all components
-          (moving code out of destructor).
+                * connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc:
+                  Generate svnt code as well.
 
-Sun Nov 20 19:35:18 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+                * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc:
+                * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.h:
+                * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.cpp:
+                  Removed these files since they can be generated.
 
-        * 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>
+        Fri Dec  9 10:17:37 UTC 2011  Marcel Smit  <msmit@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>
+                * examples/Null_Component_Glfa:
+                * examples/Null_Component_Glfa/Null_Component.idl:
+                * examples/Null_Component_Glfa/Null_Component.mpc:
+                * examples/Null_Component_Glfa/Null_Interface.idl:
+                * examples/Null_Component_Glfa/Null_Interface.mpc:
+                * examples/Null_Component_Glfa/descriptors:
+                * examples/Null_Component_Glfa/descriptors/NodeMap.dat:
+                * examples/Null_Component_Glfa/descriptors/Null_Homed.cdp:
+                * examples/Null_Component_Glfa/descriptors/Null_Unhomed.cdp:
+                * examples/Null_Component_Glfa/descriptors/run_test.pl:
+                  Removed this test. No need to test this anymore.
 
-        * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp:
-          Fixed WCHAR compile problem.
+        Fri Dec  9 10:15:44 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
-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
+                * tests/IDL_Test/Glfa:
+                * tests/IDL_Test/Glfa/A.idl:
+                * tests/IDL_Test/Glfa/A.mpc:
+                * tests/IDL_Test/Glfa/B.idl:
+                * tests/IDL_Test/Glfa/B.mpc:
+                  Removed these files. No need to test this anymore.
 
+        Fri Dec  9 08:34:00 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
-Wed Nov 02 08:30:13 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+                * connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.mpc:
+                  Fixed compile errors related to the movement of the facet
+                  servants.
 
-        Merged changes from Remedy work branch.
+        Fri Dec  9 08:31:15 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
-        === start changelog ===
-
-        Tue Nov  1 09:11:13 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+                * connectors/dds4ccm/idl/dds4ccm_stub.mpc:
+                * connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc:
+                  Fixed compile errors related to the movement of the facet
+                  servants.
+
+        Fri Dec  9 07:57:33 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * connectors/ami4ccm/examples/Quoter/Base/Quoter.mpc:
+                * connectors/ami4ccm/tests/AsynchT/Base/AsynchT.mpc:
+                * connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc:
+                * connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc:
+                * connectors/ami4ccm/tests/GetComp/Base/GetComp.mpc:
+                * connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc:
+                * connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc:
+                * connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.mpc:
+                * connectors/ami4ccm/tests/InterMulti/Base/InterMulti.mpc:
+                * connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc:
+                * connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc:
+                * connectors/ami4ccm/tests/NoConnection/Base/HelloT.mpc:
+                * connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc:
+                * connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc:
+                * connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.mpc:
+                * connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.mpc:
+                * connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc:
+                * connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.mpc:
+                  Fixed compile errors related to the movement of the facet
+                  servants.
+
+        Thu Dec  8 14:38:45 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+
+                * ciao/Servants/Extension/Servant_Impl_T.h:
+                  Added missing include.
+
+                * connectors/ami4ccm/examples/Hello/Base/Hello.mpc:
+                  Removed -Gsv IDL compiler flag.
+
+        Wed Dec  7 07:34:23 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
-                * tests/IDL_Test/Inherited_Component/Extended/Base.mpc:
-                  Layout changes.
+                * ciao/Servants/Facet_Servant_Base_T.h:
+                * ciao/Servants/Session/Servant_Impl_T.h:
+                  Added some necessary includes.
 
-                * tests/IDL_Test/Inherited_Component/Extended/Derived.mpc:
-                  Linux link error.
+        Mon Dec  5 19:10:07 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
-        Tue Nov  1 08:48:41 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+                * connectors/dds4ccm/idl/dds4ccm_stub.mpc:
+                  Removed -Glem for generation of dds4ccm_entity.idl
+                  and ccm_dds.idl since it was not necessary to create
+                  the local executor mapping (at least, the generated
+                  files were not compiled)
 
-                * tests/IDL_Test/Inherited_Component/Extended/Derived.idl:
-                  Used module name to identify the supported interface.
+        Mon Dec  5 18:41:32 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
-                * tests/IDL_Test/Inherited_Component/Extended/Derived.mpc:
-                  Fixed link issue on linux
+                * connectors/dds4ccm/idl/dds4ccm_stub.mpc:
+                  Removed -Glem since it was added a second time. At that point
+                  dds4ccm_QueryFilter was generated with -Glem
+                  (which is not necessary).
 
-        Mon Oct 31 13:53:36 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+        Fri Dec  2 07:58:40 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.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.
+                * ciao/Servants/Extension/Servant_Impl_T.h:
+                * ciao/Servants/Extension/Servant_Impl_T.cpp:
+                * ciao/Servants/Session/Servant_Impl_T.h:
+                * ciao/Servants/Session/Servant_Impl_T.cpp:
+                  Added _T to templated classes. This fixes compile error
+                  since the IDL compiler was already prepared for this.
 
-        Fri Oct 28 14:18:46 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+                * tests/IDL_Test/Inherited_Component/Extended/Base.idl:
+                  Let derived_interface derive from the base_interface.
 
-                * 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.
+        Thu Dec  1 09:05:31 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
-                * tests/IDL_Test/Inherited_Component/IhC_Bar.mpc:
-                  Fixed link issue
+                * connectors/dds4ccm/idl/dds4ccm_stub.mpc:
+                  Prevent compilation after invoking make for a second time
 
-        Fri Oct 28 14:17:05 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+        Thu Dec  1 08:36:22 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
-                * tests/IDL_Test/Inherited_Component/Extended:
+                * ciao/Contexts/Session/Session_Context_T.h:
+                * ciao/Contexts/Session/Session_Context_T.cpp:
+                  Renamed class, using _T postfix.
 
                 * 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.
+                  Expanded.
 
         === end changelog ===
+Wed Dec  7 19:00:59 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-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>
+        * connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.mpc:
+          Fix problem in this mpc file
 
-        * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp:
-        * tests/DAnCE/ExecutionManager-Deployments/run_test.pl:
+Wed Dec  7 10:47:15 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          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
-
-        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
+        Thu Dec  1 09:50:06 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
 
-                * bin/ciao_tests.lst:
-                Add CIAO/tests/Collocation
+                * 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
 
-        === end changelog ===
+        Thu Dec  1 09:15:53 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
 
-Sun Oct 30 22:39:45 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+                * connectors/ami4ccm/tests/InterMulti/descriptors/PlanSyncPort.cdp:
+                * connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl:
 
-        * ciao/Deployment/Interceptors/Deployment_Interceptors.h:
-        * ciao/Deployment/Interceptors/Deployment_Interceptors.cpp:
+                * 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
 
-          Moved external reference resolution to the interceptor.
+        Wed Nov 30 16:11:09 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
 
-Fri Oct 21 07:24:24 UTC 2011  Marcel Smit  <msmit@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.
 
-        * 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.
+        Mon Nov 21 15:10:06 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
 
                 * 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.
+                * 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/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.
+        * ciao/Deployment/Handlers/CIAO_Handler_Common.cpp:
+          Removed return statement which we never could reach
 
-Wed Jul 27 08:42:34 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * ciao/Containers/Container_Base_T.cpp:
+        * ciao/Servants/Session/Servant_Impl_T.cpp:
+          Some code restructuring
 
-          Fixed some errors in the logging messages that would cause segfaults
-          on some platforms.
+        * ciao/Valuetype_Factories/ConfigValue.cpp:
+          Small performance increase
 
-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))
diff --git a/CIAO/ChangeLog.BRANCH b/CIAO/ChangeLog.BRANCH
deleted file mode 100644
index eec5edaa979..00000000000
--- a/CIAO/ChangeLog.BRANCH
+++ /dev/null
@@ -1,184 +0,0 @@
-Fri Dec  9 16:07:48 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.idl:
-        * connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc:
-        * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc:
-          Fixed compile errors.
-
-Fri Dec  9 15:41:59 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.idl:
-        * connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc:
-        * connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc:
-          Also generate a Single_Service_Common lem.
-
-Fri Dec  9 14:28:24 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * tests/Bug_3834_Regression/Moo.mpc:
-          Fixed afters and linker errors on windows.
-
-Fri Dec  9 14:15:16 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * tests/Bug_3834_Regression/CompA.mpc:
-        * tests/Bug_3834_Regression/Moo.mpc:
-          Fixed link issues on windows.
-
-Fri Dec  9 13:42:40 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * tests/Bug_3834_Regression/CompA.idl:
-        * tests/Bug_3834_Regression/CompA.mpc:
-        * tests/Bug_3834_Regression/Moo.idl:
-        * tests/Bug_3834_Regression/Moo.mpc:
-          Fixed compile issues on Linux.
-
-Fri Dec  9 13:24:31 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc:
-        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc:
-        * tests/Bug_3834_Regression/CompA.mpc:
-        * tests/Bug_3834_Regression/CompB.mpc:
-          Removed the -Glfa option since it is obsolete.
-
-Fri Dec  9 11:48:53 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/tests/AMIDDS/Base/AmiDds_Base.mpc:
-        * tests/DAnCE/Components/SimpleCommon.mpc:
-        * tests/IDL_Test/Reused_Facet_Interface/Basic.mpc:
-          Fixed compile errors related to the movement of the facet
-          servants.
-
-Fri Dec  9 10:41:34 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc:
-          Generate svnt code as well.
-
-        * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc:
-        * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.h:
-        * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.cpp:
-          Removed these files since they can be generated.
-
-Fri Dec  9 10:17:37 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * bin/ciao_tests.lst:
-        * examples/Null_Component_Glfa:
-        * examples/Null_Component_Glfa/Null_Component.idl:
-        * examples/Null_Component_Glfa/Null_Component.mpc:
-        * examples/Null_Component_Glfa/Null_Interface.idl:
-        * examples/Null_Component_Glfa/Null_Interface.mpc:
-        * examples/Null_Component_Glfa/descriptors:
-        * examples/Null_Component_Glfa/descriptors/NodeMap.dat:
-        * examples/Null_Component_Glfa/descriptors/Null_Homed.cdp:
-        * examples/Null_Component_Glfa/descriptors/Null_Unhomed.cdp:
-        * examples/Null_Component_Glfa/descriptors/run_test.pl:
-          Removed this test. No need to test this anymore.
-
-Fri Dec  9 10:15:44 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-
-        * tests/IDL_Test/Glfa:
-        * tests/IDL_Test/Glfa/A.idl:
-        * tests/IDL_Test/Glfa/A.mpc:
-        * tests/IDL_Test/Glfa/B.idl:
-        * tests/IDL_Test/Glfa/B.mpc:
-          Removed these files. No need to test this anymore.
-
-Fri Dec  9 08:34:00 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.mpc:
-          Fixed compile errors related to the movement of the facet
-          servants.
-
-Fri Dec  9 08:31:15 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/idl/dds4ccm_stub.mpc:
-        * connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc:
-          Fixed compile errors related to the movement of the facet
-          servants.
-
-Fri Dec  9 07:57:33 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/ami4ccm/examples/Quoter/Base/Quoter.mpc:
-        * connectors/ami4ccm/tests/AsynchT/Base/AsynchT.mpc:
-        * connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc:
-        * connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc:
-        * connectors/ami4ccm/tests/GetComp/Base/GetComp.mpc:
-        * connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc:
-        * connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc:
-        * connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.mpc:
-        * connectors/ami4ccm/tests/InterMulti/Base/InterMulti.mpc:
-        * connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc:
-        * connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc:
-        * connectors/ami4ccm/tests/NoConnection/Base/HelloT.mpc:
-        * connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc:
-        * connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc:
-        * connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.mpc:
-        * connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.mpc:
-        * connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc:
-        * connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.mpc:
-          Fixed compile errors related to the movement of the facet
-          servants.
-
-Thu Dec  8 14:38:45 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * ciao/Servants/Extension/Servant_Impl_T.h:
-          Added missing include.
-
-        * connectors/ami4ccm/examples/Hello/Base/Hello.mpc:
-          Removed -Gsv IDL compiler flag.
-
-Wed Dec  7 07:34:23 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * ciao/Servants/Facet_Servant_Base_T.h:
-        * ciao/Servants/Session/Servant_Impl_T.h:
-          Added some necessary includes.
-
-Mon Dec  5 19:10:07 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/idl/dds4ccm_stub.mpc:
-          Removed -Glem for generation of dds4ccm_entity.idl
-          and ccm_dds.idl since it was not necessary to create
-          the local executor mapping (at least, the generated
-          files were not compiled)
-
-Mon Dec  5 18:41:32 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/idl/dds4ccm_stub.mpc:
-          Removed -Glem since it was added a second time. At that point
-          dds4ccm_QueryFilter was generated with -Glem
-          (which is not necessary).
-
-Fri Dec  2 07:58:40 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * ciao/Contexts/Extension/Extension_Context_T.h:
-        * ciao/Contexts/Extension/Extension_Context_T.cpp:
-        * ciao/Servants/Extension/Servant_Impl_T.h:
-        * ciao/Servants/Extension/Servant_Impl_T.cpp:
-        * ciao/Servants/Session/Servant_Impl_T.h:
-        * ciao/Servants/Session/Servant_Impl_T.cpp:
-          Added _T to templated classes. This fixes compile error
-          since the IDL compiler was already prepared for this.
-
-        * tests/IDL_Test/Inherited_Component/Extended/Base.idl:
-          Let derived_interface derive from the base_interface.
-
-Thu Dec  1 09:05:31 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/idl/dds4ccm_stub.mpc:
-          Prevent compilation after invoking make for a second time
-
-Thu Dec  1 08:36:22 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * ciao/Contexts/Session/Session_Context_T.h:
-        * ciao/Contexts/Session/Session_Context_T.cpp:
-          Renamed class, using _T postfix.
-
-        * tests/IDL_Test/Inherited_Component/Extended/Base.idl:
-        * tests/IDL_Test/Inherited_Component/Extended/Derived.idl:
-          Expanded.
-
-
-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 0583cc70828..8e7ebfd665c 100644
--- a/CIAO/NEWS
+++ b/CIAO/NEWS
@@ -1,4 +1,15 @@
-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
+=======================================================
+
+. -Glfa has been removed from tao_idl. The local executor mapping can only
+  be generated for the current file. Also at the moment an interface is
+  compiled with tao_idl, the option -Gsv has to be used to generate the needed
+  CCM facet servant
+
+. 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
@@ -34,7 +45,13 @@ USER VISIBLE CHANGES BETWEEN CIAO-1.0.5 and CIAO-1.1.0
   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
+  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 606775dcd2c..db4b920ba80 100644
--- a/CIAO/bin/ciao_tests.lst
+++ b/CIAO/bin/ciao_tests.lst
@@ -44,6 +44,8 @@ TAO/CIAO/connectors/tests/AMIDDS/descriptors/run_test.pl: !STATIC !MINIMUM !CORB
 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
 TAO/CIAO/connectors/ami4ccm/tests/Exceptions/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST
 TAO/CIAO/connectors/ami4ccm/tests/NoConnection/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST
 TAO/CIAO/connectors/ami4ccm/tests/NoReplyH/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST
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/Servants/Session/Servant_Impl_T.cpp b/CIAO/ciao/Servants/Session/Servant_Impl_T.cpp
index 896b37233e1..594c13223a4 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_T<BASE_SKEL, EXEC, CONTEXT>::~Session_Servant_Impl_T (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.idl b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl
index 7e2601bb79b..ef636ced4c6 100644
--- a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl
+++ b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl
@@ -37,6 +37,7 @@ module CCM_AMI
     porttype AMI4CCM_Port_Type
     {
       provides AMI4CCM_T ami4ccm_provides;
+      provides T ami4ccm_sync_provides;
       uses T ami4ccm_uses;
     };
 
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp
index 8f1188865f6..b17cb8a8d99 100644
--- a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp
+++ b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/Plan.cdp
@@ -3,6 +3,7 @@
 <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>
+  <!--this plan is made for using the synchronous connection between Sender and Receiver-->
 
   <implementation xmi:id="Hello_ReceiverHomeImplementation">
     <name>Hello_ReceiverHomeImplementation</name>
@@ -247,6 +248,10 @@
     </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-->
+
+  <!--synchronous connection between Sender and Receiver-->
   <connection>
     <name>synch_foo_connection</name>
     <internalEndpoint>
@@ -263,6 +268,26 @@
     </internalEndpoint>
   </connection>
 
+  <!--the synchronous port on the AMI connector -->
+  <!--connection>
+    <name>synch_foo_connection</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>run_my_foo</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="Hello.ComponentImplementations.HelloImplementation.Hello.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_sync_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="Hello.ComponentImplementations.HelloImplementation.Hello.AMI" />
+    </internalEndpoint>
+  </connection-->
   <artifact xmi:id="Hello_AMI_SvntArtifact">
     <name>Hello.ImplementationArtifacts.AMIArtifacts.AMI_svnt</name>
     <source/>
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/PlanSyncPort.cdp b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/PlanSyncPort.cdp
new file mode 100644
index 00000000000..36feaa82d16
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/PlanSyncPort.cdp
@@ -0,0 +1,401 @@
+<?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>
+  <!-- instead of using the synchronous connection between Sender and Receiver,>
+  < this plan is made for using the synchronous port of the AMI-connector-->
+
+  <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="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="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>
+
+  <!-- instead of using the synchronous connection between Sender and Receiver,>
+  < this plan is made for using the synchronous port of the AMI-connector-->
+
+  <!--synchronous connection between Sender and Receiver-->
+  <!--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-->
+
+  <!--the synchronous port on the AMI connector -->
+  <connection>
+    <name>synch_foo_connection</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>run_my_foo</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="Hello.ComponentImplementations.HelloImplementation.Hello.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_sync_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="Hello.ComponentImplementations.HelloImplementation.Hello.AMI" />
+    </internalEndpoint>
+  </connection>
+
+  <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>
+
+</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl
index cb636637db2..e1ac985ad30 100755
--- a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl
+++ b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl
@@ -136,105 +136,121 @@ sub run_node_daemons {
 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 ($#ARGV == -1) {
+    opendir(DIR, ".");
+    @files = grep(/\.cdp$/,readdir(DIR));
+    closedir(DIR);
 }
-
-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;
+else {
+    @files = @ARGV;
 }
 
-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;
-    }
+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
+	      "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 $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) {
+	        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 $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 ();
+	    exit 1;
+	}
+	    delete_ior_files ();
+	    kill_open_processes ();
+	    # Sleep for a couple seconds to make sure everything has a chance to shut down.
+	    sleep 5;
 }
-
-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";
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/PlanSyncPort.cdp b/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/PlanSyncPort.cdp
new file mode 100644
index 00000000000..b78ca7a9d03
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/PlanSyncPort.cdp
@@ -0,0 +1,736 @@
+<?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="InterMulti_ReceiverHomeImplementation">
+    <name>InterMulti_ReceiverHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="InterMulti_Receiver_ExecArtifact"/>
+    <artifact xmi:idref="InterMulti_Receiver_SvntArtifact"/>
+    <execParameter>
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_Receiver_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>InterMulti.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_InterMulti_Receiver_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>InterMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+  <implementation xmi:id="InterMulti_SenderHomeImplementation">
+    <name>InterMulti_SenderHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="InterMulti_Sender_ExecArtifact"/>
+    <artifact xmi:idref="InterMulti_Sender_SvntArtifact"/>
+    <execParameter>
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_Sender_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>InterMulti.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_InterMulti_Sender_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>InterMulti.ImplementationArtifacts.SenderArtifacts.Sender_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+<!-- conn one-->
+  <implementation xmi:id="InterMulti_AMIOneHomeImplementation">
+    <name>InterMulti_AMIHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="InterMulti_AMIOne_ExecArtifact"/>
+    <artifact xmi:idref="InterMulti_AMIOne_SvntArtifact"/>
+    <execParameter>
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_AMI4CCM_One_Connector_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>InterMulti.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_InterMulti_AMI4CCM_One_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>InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+  <!-- conn two-->
+  <implementation xmi:id="InterMulti_AMITwoHomeImplementation">
+    <name>InterMulti_AMIHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="InterMulti_AMITwo_ExecArtifact"/>
+    <artifact xmi:idref="InterMulti_AMITwo_SvntArtifact"/>
+    <execParameter>
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_AMI4CCM_Two_Connector_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>InterMulti.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_InterMulti_AMI4CCM_Two_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>InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+  <!-- conn one-->
+  <implementation xmi:id="InterMulti_AMIThreeHomeImplementation">
+    <name>InterMulti_AMIHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="InterMulti_AMIThree_ExecArtifact"/>
+    <artifact xmi:idref="InterMulti_AMIThree_SvntArtifact"/>
+    <execParameter>
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_AMI4CCM_Three_Connector_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>InterMulti.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_InterMulti_AMI4CCM_Three_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>InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+  <instance xmi:id="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Receiver">
+    <name>InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Receiver</name>
+    <node>Receiver</node>
+    <source/>
+    <implementation xmi:idref="InterMulti_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="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Sender">
+    <name>InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Sender</name>
+    <node>Sender</node>
+    <source/>
+    <implementation xmi:idref="InterMulti_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="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMIOne">
+    <name>InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMIOne</name>
+    <node>Sender</node>
+    <source/>
+    <implementation xmi:idref="InterMulti_AMIOneHomeImplementation"/>
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>AMI.ior</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+  <instance xmi:id="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMITwo">
+    <name>InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMITwo</name>
+    <node>Sender</node>
+    <source/>
+    <implementation xmi:idref="InterMulti_AMITwoHomeImplementation"/>
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>AMI.ior</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+  <instance xmi:id="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMIThree">
+    <name>InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMIThree</name>
+    <node>Sender</node>
+    <source/>
+    <implementation xmi:idref="InterMulti_AMIThreeHomeImplementation"/>
+    <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_one_connection</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>sendc_run_my_one</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMIOne" />
+    </internalEndpoint>
+  </connection>
+  <connection>
+    <name>run_asynch_two_connection</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>sendc_run_my_two</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMITwo" />
+    </internalEndpoint>
+  </connection>
+  <connection>
+    <name>run_asynch_three_connection</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>sendc_run_my_three</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMIThree" />
+    </internalEndpoint>
+  </connection>
+
+  <connection>
+    <name>do_one_connection</name>
+    <internalEndpoint>
+      <portName>do_my_one</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Receiver" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_uses</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMIOne" />
+    </internalEndpoint>
+  </connection>
+  <connection>
+    <name>do_two_connection</name>
+    <internalEndpoint>
+      <portName>do_my_two</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Receiver" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_uses</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMITwo" />
+    </internalEndpoint>
+  </connection>
+  <connection>
+    <name>do_three_connection</name>
+    <internalEndpoint>
+      <portName>do_my_three</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Receiver" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_uses</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMIThree" />
+    </internalEndpoint>
+  </connection>
+
+  <!--connection>
+    <name>synch_one_connection</name>
+    <internalEndpoint>
+      <portName>do_my_one</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Receiver" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>run_my_one</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Sender" />
+    </internalEndpoint>
+  </connection-->
+  <!--connection>
+    <name>synch_two_connection</name>
+    <internalEndpoint>
+      <portName>do_my_two</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Receiver" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>run_my_two</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Sender" />
+    </internalEndpoint>
+  </connection-->
+  <!--connection>
+    <name>synch_three_connection</name>
+    <internalEndpoint>
+      <portName>do_my_three</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Receiver" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>run_my_three</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Sender" />
+    </internalEndpoint>
+  </connection-->
+
+<connection>
+    <name>synch_one_connection</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>run_my_one</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_sync_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMIOne" />
+    </internalEndpoint>
+  </connection>
+  <connection>
+    <name>synch_two_connection</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>run_my_two</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_sync_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMITwo" />
+    </internalEndpoint>
+  </connection>
+  <connection>
+    <name>synch_three_connection</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>run_my_three</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_sync_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="InterMulti.ComponentImplementations.InterMultiImplementation.InterMulti.AMIThree" />
+    </internalEndpoint>
+  </connection>
+   <artifact xmi:id="InterMulti_AMIOne_SvntArtifact">
+    <name>InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt</name>
+    <source/>
+    <node/>
+    <location>InterMulti_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_AMI4CCM_One_Connector_AMI4CCM_Connector_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  <artifact xmi:id="InterMulti_AMITwo_SvntArtifact">
+    <name>InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt</name>
+    <source/>
+    <node/>
+    <location>InterMulti_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_AMI4CCM_Two_Connector_AMI4CCM_Connector_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  <artifact xmi:id="InterMulti_AMIThree_SvntArtifact">
+    <name>InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt</name>
+    <source/>
+    <node/>
+    <location>InterMulti_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_AMI4CCM_Three_Connector_AMI4CCM_Connector_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="InterMulti_AMIOne_ExecArtifact">
+    <name>InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_exec</name>
+    <source/>
+    <node/>
+    <location>InterMulti_conn</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_AMI_One_Connector_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  <artifact xmi:id="InterMulti_AMITwo_ExecArtifact">
+    <name>InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_exec</name>
+    <source/>
+    <node/>
+    <location>InterMulti_conn</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_AMI_Two_Connector_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+  <artifact xmi:id="InterMulti_AMIThree_ExecArtifact">
+    <name>InterMulti.ImplementationArtifacts.AMIArtifacts.AMI_exec</name>
+    <source/>
+    <node/>
+    <location>InterMulti_conn</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_AMI_Three_Connector_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="InterMulti_Receiver_SvntArtifact">
+    <name>InterMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt</name>
+    <source/>
+    <node/>
+    <location>InterMulti_Receiver_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_AMI_ReceiverHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="InterMulti_Receiver_ExecArtifact">
+    <name>InterMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec</name>
+    <source/>
+    <node/>
+    <location>InterMulti_Receiver_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_AMI_ReceiverHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="InterMulti_Sender_SvntArtifact">
+    <name>InterMulti.ImplementationArtifacts.SenderArtifacts.Sender_svnt</name>
+    <source/>
+    <node/>
+    <location>InterMulti_Sender_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_AMI_SenderHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="InterMulti_Sender_ExecArtifact">
+    <name>InterMulti.ImplementationArtifacts.SenderArtifacts.Sender_exec</name>
+    <source/>
+    <node/>
+    <location>InterMulti_Sender_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterMulti_AMI_SenderHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl
index 2a8c52c0780..4708970fa5a 100755
--- a/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl
+++ b/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl
@@ -135,106 +135,122 @@ sub run_node_daemons {
 
 create_targets ();
 init_ior_files ();
+if ($#ARGV == -1) {
+    opendir(DIR, ".");
+    @files = grep(/\.cdp$/,readdir(DIR));
+    closedir(DIR);
+}
+else {
+    @files = @ARGV;
+}
 
-# Invoke naming service
+foreach $file (@files) {
+    print "=============================\nStarting test for deployment $file\n================================\n";
 
-$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+	# Invoke naming service
 
-print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
+	$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
 
-$ns_status = $NS->Spawn ();
+	print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
 
-if ($ns_status != 0) {
-    print STDERR "ERROR: Unable to execute the naming service\n";
-    kill_open_processes ();
-    exit 1;
-}
+	$ns_status = $NS->Spawn ();
 
-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;
-}
+	if ($ns_status != 0) {
+	    print STDERR "ERROR: Unable to execute the naming service\n";
+	    kill_open_processes ();
+	    exit 1;
+	}
 
-$ns_running = 1;
-# Set up NamingService environment
-$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
+	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;
+	}
 
-# Invoke node daemon.
-print "Invoking node daemon\n";
-$status = run_node_daemons ();
+	$ns_running = 1;
+	# Set up NamingService environment
+	$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
 
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemon\n";
-    kill_open_processes ();
-    exit 1;
-}
+	# Invoke node daemon.
+	print "Invoking node daemon\n";
+	$status = run_node_daemons ();
 
-$daemons_running = 1;
+	if ($status != 0) {
+	    print STDERR "ERROR: Unable to execute the node daemon\n";
+	    kill_open_processes ();
+	    exit 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 ();
+	$daemons_running = 1;
 
-if ($em_status != 0) {
-    print STDERR "ERROR: dance_execution_manager returned $em_status";
-    exit 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 ($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;
-}
+	if ($em_status != 0) {
+	    print STDERR "ERROR: dance_execution_manager returned $em_status";
+	    exit 1;
+	}
 
-$em_running = 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;
+	}
 
-# Invoke executor - start the application -.
-print "Invoking executor - launch the application -\n";
+	$em_running = 1;
 
-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");
+	# Invoke executor - start the application -.
+	print "Invoking executor - launch the application -\n";
 
-$pl_status = $E->SpawnWaitKill (3 * $tg_executor->ProcessStartWaitInterval ());
+	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");
 
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
-}
+	$pl_status = $E->SpawnWaitKill (3 * $tg_executor->ProcessStartWaitInterval ());
 
-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;
-    }
-}
+	if ($pl_status != 0) {
+	    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
+	    kill_open_processes ();
+	    exit 1;
+	}
 
-print "Sleeping 30 seconds to allow task to complete\n";
-sleep (30);
+	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;
+	    }
+	}
 
-# 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";
+	print "Sleeping 30 seconds to allow task to complete\n";
+	sleep (30);
 
-$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 ());
+	# 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";
 
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\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 ();
+	    exit 1;
+	}
+
+    delete_ior_files ();
     kill_open_processes ();
-    exit 1;
+    # Sleep for a couple seconds to make sure everything has a chance to shut down.
+    sleep 5;
 }
-
 print "Executor returned.\n";
 print "Shutting down rest of the processes.\n";
 
diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp
index 89410112954..2ba759d2d7a 100644
--- a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp
+++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender_exec.cpp
@@ -135,6 +135,76 @@ namespace CIAO_InterReturnT_Sender_Impl
         ACE_ERROR ((LM_ERROR, "ERROR: synch_foo_generator::ret_array: "
                                "Unexpected exception.\n"));
       }
+
+
+    InterReturnT::TestStruct *struct_return_val =
+            my_foo_ami_->ret_struct ("Send me synch struct",out_str, l_cmd);
+    if (l_cmd != 4)
+      {
+        ACE_ERROR ((LM_ERROR, "ERROR MyFoo_callback_exec_i::ret_struct: "
+                              "received the wrong long, expected 4,"
+                              " received %u\n",
+                              l_cmd));
+      }
+    else if ((ACE_OS::strcmp (struct_return_val->key.in(), "aaa") != 0) ||
+             (struct_return_val->x != 10))
+      {
+        ACE_ERROR ((LM_ERROR, "ERROR MyFoo_callback_exec_i::ret_struct: "
+                              "received the struct return, expected 'aaa' "
+                               "and 10, received %C and %u\n",
+                               struct_return_val->key.in(),
+                               struct_return_val->x));
+      }
+    else
+      {
+        ++this->nr_of_received_;
+      }
+
+    const InterReturnT::TestSeq *seq_return_val =
+          my_foo_ami_->ret_seq ("Send me synch struct",out_str, l_cmd);
+    if ((l_cmd != 6) || (!seq_return_val))
+      {
+        ACE_ERROR ((LM_ERROR, "ERROR MyFoo_callback_exec_i::ret_seq: "
+                   "received the wrong long, expected 6,"
+                   " received %u\n",
+                   l_cmd));
+      }
+    else
+      {
+        ++this->nr_of_received_;
+      }
+
+
+    const InterReturnT::X_Union *union_return_val =
+        my_foo_ami_->ret_union ("Send me synch union",out_str, l_cmd);
+    if ((l_cmd != 7) || (union_return_val->x_long() != 11))
+      {
+        ACE_ERROR ((LM_ERROR, "ERROR MyFoo_callback_exec_i::ret_union: "
+               "received the wrong long or union, expected 7"
+               " and 11, received %u and %u\n",
+               l_cmd, union_return_val->x_long()));
+      }
+
+    else
+      {
+        ++this->nr_of_received_;
+      }
+
+    InterReturnT::test_enum enum_return_val =
+        my_foo_ami_->ret_enum ("Send me synch enum",out_str, l_cmd);
+
+    if ((l_cmd != 8) || (enum_return_val != InterReturnT::TWO))
+      {
+        ACE_ERROR ((LM_ERROR, "ERROR MyFoo_callback_exec_i::ret_enum: "
+            "received the wrong long or enum value, expected 8"
+            " and TWO, received %u and %u\n",
+            l_cmd, enum_return_val));
+      }
+    else
+      {
+        ++this->nr_of_received_;
+      }
+
     return 0;
   }
   /**
@@ -198,7 +268,7 @@ namespace CIAO_InterReturnT_Sender_Impl
   void
   Sender_exec_i::ccm_remove (void)
   {
-    if (this->nr_of_received_.value() == 10)
+    if (this->nr_of_received_.value() == 14)
       {
         ACE_DEBUG ((LM_DEBUG, "OK: Sender received all expected return data"
                               " for syn- and asynchronous calls\n"));
diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/Plan.cdp
index 8871537d509..4431196eb59 100644
--- a/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/Plan.cdp
+++ b/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/Plan.cdp
@@ -263,6 +263,7 @@
     </internalEndpoint>
   </connection>
 
+
   <artifact xmi:id="InterReturnT_AMI_SvntArtifact">
     <name>InterReturnT.ImplementationArtifacts.AMIArtifacts.AMI_svnt</name>
     <source/>
diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/PlanSyncPort.cdp b/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/PlanSyncPort.cdp
new file mode 100644
index 00000000000..a960e57c3e7
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/PlanSyncPort.cdp
@@ -0,0 +1,377 @@
+<?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="InterReturnT_ReceiverHomeImplementation">
+    <name>InterReturnT_ReceiverHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="InterReturnT_Receiver_ExecArtifact"/>
+    <artifact xmi:idref="InterReturnT_Receiver_SvntArtifact"/>
+    <execParameter>
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterReturnT_Receiver_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>InterReturnT.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_InterReturnT_Receiver_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>InterReturnT.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+  <implementation xmi:id="InterReturnT_SenderHomeImplementation">
+    <name>InterReturnT_SenderHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="InterReturnT_Sender_ExecArtifact"/>
+    <artifact xmi:idref="InterReturnT_Sender_SvntArtifact"/>
+    <execParameter>
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterReturnT_Sender_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>InterReturnT.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_InterReturnT_Sender_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>InterReturnT.ImplementationArtifacts.SenderArtifacts.Sender_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+  <implementation xmi:id="InterReturnT_AMIHomeImplementation">
+    <name>InterReturnT_AMIHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="InterReturnT_AMI_ExecArtifact"/>
+    <artifact xmi:idref="InterReturnT_AMI_SvntArtifact"/>
+    <execParameter>
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterReturnT_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>InterReturnT.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_InterReturnT_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>InterReturnT.ImplementationArtifacts.AMIArtifacts.AMI_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+  <instance xmi:id="InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.Receiver">
+    <name>InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.Receiver</name>
+    <node>Receiver</node>
+    <source/>
+    <implementation xmi:idref="InterReturnT_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="InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.Sender">
+    <name>InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.Sender</name>
+    <node>Sender</node>
+    <source/>
+    <implementation xmi:idref="InterReturnT_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="InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.AMI">
+    <name>InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.AMI</name>
+    <node>Sender</node>
+    <source/>
+    <implementation xmi:idref="InterReturnT_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="InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.AMI" />
+    </internalEndpoint>
+  </connection>
+
+  <connection>
+    <name>do_foo_connection</name>
+    <internalEndpoint>
+      <portName>do_my_foo</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.Receiver" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_uses</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.AMI" />
+    </internalEndpoint>
+  </connection>
+ <connection>
+    <name>synch_foo_connection</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>run_my_foo</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_sync_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="InterReturnT.ComponentImplementations.InterReturnTImplementation.InterReturnT.AMI" />
+    </internalEndpoint>
+  </connection>
+
+  <artifact xmi:id="InterReturnT_AMI_SvntArtifact">
+    <name>InterReturnT.ImplementationArtifacts.AMIArtifacts.AMI_svnt</name>
+    <source/>
+    <node/>
+    <location>InterReturnT_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterReturnT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="InterReturnT_AMI_ExecArtifact">
+    <name>InterReturnT.ImplementationArtifacts.AMIArtifacts.AMI_exec</name>
+    <source/>
+    <node/>
+    <location>InterReturnT_conn</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterReturnT_AMI4CCM_MyFoo_Connector_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="InterReturnT_Receiver_SvntArtifact">
+    <name>InterReturnT.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt</name>
+    <source/>
+    <node/>
+    <location>InterReturnT_Receiver_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterReturnT_AMI_ReceiverHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="InterReturnT_Receiver_ExecArtifact">
+    <name>InterReturnT.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec</name>
+    <source/>
+    <node/>
+    <location>InterReturnT_Receiver_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterReturnT_AMI_ReceiverHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="InterReturnT_Sender_SvntArtifact">
+    <name>InterReturnT.ImplementationArtifacts.SenderArtifacts.Sender_svnt</name>
+    <source/>
+    <node/>
+    <location>InterReturnT_Sender_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterReturnT_AMI_SenderHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="InterReturnT_Sender_ExecArtifact">
+    <name>InterReturnT.ImplementationArtifacts.SenderArtifacts.Sender_exec</name>
+    <source/>
+    <node/>
+    <location>InterReturnT_Sender_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_InterReturnT_AMI_SenderHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl
index 2691006fa9a..82aabc6545c 100755
--- a/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl
+++ b/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl
@@ -135,106 +135,120 @@ sub run_node_daemons {
 
 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 ($#ARGV == -1) {
+    opendir(DIR, ".");
+    @files = grep(/\.cdp$/,readdir(DIR));
+    closedir(DIR);
 }
-
-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;
+else {
+    @files = @ARGV;
 }
-
-$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;
+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
+        "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 $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) {
+          print STDERR "ERROR: The ior file of daemon $i could not be found\n";
+          kill_open_processes ();
+          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 (2 * $tg_executor->ProcessStartWaitInterval ());
+
+  if ($pl_status != 0) {
+      print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
+      kill_open_processes ();
+      exit 1;
+  }
+      delete_ior_files ();
+      kill_open_processes ();
+          # Sleep for a couple seconds to make sure everything has a chance to shut down.
+      sleep 5;
 }
-
-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 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 $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 (2 * $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";
 
diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.idl b/CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.idl
new file mode 100644
index 00000000000..e5fe28e7b47
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.idl
@@ -0,0 +1,37 @@
+// $Id$
+
+#ifndef PRAGMAT_IDL
+#define PRAGMAT_IDL
+
+#pragma ciao lem "Base/PragmaTE.idl"
+#pragma ami4ccm interface "PragmaT::MyFoo"
+#pragma ciao lem "Base/PragmaTAE.idl"
+#pragma ami4ccm idl "Base/PragmaTA.idl"
+
+module PragmaT
+{
+  exception InternalError
+    {
+      long id;
+      string error_string;
+    };
+
+  // Sender/Receiver interface
+  interface MyFoo
+    {
+      long foo (in string in_str, out string answer)
+        raises (InternalError);
+      void hello (out long answer)
+        raises (InternalError);
+
+      attribute short rw_attrib
+        getraises (InternalError)
+        setraises (InternalError);
+
+      readonly attribute short ro_attrib
+        raises (InternalError);
+    };
+};
+
+#endif
+
diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.mpc b/CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.mpc
new file mode 100644
index 00000000000..88ec25be749
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Base/PragmaT.mpc
@@ -0,0 +1,194 @@
+// $Id$
+
+project(AMI_PragmaT_idl_gen) : componentidldefaults, ami, ami4ccm_stub {
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=PRAGMAT_STUB_Export \
+              -Wb,stub_export_include=PragmaT_stub_export.h \
+              -Wb,skel_export_macro=PRAGMAT_SKEL_Export \
+              -Wb,skel_export_include=PragmaT_skel_export.h \
+              -Wb,conn_export_macro=PRAGMAT_CONN_Export \
+              -Wb,conn_export_include=PragmaT_conn_export.h \
+              -Wb,exec_export_macro=PRAGMAT_EXEC_Export \
+              -Wb,exec_export_include=PragmaT_exec_export.h \
+              -I.. -GM -Gxhcn
+  idlflags -= -Gsv
+
+  IDL_Files {
+    PragmaT.idl
+  }
+}
+
+project(AMI_PragmaT_lem_gen) : ciaoidldefaults {
+  after += AMI_PragmaT_idl_gen AMI_PragmaT_lema_gen
+  custom_only = 1
+  idlflags += -Wb,export_macro=PRAGMAT_LEM_STUB_Export \
+              -Wb,export_include=PragmaT_lem_stub_export.h \
+              -I.. -SS -Gxhst
+
+  IDL_Files {
+    PragmaTE.idl
+  }
+}
+
+project(AMI_PragmaT_lema_gen) : ciaoidldefaults {
+  after += AMI_PragmaT_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=PRAGMAT_STUB_Export \
+              -Wb,stub_export_include=PragmaT_stub_export.h \
+              -Wb,conn_export_macro=PRAGMAT_CONN_Export \
+              -Wb,conn_export_include=PragmaT_conn_export.h \
+              -Wb,svnt_export_macro=PRAGMAT_SVNT_Export \
+              -Wb,svnt_export_include=PragmaT_svnt_export.h \
+              -Wb,skel_export_macro=PRAGMAT_SKEL_Export \
+              -Wb,skel_export_include=PragmaT_skel_export.h \
+              -I.. -Gsv -Gcn -Glem -GC -Gxhst -Gxhsv
+
+  IDL_Files {
+    PragmaTA.idl
+  }
+}
+
+project(AMI_PragmaT_lemae_gen) : ciaoidldefaults {
+  after += AMI_PragmaT_lema_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=PRAGMAT_LEM_STUB_Export \
+              -Wb,stub_export_include=PragmaT_lem_stub_export.h \
+              -I.. -SS
+
+  IDL_Files {
+    PragmaTAE.idl
+  }
+}
+
+project(AMI_PragmaT_stub) : ccm_stub, ami, ami4ccm_stub {
+  after += AMI_PragmaT_lem_gen
+  libs  +=
+  libout = ../lib
+  libpaths += ../lib
+  includes +=   ..
+
+  sharedname = PragmaT_stub
+  dynamicflags += PRAGMAT_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    PragmaTC.cpp
+    PragmaTAC.cpp
+  }
+
+  Header_Files {
+    PragmaTC.h
+    PragmaT_stub_export.h
+}
+
+  Inline_Files {
+    PragmaTC.inl
+  }
+}
+
+project(AMI_PragmaT_lem_stub) : ccm_executor, ami, ami4ccm_lem_stub {
+  after += AMI_PragmaT_lem_gen AMI_PragmaT_stub AMI_PragmaT_lemae_gen AMI_PragmaT_skel
+  libs += PragmaT_stub PragmaT_skel
+  libout = ../lib
+  libpaths += ../lib
+  includes +=   ..
+
+  sharedname = PragmaT_lem_stub
+  dynamicflags += PRAGMAT_LEM_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    PragmaTEC.cpp
+    PragmaTAEC.cpp
+  }
+
+  Header_Files {
+    PragmaTEC.h
+    PragmaT_lem_stub_export.h
+}
+
+  Inline_Files {
+    PragmaTEC.inl
+  }
+}
+
+project(AMI_PragmaT_skel) : ciao_executor, ami, ami4ccm_servant {
+  after      += AMI_PragmaT_stub
+  sharedname  = PragmaT_skel
+  libs       += PragmaT_stub
+  libout = ../lib
+  libpaths += ../lib
+  includes +=   ..
+
+  dynamicflags += PRAGMAT_SKEL_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    PragmaTS.cpp
+    PragmaTAS.cpp
+  }
+
+  Header_Files {
+    PragmaTS.h
+    PragmaT_skel_export.h
+  }
+
+  Inline_Files {
+    PragmaTS.inl
+  }
+}
+
+project(AMI_PragmaT_conn) : ciao_executor, ami, ami4ccm_lem_stub {
+  after   += AMI_PragmaT_lem_stub PragmaT_Base_AMI_stub AMI_PragmaT_skel AMI_PragmaT_lema_gen AMI_PragmaT_lemae_gen
+  sharedname = PragmaT_conn
+  libs += PragmaT_stub PragmaT_skel PragmaT_lem_stub
+  libpaths += ../lib
+  libout = ../lib
+  dynamicflags += PRAGMAT_CONN_BUILD_DLL
+  includes += ..
+  IDL_Files {
+  }
+
+  Source_Files {
+    PragmaTA_conn.cpp
+  }
+
+  Header_Files {
+    PragmaTA_conn.h
+    PragmaT_conn_export.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(AMI_PragmaT_svnt) : ciao_servant, ami, ami4ccm_servant {
+  after   += AMI_PragmaT_lem_stub PragmaT_Base_AMI_stub AMI_PragmaT_skel AMI_PragmaT_lema_gen AMI_PragmaT_lemae_gen AMI_PragmaT_conn
+  sharedname = PragmaT_svnt
+  libs += PragmaT_stub PragmaT_skel PragmaT_lem_stub PragmaT_conn
+  libpaths += ../lib
+  libout = ../lib
+  dynamicflags += PRAGMAT_SVNT_BUILD_DLL
+  includes += ..
+  IDL_Files {
+  }
+
+  Source_Files {
+    PragmaTA_svnt.cpp
+  }
+
+  Header_Files {
+    PragmaTA_svnt.h
+    PragmaTA_svnt_export.h
+  }
+
+  Inline_Files {
+  }
+}
+
diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/README b/CIAO/connectors/ami4ccm/tests/PragmaT/README
new file mode 100644
index 00000000000..dfec218aa19
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/PragmaT/README
@@ -0,0 +1,9 @@
+// $Id$
+
+This test is used to test the use of the new pragma's.
+
+Instead of '#PRAGMA ciao ami4ccm interface' , '#PRAGMA ciao ami4ccm receptacle' and
+'#PRAGMA ciao ami4ccm idl' the new pragma's, according to the ami4ccm spec are used:
+'#PRAGMA ami4ccm interface' , '#PRAGMA ami4ccm receptacle' and
+'#PRAGMA ami4ccm idl'
+
diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.idl b/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.idl
new file mode 100644
index 00000000000..792408478db
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.idl
@@ -0,0 +1,18 @@
+// $Id$
+
+#ifndef PRAGMAT_RECEIVER_IDL
+#define PRAGMAT_RECEIVER_IDL
+
+#include <Components.idl>
+
+#include "Base/PragmaT.idl"
+
+module PragmaT
+{
+  component Receiver
+  {
+    /// Provides
+    provides MyFoo do_my_foo;
+  };
+};
+#endif
diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.mpc
new file mode 100644
index 00000000000..66504085342
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver.mpc
@@ -0,0 +1,134 @@
+// $Id$
+// This file is generated with "generate_component_mpc.pl -p PragmaT_Base PragmaT_Receiver"
+
+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 \
+              -Wb,stub_export_include=PragmaT_Receiver_stub_export.h \
+              -Wb,skel_export_macro=PRAGMAT_RECEIVER_SVNT_Export \
+              -Wb,skel_export_include=PragmaT_Receiver_svnt_export.h \
+              -Wb,exec_export_macro=PRAGMAT_RECEIVER_EXEC_Export \
+              -Wb,exec_export_include=PragmaT_Receiver_exec_export.h \
+              -Glem -I..
+
+  IDL_Files {
+    PragmaT_Receiver.idl
+  }
+}
+
+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 \
+              -SS -Gxhst -I..
+
+  IDL_Files {
+    PragmaT_ReceiverE.idl
+  }
+}
+
+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
+  sharedname = PragmaT_Receiver_lem_stub
+  dynamicflags += PRAGMAT_RECEIVER_LEM_STUB_BUILD_DLL
+  includes += ..
+  IDL_Files {
+  }
+
+  Source_Files {
+    PragmaT_ReceiverEC.cpp
+  }
+
+  Header_Files {
+    PragmaT_ReceiverEC.h
+    PragmaT_Receiver_lem_stub_export.h
+  }
+
+  Inline_Files {
+    PragmaT_ReceiverEC.inl
+  }
+}
+
+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
+  sharedname = PragmaT_Receiver_stub
+  dynamicflags += PRAGMAT_RECEIVER_STUB_BUILD_DLL
+  includes += ..
+  IDL_Files {
+  }
+
+  Source_Files {
+    PragmaT_ReceiverC.cpp
+  }
+
+  Header_Files {
+    PragmaT_ReceiverC.h
+    PragmaT_Receiver_stub_export.h
+  }
+
+  Inline_Files {
+    PragmaT_ReceiverC.inl
+  }
+}
+
+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
+  libout = ../lib
+  dynamicflags += PRAGMAT_RECEIVER_EXEC_BUILD_DLL
+  includes += ..
+  IDL_Files {
+  }
+
+  Source_Files {
+    PragmaT_Receiver_exec.cpp
+  }
+
+  Header_Files {
+    PragmaT_Receiver_exec.h
+    PragmaT_Receiver_exec_export.h
+  }
+
+  Inline_Files {
+  }
+}
+
+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 \
+                PragmaT_stub PragmaT_lem_stub
+  libpaths += ../lib
+  libout = ../lib
+  dynamicflags += PRAGMAT_RECEIVER_SVNT_BUILD_DLL
+  includes += ..
+  IDL_Files {
+  }
+
+  Source_Files {
+    PragmaT_ReceiverS.cpp
+    PragmaT_Receiver_svnt.cpp
+  }
+
+  Header_Files {
+    PragmaT_ReceiverS.h
+    PragmaT_Receiver_svnt.h
+    PragmaT_Receiver_svnt_export.h
+  }
+
+  Inline_Files {
+    PragmaT_ReceiverS.inl
+  }
+}
+
diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.cpp
new file mode 100644
index 00000000000..e15a17020ae
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.cpp
@@ -0,0 +1,166 @@
+// -*- C++ -*-
+// $Id$
+
+#include "PragmaT_Receiver_exec.h"
+#include "ace/OS_NS_unistd.h"
+
+namespace CIAO_PragmaT_Receiver_Impl
+{
+  MyFoo_exec_i::MyFoo_exec_i (
+   ::PragmaT::CCM_Receiver_Context_ptr ctx)
+  : ciao_context_ (
+     ::PragmaT::CCM_Receiver_Context::_duplicate (ctx)),
+      get_rw_ (false),
+      get_ro_ (false)
+  {
+  }
+
+  MyFoo_exec_i::~MyFoo_exec_i (void)
+  {
+  }
+
+  ::CORBA::Long
+  MyFoo_exec_i::foo (const char * in_str, ::CORBA::String_out answer)
+  {
+    if (ACE_OS::strlen (in_str) == 0)
+      {
+        PragmaT::InternalError ex (42, "PragmaT world");
+        throw ex;
+      }
+    else
+      {
+        ACE_OS::sleep (ACE_OS::rand () % 2);
+        answer = CORBA::string_dup ("This is my answer : Hi");
+        return ACE_OS::rand () % 100;
+      }
+  }
+
+  void
+  MyFoo_exec_i::hello (::CORBA::Long_out answer)
+  {
+    ACE_OS::sleep (ACE_OS::rand () % 2);
+    answer = ACE_OS::rand () % 100;
+  }
+
+  ::CORBA::Short
+  MyFoo_exec_i::rw_attrib ()
+  {
+    if (this->get_rw_)
+      {
+        this->get_rw_ = false;
+        PragmaT::InternalError ex (42, "PragmaT world");
+        throw ex;
+      }
+    else
+      {
+        ACE_OS::sleep (ACE_OS::rand () % 2);
+        this->get_rw_ = true;
+      }
+    return ACE_OS::rand () % 100;
+  }
+
+  void
+  MyFoo_exec_i::rw_attrib (::CORBA::Short new_value)
+  {
+    if (new_value == 0)
+      {
+        PragmaT::InternalError ex (42, "PragmaT world");
+        throw ex;
+      }
+    else
+      {
+        ACE_OS::sleep (ACE_OS::rand () % 2);
+      }
+  }
+
+  CORBA::Short
+  MyFoo_exec_i::ro_attrib ()
+  {
+   if (this->get_ro_)
+      {
+        this->get_ro_ = false;
+        PragmaT::InternalError ex (42, "PragmaT world");
+        throw ex;
+      }
+    else
+      {
+        ACE_OS::sleep (ACE_OS::rand () % 2);
+        this->get_ro_ = true;
+      }
+    return ACE_OS::rand () % 100;
+  }
+
+  Receiver_exec_i::Receiver_exec_i (void)
+  {
+  }
+
+  Receiver_exec_i::~Receiver_exec_i (void)
+  {
+  }
+
+  ::PragmaT::CCM_MyFoo_ptr
+  Receiver_exec_i::get_do_my_foo (void)
+  {
+    if ( ::CORBA::is_nil (this->ciao_do_my_foo_.in ()))
+      {
+        MyFoo_exec_i *tmp = 0;
+        ACE_NEW_RETURN (
+          tmp,
+          MyFoo_exec_i (
+            this->context_.in ()),
+            ::PragmaT::CCM_MyFoo::_nil ());
+
+          this->ciao_do_my_foo_ = tmp;
+      }
+
+    return
+      ::PragmaT::CCM_MyFoo::_duplicate (
+        this->ciao_do_my_foo_.in ());
+  }
+
+  void
+  Receiver_exec_i::set_session_context (
+    ::Components::SessionContext_ptr ctx)
+  {
+    this->context_ = ::PragmaT::CCM_Receiver_Context::_narrow (ctx);
+
+    if ( ::CORBA::is_nil (this->context_.in ()))
+      {
+        throw ::CORBA::INTERNAL ();
+      }
+  }
+
+  void
+  Receiver_exec_i::configuration_complete (void)
+  {
+  }
+
+  void
+  Receiver_exec_i::ccm_activate (void)
+  {
+  }
+
+  void
+  Receiver_exec_i::ccm_passivate (void)
+  {
+  }
+
+  void
+  Receiver_exec_i::ccm_remove (void)
+  {
+  }
+
+  extern "C"  ::Components::EnterpriseComponent_ptr
+  create_PragmaT_AMI_Receiver_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_RETURN (
+      retval,
+      Receiver_exec_i,
+      ::Components::EnterpriseComponent::_nil ());
+
+    return retval;
+  }
+}
diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.h
new file mode 100644
index 00000000000..3288bf5f75b
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Receiver/PragmaT_Receiver_exec.h
@@ -0,0 +1,70 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef CIAO_PRAGMAT_RECEIVER_EXEC_H_
+#define CIAO_PRAGMAT_RECEIVER_EXEC_H_
+
+#include "PragmaT_ReceiverEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/LocalObject.h"
+#include "PragmaT_Receiver_exec_export.h"
+
+namespace CIAO_PragmaT_Receiver_Impl
+{
+  class MyFoo_exec_i
+    : public virtual ::PragmaT::CCM_MyFoo,
+      public virtual ::CORBA::LocalObject
+  {
+  public:
+    MyFoo_exec_i (::PragmaT::CCM_Receiver_Context_ptr ctx);
+    virtual ~MyFoo_exec_i (void);
+
+    virtual ::CORBA::Long foo (const char * in_str, ::CORBA::String_out answer);
+
+    virtual void hello (::CORBA::Long_out answer);
+
+    virtual ::CORBA::Short rw_attrib ();
+
+    virtual void rw_attrib (::CORBA::Short new_value);
+
+    virtual CORBA::Short ro_attrib ();
+  private:
+    ::PragmaT::CCM_Receiver_Context_var ciao_context_;
+    bool get_rw_;
+    bool get_ro_;
+  };
+
+  class  Receiver_exec_i
+    : public virtual Receiver_Exec,
+      public virtual ::CORBA::LocalObject
+  {
+  public:
+    Receiver_exec_i (void);
+    virtual ~Receiver_exec_i (void);
+
+    virtual ::PragmaT::CCM_MyFoo_ptr get_do_my_foo (void);
+
+    virtual void set_session_context (::Components::SessionContext_ptr ctx);
+
+    virtual void configuration_complete (void);
+
+    virtual void ccm_activate (void);
+    virtual void ccm_passivate (void);
+    virtual void ccm_remove (void);
+
+  private:
+    ::PragmaT::CCM_Receiver_Context_var context_;
+    ::PragmaT::CCM_MyFoo_var ciao_do_my_foo_;
+
+  };
+
+  extern "C" PRAGMAT_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_PragmaT_AMI_Receiver_Impl (void);
+}
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.idl b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.idl
new file mode 100644
index 00000000000..79ca9f86b33
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.idl
@@ -0,0 +1,21 @@
+// $Id$
+
+#ifndef PRAGMAT_SENDER_IDL
+#define PRAGMAT_SENDER_IDL
+
+#include <Components.idl>
+
+#include "Base/PragmaT.idl"
+
+#pragma ami4ccm receptacle "PragmaT::Sender::run_my_foo"
+
+module PragmaT
+{
+  component Sender
+  {
+    /// For synchronous invocation
+    uses MyFoo run_my_foo;
+  };
+};
+
+#endif
diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.mpc
new file mode 100644
index 00000000000..049130ed6aa
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender.mpc
@@ -0,0 +1,135 @@
+// $Id$
+// This file is generated with "generate_component_mpc.pl -p PragmaT_Base PragmaT_Sender"
+
+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 \
+              -Wb,stub_export_include=PragmaT_Sender_stub_export.h \
+              -Wb,skel_export_macro=PRAGMAT_SENDER_SVNT_Export \
+              -Wb,skel_export_include=PragmaT_Sender_svnt_export.h \
+              -Wb,exec_export_macro=PRAGMAT_SENDER_EXEC_Export \
+              -Wb,exec_export_include=PragmaT_Sender_exec_export.h \
+              -I.. -GC
+
+  IDL_Files {
+    PragmaT_Sender.idl
+  }
+}
+
+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 \
+              -SS -Gxhst -I..
+
+  IDL_Files {
+    PragmaT_SenderE.idl
+  }
+}
+
+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
+  sharedname = PragmaT_Sender_lem_stub
+  dynamicflags += PRAGMAT_SENDER_LEM_STUB_BUILD_DLL
+  includes += ..
+  IDL_Files {
+  }
+
+  Source_Files {
+    PragmaT_SenderEC.cpp
+  }
+
+  Header_Files {
+    PragmaT_SenderEC.h
+    PragmaT_Sender_lem_stub_export.h
+  }
+
+  Inline_Files {
+    PragmaT_SenderEC.inl
+  }
+}
+
+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
+  sharedname = PragmaT_Sender_stub
+  dynamicflags += PRAGMAT_SENDER_STUB_BUILD_DLL
+  includes += ..
+  IDL_Files {
+  }
+
+  Source_Files {
+    PragmaT_SenderC.cpp
+  }
+
+  Header_Files {
+    PragmaT_SenderC.h
+    PragmaT_Sender_stub_export.h
+  }
+
+  Inline_Files {
+    PragmaT_SenderC.inl
+  }
+}
+
+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
+  libout = ../lib
+  dynamicflags += PRAGMAT_SENDER_EXEC_BUILD_DLL
+  includes += ..
+  IDL_Files {
+  }
+
+  Source_Files {
+    PragmaT_Sender_exec.cpp
+  }
+
+  Header_Files {
+    PragmaT_Sender_exec.h
+    PragmaT_Sender_exec_export.h
+  }
+
+  Inline_Files {
+  }
+}
+
+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 \
+                PragmaT_stub
+  libpaths += ../lib
+  libout = ../lib
+  dynamicflags += PRAGMAT_SENDER_SVNT_BUILD_DLL
+  includes += ..
+  IDL_Files {
+  }
+
+  Source_Files {
+    PragmaT_SenderS.cpp
+    PragmaT_Sender_svnt.cpp
+  }
+
+  Header_Files {
+    PragmaT_SenderS.h
+    PragmaT_Sender_svnt.h
+    PragmaT_Sender_svnt_export.h
+  }
+
+  Inline_Files {
+    PragmaT_SenderS.inl
+  }
+}
+
+
diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.cpp
new file mode 100644
index 00000000000..a52de2e9d1b
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.cpp
@@ -0,0 +1,400 @@
+// -*- C++ -*-
+// $Id$
+
+/**
+ * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
+ * 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
+ * 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 "PragmaT_Sender_exec.h"
+
+#include "ace/OS_NS_unistd.h"
+
+namespace CIAO_PragmaT_Sender_Impl
+{
+  void HandleException (
+      long id,
+      const char* error_string,
+      const char* func)
+  {
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT("Sender (%C) :\tCallback except from AMI.\n"),
+                func));
+    if (id != 42)
+      {
+        ACE_ERROR ((LM_ERROR,
+                    ACE_TEXT("ERROR (%C) :\tReceived unexpected ID received")
+                    ACE_TEXT(" in except handler.\n"),
+                    func));
+        return;
+      }
+    if (ACE_OS::strcmp (error_string, "PragmaT world") != 0)
+      {
+        ACE_ERROR ((LM_ERROR,
+                    ACE_TEXT("ERROR (%C) :\tReceived unexpected error string")
+                    ACE_TEXT(" received in except handler.\n"),
+                    func));
+        return;
+      }
+  }
+
+  void HandleException (
+      ::CCM_AMI::ExceptionHolder_ptr excep_holder,
+      const char* func)
+  {
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT("Sender (%C) :\tHandle except AMI\n"), func));
+    try
+      {
+        excep_holder->raise_exception ();
+      }
+    catch (const PragmaT::InternalError& ex)
+      {
+        ACE_DEBUG ((LM_DEBUG,
+                    ACE_TEXT("Sender: Caught the correct except type")
+                    ACE_TEXT(" <%u> <%C>\n"),
+                    ex.id, ex.error_string.in ()));
+        HandleException (ex.id, ex.error_string.in (), func);
+      }
+    catch (const CORBA::Exception& ex)
+      {
+        ex._tao_print_exception ("ERROR: Caught unexpected except:");
+      }
+  }
+
+  //============================================================
+  // Worker thread for asynchronous invocations for MyFoo
+  //============================================================
+  asynch_foo_generator::asynch_foo_generator (
+     ::PragmaT::CCM_Sender_Context_ptr context)
+   : context_(::PragmaT::CCM_Sender_Context::_duplicate (context))
+  {
+  }
+
+  int asynch_foo_generator::svc ()
+  {
+    ACE_OS::sleep (3);
+    ::PragmaT::AMI4CCM_MyFoo_var my_foo_ami_  =
+       context_->get_connection_sendc_run_my_foo();
+
+    if (CORBA::is_nil (my_foo_ami_))
+      {
+        ACE_ERROR ((LM_ERROR,
+                    ACE_TEXT("ERROR Sender (ASYNCH) :")
+                    ACE_TEXT("\tfoo_ami is NIL !!!\n")));
+        return 1;
+      }
+    ::PragmaT::CCM_AMI4CCM_MyFooReplyHandler_var cb =
+         new AMI4CCM_MyFooReplyHandler_run_my_foo_i ();
+
+    for (int i = 0; i < 5; ++i)
+      {
+        ACE_DEBUG ((LM_DEBUG,
+                    ACE_TEXT("Sender (ASYNCH) :")
+                    ACE_TEXT("\tInvoke Asynchronous calls\n")));
+        my_foo_ami_->sendc_foo (cb.in (),
+                                 "Do something asynchronous");
+        my_foo_ami_->sendc_hello (cb.in ());
+        my_foo_ami_->sendc_get_rw_attrib(cb.in ());
+        my_foo_ami_->sendc_get_rw_attrib(cb.in ());
+        my_foo_ami_->sendc_set_rw_attrib(cb.in (), 15);
+        my_foo_ami_->sendc_get_ro_attrib(cb.in ());
+        my_foo_ami_->sendc_get_ro_attrib(cb.in ());
+        ACE_DEBUG ((LM_DEBUG,
+             ACE_TEXT("Sender (ASYNCH) :\tInvoked Asynchronous calls\n")));
+      }
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT("Sender (ASYNCH) :\tInvoke Asynchronous calls ")
+                ACE_TEXT("to test except handling\n")));
+    my_foo_ami_->sendc_foo (cb.in (), "");
+    my_foo_ami_->sendc_set_rw_attrib(cb.in (), 0);
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT("Sender (ASYNCH) :\tInvoked Asynchronous call.\n")));
+    return 0;
+  }
+
+  //============================================================
+  // Worker thread for synchronous invocations for MyFoo
+  //============================================================
+  synch_foo_generator::synch_foo_generator (
+     ::PragmaT::CCM_Sender_Context_ptr context)
+  : context_(::PragmaT::CCM_Sender_Context::_duplicate (context))
+  {
+  }
+
+  int synch_foo_generator::svc ()
+  {
+    ACE_OS::sleep (3);
+    ::PragmaT::MyFoo_var my_foo_ami_ =
+         context_->get_connection_run_my_foo ();
+
+    //run synch calls
+    CORBA::String_var out_str;
+    for (int i = 0; i < 5; ++i)
+      {
+        CORBA::Long result = my_foo_ami_->foo ("Do something synchronous",
+                                                out_str.out ());
+        ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call (FOO)")
+                ACE_TEXT(" result <%u> answer <%C>\n"), result, out_str.in ()));
+
+        CORBA::Long answer;
+        my_foo_ami_->hello (answer);
+        ACE_DEBUG ((LM_DEBUG,
+                 ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ")
+                 ACE_TEXT("(PRAGMAT) answer <%u>\n"), answer));
+
+        try
+          {
+            CORBA::Short rw_attrib = my_foo_ami_->rw_attrib ();
+            ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ")
+                ACE_TEXT("(GET_RW_ATTRIB) answer <%u>\n"), rw_attrib));
+          }
+        catch (const PragmaT::InternalError& ex)
+          {
+            ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT("Sender (SYNCH FOO) :\tExpected Except caught :")
+                ACE_TEXT(" <%u> <%C>\n"), ex.id, ex.error_string.in ()));
+          }
+
+        try
+          {
+            my_foo_ami_->rw_attrib (15);
+            ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ")
+                ACE_TEXT("(SET_RW_ATTRIB) to <15>\n")));
+          }
+        catch (const PragmaT::InternalError& ex)
+          {
+            ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT("Sender (SYNCH FOO) :\tExpected Except caught :")
+                ACE_TEXT(" <%u> <%C>\n"), ex.id, ex.error_string.in ()));
+          }
+
+        try
+          {
+            CORBA::Short ro_attrib = my_foo_ami_->ro_attrib ();
+            ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ")
+                ACE_TEXT("(GET_RO_ATTRIB) answer <%u>\n"), ro_attrib));
+          }
+        catch (const PragmaT::InternalError& ex)
+          {
+            ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT("Sender (SYNCH FOO) :\tExpected Except caught :")
+                ACE_TEXT(" <%u> <%C>\n"), ex.id, ex.error_string.in ()));
+          }
+      }
+    try
+      {
+        CORBA::Long result = my_foo_ami_->foo ("", out_str.out ());
+        ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT("Sender (SYNCH) :\tInvoked synchronous call result ")
+                ACE_TEXT("<%u> answer <%C>\n"), result, out_str.in ()));
+      }
+    catch (const PragmaT::InternalError& ex)
+      {
+        ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT("Sender (SYNCH FOO) :\tExpected Except caught : ")
+                ACE_TEXT("<%u> <%C>\n"), ex.id, ex.error_string.in ()));
+      }
+    try
+      {
+        my_foo_ami_->rw_attrib (0);
+        ACE_DEBUG ((LM_DEBUG,
+            ACE_TEXT("Sender (SYNCH) :\tInvoked synchronous call rw_attrib\n")));
+      }
+    catch (const PragmaT::InternalError& ex)
+      {
+        ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT("Sender (SYNCH RW_ATTRIB) :\tExpected Except caught :")
+                ACE_TEXT(" <%u> <%C>\n"), ex.id, ex.error_string.in ()));
+      }
+    catch (const CORBA::Exception& ex)
+      {
+        ex._tao_print_exception ("ERROR: Caught unexpected except:");
+      }
+    return 0;
+  }
+
+  //============================================================
+  // Component Executor Implementation Class: Sender_exec_i
+  //============================================================
+  Sender_exec_i::Sender_exec_i (void)
+  {
+  }
+
+  Sender_exec_i::~Sender_exec_i (void)
+  {
+  }
+
+  // Supported operations and attributes.
+
+  // Component attributes.
+
+  // Port operations.
+  // Operations from Components::SessionComponent.
+
+  void
+  Sender_exec_i::set_session_context (
+     ::Components::SessionContext_ptr ctx)
+  {
+    this->context_ =
+      ::PragmaT::CCM_Sender_Context::_narrow (ctx);
+    if ( ::CORBA::is_nil (this->context_.in ()))
+      {
+        throw ::CORBA::INTERNAL ();
+      }
+  }
+
+  void
+  Sender_exec_i::configuration_complete (void)
+  {
+  }
+
+  void
+  Sender_exec_i::ccm_activate (void)
+  {
+    this->asynch_foo_gen_ =
+      new asynch_foo_generator (this->context_.in ());
+    this->asynch_foo_gen_->activate (THR_NEW_LWP | THR_JOINABLE, 1);
+    this->synch_foo_gen_ =
+       new synch_foo_generator (this->context_.in());
+    this->synch_foo_gen_->activate (THR_NEW_LWP | THR_JOINABLE, 1);
+  }
+
+  void
+  Sender_exec_i::ccm_passivate (void)
+  {
+  }
+
+  void
+  Sender_exec_i::ccm_remove (void)
+  {
+    delete this->asynch_foo_gen_;
+    this->asynch_foo_gen_ = 0;
+    delete this->synch_foo_gen_;
+    this->synch_foo_gen_ = 0;
+  }
+
+  AMI4CCM_MyFooReplyHandler_run_my_foo_i::AMI4CCM_MyFooReplyHandler_run_my_foo_i (void)
+  {
+  }
+
+  AMI4CCM_MyFooReplyHandler_run_my_foo_i::~AMI4CCM_MyFooReplyHandler_run_my_foo_i (void)
+  {
+  }
+
+  void
+  AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo (
+      ::CORBA::Long ami_return_val,
+       const char * answer)
+  {
+    ACE_DEBUG ((LM_DEBUG,
+               ACE_TEXT("Sender (FOO) :\tCallback from AMI: result <%u> ")
+               ACE_TEXT("answer <%C>\n"), ami_return_val, answer));
+  }
+
+  void
+  AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo_excep (
+    ::CCM_AMI::ExceptionHolder_ptr excep_holder)
+  {
+    HandleException (excep_holder, "FOO");
+  }
+
+  void
+  AMI4CCM_MyFooReplyHandler_run_my_foo_i::hello (
+      ::CORBA::Long answer)
+  {
+    ACE_DEBUG ((LM_DEBUG,
+                 ACE_TEXT("Sender (FOO) :\tCallback from AMI (PRAGMAT) :")
+                 ACE_TEXT(" answer <%u>\n"), answer));
+  }
+
+  void
+  AMI4CCM_MyFooReplyHandler_run_my_foo_i::hello_excep (
+    ::CCM_AMI::ExceptionHolder_ptr excep_holder)
+  {
+    HandleException (excep_holder, "PRAGMAT");
+  }
+
+  void
+  AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_rw_attrib (
+      ::CORBA::Short ami_return_val)
+  {
+    ACE_DEBUG ((LM_DEBUG,
+                   ACE_TEXT("Sender (RW_ATTRIB) :\tCallback from AMI (RW_ATTRIB):")
+                   ACE_TEXT(" answer <%u>\n"), ami_return_val));
+  }
+
+  void
+  AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_rw_attrib_excep (
+    ::CCM_AMI::ExceptionHolder_ptr excep_holder)
+  {
+    HandleException (excep_holder, "GET RW_ATTRIB");
+  }
+
+  void
+  AMI4CCM_MyFooReplyHandler_run_my_foo_i::set_rw_attrib (void)
+  {
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT("Sender (RW_ATTRIB) :\tCallback from ")
+                ACE_TEXT("AMI (RW_ATTRIB)\n")));
+  }
+
+  void
+  AMI4CCM_MyFooReplyHandler_run_my_foo_i::set_rw_attrib_excep (
+    ::CCM_AMI::ExceptionHolder_ptr excep_holder)
+  {
+    HandleException (excep_holder, "SET_RW_ATTRIB");
+  }
+
+  void
+  AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_ro_attrib (
+    ::CORBA::Short ro_attrib)
+  {
+    ACE_DEBUG ((LM_DEBUG,
+                 ACE_TEXT("Sender (RO_ATTRIB) :\tCallback from AMI ")
+                 ACE_TEXT("(RO_ATTRIB) : answer <%u>\n"), ro_attrib));
+ }
+
+  void
+  AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_ro_attrib_excep (
+    ::CCM_AMI::ExceptionHolder_ptr excep_holder)
+  {
+    HandleException (excep_holder, "RO_ATTRIB");
+  }
+
+  extern "C" PRAGMAT_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_PragmaT_Sender_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      Sender_exec_i);
+
+    return retval;
+  }
+}
diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.h
new file mode 100644
index 00000000000..024e09e6af4
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/PragmaT/Sender/PragmaT_Sender_exec.h
@@ -0,0 +1,190 @@
+// -*- C++ -*-
+// $Id$
+
+/**
+ * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
+ * 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
+ * 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
+ **/
+#ifndef CIAO_PRAGMAT_SENDER_EXEC_JDPMZZ_H_
+#define CIAO_PRAGMAT_SENDER_EXEC_JDPMZZ_H_
+
+#include /**/ "ace/pre.h"
+
+#include "PragmaT_SenderEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "PragmaT_Sender_exec_export.h"
+#include "tao/LocalObject.h"
+#include "ace/Task.h"
+
+namespace CIAO_PragmaT_Sender_Impl
+{
+  /// Common exception handlers
+  void HandleException (
+      long id,
+      const char* error_string,
+      const char* func);
+
+  void HandleException (
+      ::Messaging::ExceptionHolder * excep_holder,
+      const char* func);
+
+  /// Worker thread for asynchronous invocations
+  class asynch_foo_generator : public virtual ACE_Task_Base
+  {
+  public:
+    asynch_foo_generator (::PragmaT::CCM_Sender_Context_ptr context);
+
+    virtual int svc (void);
+
+  private:
+    ::PragmaT::CCM_Sender_Context_var context_;
+  };
+
+  /// Worker thread for synchronous invocations
+  class synch_foo_generator : public virtual ACE_Task_Base
+  {
+  public:
+    synch_foo_generator (::PragmaT::CCM_Sender_Context_ptr context);
+
+    virtual int svc (void);
+
+  private:
+    ::PragmaT::CCM_Sender_Context_var context_;
+  };
+
+  /**
+   * Component Executor Implementation Class: Sender_exec_i
+   */
+
+  class Sender_exec_i
+    : public virtual Sender_Exec,
+      public virtual ::CORBA::LocalObject
+  {
+  public:
+    Sender_exec_i (void);
+    virtual ~Sender_exec_i (void);
+
+    //@{
+    /** Supported operations and attributes. */
+
+    //@}
+
+    //@{
+    /** Component attributes and port operations. */
+    //@}
+
+    //@{
+    /** Operations from Components::SessionComponent. */
+    virtual void set_session_context (::Components::SessionContext_ptr ctx);
+    virtual void configuration_complete (void);
+    virtual void ccm_activate (void);
+    virtual void ccm_passivate (void);
+    virtual void ccm_remove (void);
+    //@}
+
+    //@{
+    /** User defined public operations. */
+
+    //@}
+
+  private:
+    ::PragmaT::CCM_Sender_Context_var ciao_context_;
+
+    //@{
+    /** Component attributes. */
+    //@}
+
+    //@{
+    /** User defined members. */
+
+    //@}
+
+    //@{
+    /** User defined private operations. */
+  private:
+    ::PragmaT::CCM_Sender_Context_var context_;
+    asynch_foo_generator* asynch_foo_gen_;
+    synch_foo_generator* synch_foo_gen_;
+
+    //@}
+  };
+
+  class AMI4CCM_MyFooReplyHandler_run_my_foo_i
+    : public ::PragmaT::CCM_AMI4CCM_MyFooReplyHandler,
+      public virtual ::CORBA::LocalObject
+    {
+    public:
+      AMI4CCM_MyFooReplyHandler_run_my_foo_i (void);
+      virtual ~AMI4CCM_MyFooReplyHandler_run_my_foo_i (void);
+
+      virtual void
+      foo (
+        ::CORBA::Long ami_return_val,
+        const char * answer);
+
+      virtual void
+      foo_excep (
+        ::CCM_AMI::ExceptionHolder_ptr excep_holder);
+
+      virtual void
+      hello (
+        ::CORBA::Long answer);
+
+      virtual void
+      hello_excep (
+        ::CCM_AMI::ExceptionHolder_ptr excep_holder);
+
+      virtual void
+      get_rw_attrib (
+        ::CORBA::Short rw_attrib);
+
+      virtual void
+      get_rw_attrib_excep (
+        ::CCM_AMI::ExceptionHolder_ptr excep_holder);
+
+      virtual void
+      set_rw_attrib (void);
+
+      virtual void
+      set_rw_attrib_excep (
+        ::CCM_AMI::ExceptionHolder_ptr excep_holder);
+
+      virtual void
+      get_ro_attrib (
+        ::CORBA::Short ro_attrib);
+
+      virtual void
+      get_ro_attrib_excep (
+        ::CCM_AMI::ExceptionHolder_ptr excep_holder);
+    };
+
+    extern "C" PRAGMAT_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
+    create_PragmaT_Sender_Impl (void);
+  }
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/tests/PragmaT/descriptors/Plan.cdp
new file mode 100644
index 00000000000..3c9817b56f0
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/PragmaT/descriptors/Plan.cdp
@@ -0,0 +1,374 @@
+<?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="PragmaT_ReceiverHomeImplementation">
+    <name>PragmaT_ReceiverHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="PragmaT_Receiver_ExecArtifact"/>
+    <artifact xmi:idref="PragmaT_Receiver_SvntArtifact"/>
+    <execParameter>
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_PragmaT_AMI_Receiver_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>PragmaT.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_PragmaT_Receiver_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>PragmaT.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+  <implementation xmi:id="PragmaT_SenderHomeImplementation">
+    <name>PragmaT_SenderHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="PragmaT_Sender_ExecArtifact"/>
+    <artifact xmi:idref="PragmaT_Sender_SvntArtifact"/>
+    <execParameter>
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_PragmaT_Sender_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>PragmaT.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_PragmaT_Sender_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>PragmaT.ImplementationArtifacts.SenderArtifacts.Sender_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+  <implementation xmi:id="PragmaT_AMIHomeImplementation">
+    <name>PragmaT_AMIHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="PragmaT_AMI_ExecArtifact"/>
+    <artifact xmi:idref="PragmaT_AMI_SvntArtifact"/>
+    <execParameter>
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_PragmaT_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>PragmaT.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_PragmaT_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>PragmaT.ImplementationArtifacts.AMIArtifacts.AMI_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+  <instance xmi:id="PragmaT.ComponentImplementations.PragmaTImplementation.PragmaT.Receiver">
+    <name>PragmaT.ComponentImplementations.PragmaTImplementation.PragmaT.Receiver</name>
+    <node>Receiver</node>
+    <source/>
+    <implementation xmi:idref="PragmaT_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="PragmaT.ComponentImplementations.PragmaTImplementation.PragmaT.Sender">
+    <name>PragmaT.ComponentImplementations.PragmaTImplementation.PragmaT.Sender</name>
+    <node>Sender</node>
+    <source/>
+    <implementation xmi:idref="PragmaT_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="PragmaT.ComponentImplementations.PragmaTImplementation.PragmaT.AMI">
+    <name>PragmaT.ComponentImplementations.PragmaTImplementation.PragmaT.AMI</name>
+    <node>Sender</node>
+    <source/>
+    <implementation xmi:idref="PragmaT_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="PragmaT.ComponentImplementations.PragmaTImplementation.PragmaT.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="PragmaT.ComponentImplementations.PragmaTImplementation.PragmaT.AMI" />
+    </internalEndpoint>
+  </connection>
+
+  <connection>
+    <name>do_foo_connection</name>
+    <internalEndpoint>
+      <portName>do_my_foo</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="PragmaT.ComponentImplementations.PragmaTImplementation.PragmaT.Receiver" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_uses</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="PragmaT.ComponentImplementations.PragmaTImplementation.PragmaT.AMI" />
+    </internalEndpoint>
+  </connection>
+
+  <connection>
+    <name>synch_foo_connection</name>
+    <internalEndpoint>
+      <portName>do_my_foo</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="PragmaT.ComponentImplementations.PragmaTImplementation.PragmaT.Receiver" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>run_my_foo</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="PragmaT.ComponentImplementations.PragmaTImplementation.PragmaT.Sender" />
+    </internalEndpoint>
+  </connection>
+
+  <artifact xmi:id="PragmaT_AMI_SvntArtifact">
+    <name>PragmaT.ImplementationArtifacts.AMIArtifacts.AMI_svnt</name>
+    <source/>
+    <node/>
+    <location>PragmaT_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_PragmaT_AMI4CCM_MyFoo_Connector_AMI4CCM_Connector_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="PragmaT_AMI_ExecArtifact">
+    <name>PragmaT.ImplementationArtifacts.AMIArtifacts.AMI_exec</name>
+    <source/>
+    <node/>
+    <location>PragmaT_conn</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_PragmaT_AMI4CCM_MyFoo_Connector_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="PragmaT_Receiver_SvntArtifact">
+    <name>PragmaT.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt</name>
+    <source/>
+    <node/>
+    <location>PragmaT_Receiver_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_PragmaT_AMI_ReceiverHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="PragmaT_Receiver_ExecArtifact">
+    <name>PragmaT.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec</name>
+    <source/>
+    <node/>
+    <location>PragmaT_Receiver_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_PragmaT_AMI_ReceiverHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="PragmaT_Sender_SvntArtifact">
+    <name>PragmaT.ImplementationArtifacts.SenderArtifacts.Sender_svnt</name>
+    <source/>
+    <node/>
+    <location>PragmaT_Sender_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_PragmaT_AMI_SenderHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="PragmaT_Sender_ExecArtifact">
+    <name>PragmaT.ImplementationArtifacts.SenderArtifacts.Sender_exec</name>
+    <source/>
+    <node/>
+    <location>PragmaT_Sender_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_PragmaT_AMI_SenderHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/ami4ccm/tests/PragmaT/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/PragmaT/descriptors/run_test.pl
new file mode 100755
index 00000000000..cb636637db2
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/PragmaT/descriptors/run_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 = "Plan.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/tests/SyncPortConn/Base/Hello.idl b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Base/Hello.idl
new file mode 100644
index 00000000000..d6a7c4a2ec1
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Base/Hello.idl
@@ -0,0 +1,37 @@
+// $Id$
+
+#ifndef HELLO_IDL
+#define HELLO_IDL
+
+#pragma ciao lem "Base/HelloE.idl"
+#pragma ami4ccm interface "Hello::MyFoo"
+#pragma ciao lem "Base/HelloAE.idl"
+#pragma ami4ccm idl "Base/HelloA.idl"
+
+module Hello
+{
+  exception InternalError
+    {
+      long id;
+      string error_string;
+    };
+
+  // Sender/Receiver interface
+  interface MyFoo
+    {
+      long foo (in string in_str, out string answer)
+        raises (InternalError);
+      void hello (out long answer)
+        raises (InternalError);
+
+      attribute short rw_attrib
+        getraises (InternalError)
+        setraises (InternalError);
+
+      readonly attribute short ro_attrib
+        raises (InternalError);
+    };
+};
+
+#endif
+
diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Base/SyncPortConn.mpc b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Base/SyncPortConn.mpc
new file mode 100644
index 00000000000..5c4f30217df
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Base/SyncPortConn.mpc
@@ -0,0 +1,192 @@
+// $Id$
+project(SyncPortCon_idl_gen) : componentidldefaults, ami, ami4ccm_stub {
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=HELLO_STUB_Export \
+              -Wb,stub_export_include=Hello_stub_export.h \
+              -Wb,skel_export_macro=HELLO_SKEL_Export \
+              -Wb,skel_export_include=Hello_skel_export.h \
+              -Wb,conn_export_macro=HELLO_CONN_Export \
+              -Wb,conn_export_include=Hello_conn_export.h \
+              -Wb,exec_export_macro=HELLO_EXEC_Export \
+              -Wb,exec_export_include=Hello_exec_export.h \
+              -I.. -GM -Gxhcn
+  idlflags -= -Gsv
+
+  IDL_Files {
+    Hello.idl
+  }
+}
+
+project(SyncPortCon_lem_gen) : ciaoidldefaults {
+  after += SyncPortCon_idl_gen SyncPortCon_lema_gen
+  custom_only = 1
+  idlflags += -Wb,export_macro=HELLO_LEM_STUB_Export \
+              -Wb,export_include=Hello_lem_stub_export.h \
+              -I.. -SS -Gxhst
+
+  IDL_Files {
+    HelloE.idl
+  }
+}
+
+project(SyncPortCon_lema_gen) : ciaoidldefaults {
+  after += SyncPortCon_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=HELLO_STUB_Export \
+              -Wb,stub_export_include=Hello_stub_export.h \
+              -Wb,conn_export_macro=HELLO_CONN_Export \
+              -Wb,conn_export_include=Hello_conn_export.h \
+              -Wb,svnt_export_macro=HELLO_SVNT_Export \
+              -Wb,svnt_export_include=Hello_svnt_export.h \
+              -Wb,skel_export_macro=HELLO_SKEL_Export \
+              -Wb,skel_export_include=Hello_skel_export.h \
+              -I.. -Gsv -Gcn -Glem -GC -Gxhst -Gxhsv
+
+  IDL_Files {
+    HelloA.idl
+  }
+}
+
+project(SyncPortCon_lemae_gen) : ciaoidldefaults {
+  after += SyncPortCon_lema_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=HELLO_LEM_STUB_Export \
+              -Wb,stub_export_include=Hello_lem_stub_export.h \
+              -I.. -SS
+
+  IDL_Files {
+    HelloAE.idl
+  }
+}
+
+project(SyncPortCon_stub) : ccm_stub, ami, ami4ccm_stub {
+  after += SyncPortCon_lem_gen
+  libs  +=
+  libout = ../lib
+  libpaths += ../lib
+  includes +=   ..
+
+  sharedname = Hello_stub
+  dynamicflags += HELLO_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    HelloC.cpp
+    HelloAC.cpp
+  }
+
+  Header_Files {
+    HelloC.h
+    Hello_stub_export.h
+}
+
+  Inline_Files {
+    HelloC.inl
+  }
+}
+
+project(SyncPortCon_lem_stub) : ccm_executor, ami, ami4ccm_lem_stub {
+  after += SyncPortCon_lem_gen SyncPortCon_stub SyncPortCon_lemae_gen SyncPortCon_skel
+  libs += Hello_stub Hello_skel
+  libout = ../lib
+  libpaths += ../lib
+  includes +=   ..
+
+  sharedname = Hello_lem_stub
+  dynamicflags += HELLO_LEM_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    HelloEC.cpp
+    HelloAEC.cpp
+  }
+
+  Header_Files {
+    HelloEC.h
+    Hello_lem_stub_export.h
+}
+
+  Inline_Files {
+    HelloEC.inl
+  }
+}
+
+project(SyncPortCon_skel) : ciao_executor, ami, ami4ccm_servant {
+  after      += SyncPortCon_stub
+  sharedname  = Hello_skel
+  libs       += Hello_stub
+  libout = ../lib
+  libpaths += ../lib
+  includes +=   ..
+
+  dynamicflags += HELLO_SKEL_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    HelloS.cpp
+    HelloAS.cpp
+  }
+
+  Header_Files {
+    HelloS.h
+    Hello_skel_export.h
+  }
+
+  Inline_Files {
+    HelloS.inl
+  }
+}
+
+project(SyncPortCon_conn) : ciao_executor, ami, ami4ccm_lem_stub {
+  after   += SyncPortCon_lem_stub Hello_Base_AMIB_stub SyncPortCon_skel SyncPortCon_lema_gen SyncPortCon_lemae_gen
+  sharedname = Hello_conn
+  libs += Hello_stub Hello_skel Hello_lem_stub
+  libpaths += ../lib
+  libout = ../lib
+  dynamicflags += HELLO_CONN_BUILD_DLL
+  includes += ..
+  IDL_Files {
+  }
+
+  Source_Files {
+    HelloA_conn.cpp
+  }
+
+  Header_Files {
+    HelloA_conn.h
+    Hello_conn_export.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(SyncPortCon_svnt) : ciao_servant, ami, ami4ccm_servant {
+  after   += SyncPortCon_lem_stub Hello_Base_AMIB_stub SyncPortCon_skel SyncPortCon_lema_gen SyncPortCon_lemae_gen SyncPortCon_conn
+  sharedname = Hello_svnt
+  libs += Hello_stub Hello_skel Hello_lem_stub Hello_conn
+  libpaths += ../lib
+  libout = ../lib
+  dynamicflags += HELLO_SVNT_BUILD_DLL
+  includes += ..
+  IDL_Files {
+  }
+
+  Source_Files {
+    HelloA_svnt.cpp
+  }
+
+  Header_Files {
+    HelloA_svnt.h
+    HelloA_svnt_export.h
+  }
+
+  Inline_Files {
+  }
+}
diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.idl b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.idl
new file mode 100644
index 00000000000..242594e5681
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.idl
@@ -0,0 +1,18 @@
+// $Id$
+
+#ifndef HELLO_RECEIVER_IDL
+#define HELLO_RECEIVER_IDL
+
+#include <Components.idl>
+
+#include "Base/Hello.idl"
+
+module Hello
+{
+  component Receiver
+  {
+    /// Provides
+    provides MyFoo do_my_foo;
+  };
+};
+#endif
diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.mpc
new file mode 100644
index 00000000000..e15e1463658
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver.mpc
@@ -0,0 +1,134 @@
+// $Id$
+// This file is generated with "generate_component_mpc.pl -p Hello_Base Hello_Receiver"
+
+project(SPC_Base_Hello_Receiver_idl_gen) : componentidldefaults {
+  custom_only = 1
+  after += SyncPortCon_idl_gen
+  idlflags += -Wb,stub_export_macro=HELLO_RECEIVER_STUB_Export \
+              -Wb,stub_export_include=Hello_Receiver_stub_export.h \
+              -Wb,skel_export_macro=HELLO_RECEIVER_SVNT_Export \
+              -Wb,skel_export_include=Hello_Receiver_svnt_export.h \
+              -Wb,exec_export_macro=HELLO_RECEIVER_EXEC_Export \
+              -Wb,exec_export_include=Hello_Receiver_exec_export.h \
+              -Glem -I..
+
+  IDL_Files {
+    Hello_Receiver.idl
+  }
+}
+
+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 \
+              -SS -Gxhst -I..
+
+  IDL_Files {
+    Hello_ReceiverE.idl
+  }
+}
+
+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
+  sharedname = Hello_Receiver_lem_stub
+  dynamicflags += HELLO_RECEIVER_LEM_STUB_BUILD_DLL
+  includes += ..
+  IDL_Files {
+  }
+
+  Source_Files {
+    Hello_ReceiverEC.cpp
+  }
+
+  Header_Files {
+    Hello_ReceiverEC.h
+    Hello_Receiver_lem_stub_export.h
+  }
+
+  Inline_Files {
+    Hello_ReceiverEC.inl
+  }
+}
+
+project(SyncPortCon_Base_Hello_Receiver_stub) : ccm_stub, messaging {
+  after += SPC_Base_Hello_Receiver_idl_gen SyncPortCon_stub
+  libs  += Hello_stub
+  libpaths += ../lib
+  libout = ../lib
+  sharedname = Hello_Receiver_stub
+  dynamicflags += HELLO_RECEIVER_STUB_BUILD_DLL
+  includes += ..
+  IDL_Files {
+  }
+
+  Source_Files {
+    Hello_ReceiverC.cpp
+  }
+
+  Header_Files {
+    Hello_ReceiverC.h
+    Hello_Receiver_stub_export.h
+  }
+
+  Inline_Files {
+    Hello_ReceiverC.inl
+  }
+}
+
+project(SyncPortCon_Base_Hello_Receiver_exec) : ciao_executor, messaging {
+  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
+  libout = ../lib
+  dynamicflags += HELLO_RECEIVER_EXEC_BUILD_DLL
+  includes += ..
+  IDL_Files {
+  }
+
+  Source_Files {
+    Hello_Receiver_exec.cpp
+  }
+
+  Header_Files {
+    Hello_Receiver_exec.h
+    Hello_Receiver_exec_export.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(SyncPortCon_Base_Hello_Receiver_svnt) : ciao_servant, messaging {
+  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 \
+                Hello_stub Hello_lem_stub
+  libpaths += ../lib
+  libout = ../lib
+  dynamicflags += HELLO_RECEIVER_SVNT_BUILD_DLL
+  includes += ..
+  IDL_Files {
+  }
+
+  Source_Files {
+    Hello_ReceiverS.cpp
+    Hello_Receiver_svnt.cpp
+  }
+
+  Header_Files {
+    Hello_ReceiverS.h
+    Hello_Receiver_svnt.h
+    Hello_Receiver_svnt_export.h
+  }
+
+  Inline_Files {
+    Hello_ReceiverS.inl
+  }
+}
+
diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.cpp
new file mode 100644
index 00000000000..46cc01778cd
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.cpp
@@ -0,0 +1,144 @@
+// -*- C++ -*-
+// $Id$
+
+#include "Hello_Receiver_exec.h"
+#include "ace/OS_NS_unistd.h"
+
+namespace CIAO_Hello_Receiver_Impl
+{
+  MyFoo_exec_i::MyFoo_exec_i (
+   ::Hello::CCM_Receiver_Context_ptr ctx)
+  : ciao_context_ (
+     ::Hello::CCM_Receiver_Context::_duplicate (ctx))
+  {
+  }
+
+  MyFoo_exec_i::~MyFoo_exec_i (void)
+  {
+  }
+
+  ::CORBA::Long
+  MyFoo_exec_i::foo (const char * in_str, ::CORBA::String_out answer)
+  {
+    if (ACE_OS::strlen (in_str) == 0)
+      {
+        Hello::InternalError ex (42, "Hello world");
+        throw ex;
+      }
+    else
+      {
+        ACE_OS::sleep (ACE_OS::rand () % 2);
+        answer = CORBA::string_dup ("This is my answer : Hi");
+        return ACE_OS::rand () % 100;
+      }
+  }
+
+  void
+  MyFoo_exec_i::hello (::CORBA::Long_out answer)
+  {
+    ACE_OS::sleep (ACE_OS::rand () % 2);
+    answer = ACE_OS::rand () % 100;
+  }
+
+  ::CORBA::Short
+  MyFoo_exec_i::rw_attrib ()
+  {
+    ACE_OS::sleep (ACE_OS::rand () % 2);
+    return ACE_OS::rand () % 100;
+  }
+
+  void
+  MyFoo_exec_i::rw_attrib (::CORBA::Short new_value)
+  {
+    if (new_value == 0)
+      {
+        Hello::InternalError ex (42, "Hello world");
+        throw ex;
+      }
+    else
+      {
+        ACE_OS::sleep (ACE_OS::rand () % 2);
+      }
+  }
+
+  CORBA::Short
+  MyFoo_exec_i::ro_attrib ()
+  {
+    ACE_OS::sleep (ACE_OS::rand () % 2);
+    return ACE_OS::rand () % 100;
+  }
+
+  Receiver_exec_i::Receiver_exec_i (void)
+  {
+  }
+
+  Receiver_exec_i::~Receiver_exec_i (void)
+  {
+  }
+
+  ::Hello::CCM_MyFoo_ptr
+  Receiver_exec_i::get_do_my_foo (void)
+  {
+    if ( ::CORBA::is_nil (this->ciao_do_my_foo_.in ()))
+      {
+        MyFoo_exec_i *tmp = 0;
+        ACE_NEW_RETURN (
+          tmp,
+          MyFoo_exec_i (
+            this->context_.in ()),
+            ::Hello::CCM_MyFoo::_nil ());
+
+          this->ciao_do_my_foo_ = tmp;
+      }
+
+    return
+      ::Hello::CCM_MyFoo::_duplicate (
+        this->ciao_do_my_foo_.in ());
+  }
+
+  void
+  Receiver_exec_i::set_session_context (
+    ::Components::SessionContext_ptr ctx)
+  {
+    this->context_ = ::Hello::CCM_Receiver_Context::_narrow (ctx);
+
+    if ( ::CORBA::is_nil (this->context_.in ()))
+      {
+        throw ::CORBA::INTERNAL ();
+      }
+  }
+
+  void
+  Receiver_exec_i::configuration_complete (void)
+  {
+  }
+
+  void
+  Receiver_exec_i::ccm_activate (void)
+  {
+  }
+
+  void
+  Receiver_exec_i::ccm_passivate (void)
+  {
+  }
+
+  void
+  Receiver_exec_i::ccm_remove (void)
+  {
+  }
+
+  extern "C"  ::Components::EnterpriseComponent_ptr
+  create_Hello_AMI_Receiver_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_RETURN (
+      retval,
+      Receiver_exec_i,
+      ::Components::EnterpriseComponent::_nil ());
+
+    return retval;
+  }
+}
diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.h
new file mode 100644
index 00000000000..74034637e62
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Receiver/Hello_Receiver_exec.h
@@ -0,0 +1,68 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef CIAO_HELLO_RECEIVER_EXEC_H_
+#define CIAO_HELLO_RECEIVER_EXEC_H_
+
+#include "Hello_ReceiverEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/LocalObject.h"
+#include "Hello_Receiver_exec_export.h"
+
+namespace CIAO_Hello_Receiver_Impl
+{
+  class MyFoo_exec_i
+    : public virtual ::Hello::CCM_MyFoo,
+      public virtual ::CORBA::LocalObject
+  {
+  public:
+    MyFoo_exec_i (::Hello::CCM_Receiver_Context_ptr ctx);
+    virtual ~MyFoo_exec_i (void);
+
+    virtual ::CORBA::Long foo (const char * in_str, ::CORBA::String_out answer);
+
+    virtual void hello (::CORBA::Long_out answer);
+
+    virtual ::CORBA::Short rw_attrib ();
+
+    virtual void rw_attrib (::CORBA::Short new_value);
+
+    virtual CORBA::Short ro_attrib ();
+  private:
+    ::Hello::CCM_Receiver_Context_var ciao_context_;
+   };
+
+  class  Receiver_exec_i
+    : public virtual Receiver_Exec,
+      public virtual ::CORBA::LocalObject
+  {
+  public:
+    Receiver_exec_i (void);
+    virtual ~Receiver_exec_i (void);
+
+    virtual ::Hello::CCM_MyFoo_ptr get_do_my_foo (void);
+
+    virtual void set_session_context (::Components::SessionContext_ptr ctx);
+
+    virtual void configuration_complete (void);
+
+    virtual void ccm_activate (void);
+    virtual void ccm_passivate (void);
+    virtual void ccm_remove (void);
+
+  private:
+    ::Hello::CCM_Receiver_Context_var context_;
+    ::Hello::CCM_MyFoo_var ciao_do_my_foo_;
+
+  };
+
+  extern "C" HELLO_RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Hello_AMI_Receiver_Impl (void);
+}
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.idl b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.idl
new file mode 100644
index 00000000000..993f1c80171
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.idl
@@ -0,0 +1,21 @@
+// $Id$
+
+#ifndef HELLO_SENDER_IDL
+#define HELLO_SENDER_IDL
+
+#include <Components.idl>
+
+#include "Base/Hello.idl"
+
+#pragma ciao ami4ccm receptacle "Hello::Sender::run_my_foo"
+
+module Hello
+{
+  component Sender
+  {
+    /// For synchronous invocation
+    uses MyFoo run_my_foo;
+  };
+};
+
+#endif
diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.mpc b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.mpc
new file mode 100644
index 00000000000..46913c132bb
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender.mpc
@@ -0,0 +1,135 @@
+// $Id$
+// This file is generated with "generate_component_mpc.pl -p Hello_Base Hello_Sender"
+
+project(SyncPortCon_Base_Hello_Sender_idl_gen) : componentidldefaults {
+  after += SyncPortCon_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=HELLO_SENDER_STUB_Export \
+              -Wb,stub_export_include=Hello_Sender_stub_export.h \
+              -Wb,skel_export_macro=HELLO_SENDER_SVNT_Export \
+              -Wb,skel_export_include=Hello_Sender_svnt_export.h \
+              -Wb,exec_export_macro=HELLO_SENDER_EXEC_Export \
+              -Wb,exec_export_include=Hello_Sender_exec_export.h \
+              -I.. -GC
+
+  IDL_Files {
+    Hello_Sender.idl
+  }
+}
+
+project(SyncPortCon_Base_Hello_Sender_lem_gen) : ciaoidldefaults {
+  after += SyncPortCon_Base_Hello_Sender_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=HELLO_SENDER_LEM_STUB_Export \
+              -Wb,stub_export_include=Hello_Sender_lem_stub_export.h \
+              -SS -Gxhst -I..
+
+  IDL_Files {
+    Hello_SenderE.idl
+  }
+}
+
+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
+  libout = ../lib
+  sharedname = Hello_Sender_lem_stub
+  dynamicflags += HELLO_SENDER_LEM_STUB_BUILD_DLL
+  includes += ..
+  IDL_Files {
+  }
+
+  Source_Files {
+    Hello_SenderEC.cpp
+  }
+
+  Header_Files {
+    Hello_SenderEC.h
+    Hello_Sender_lem_stub_export.h
+  }
+
+  Inline_Files {
+    Hello_SenderEC.inl
+  }
+}
+
+project(SyncPortCon_Base_Hello_Sender_stub) : ccm_stub, ami   {
+  after += SyncPortCon_Base_Hello_Sender_idl_gen SyncPortCon_Base_stub SyncPortCon_stub Conn_Hello_Base_stub
+  libs  += Hello_stub
+  libpaths += ../lib
+  libout = ../lib
+  sharedname = Hello_Sender_stub
+  dynamicflags += HELLO_SENDER_STUB_BUILD_DLL
+  includes += ..
+  IDL_Files {
+  }
+
+  Source_Files {
+    Hello_SenderC.cpp
+  }
+
+  Header_Files {
+    Hello_SenderC.h
+    Hello_Sender_stub_export.h
+  }
+
+  Inline_Files {
+    Hello_SenderC.inl
+  }
+}
+
+project(SyncPortCon_Base_Hello_Sender_exec) : ciao_executor, ami, ami4ccm_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
+  libout = ../lib
+  dynamicflags += HELLO_SENDER_EXEC_BUILD_DLL
+  includes += ..
+  IDL_Files {
+  }
+
+  Source_Files {
+    Hello_Sender_exec.cpp
+  }
+
+  Header_Files {
+    Hello_Sender_exec.h
+    Hello_Sender_exec_export.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(SyncPortCon_Base_Hello_Sender_svnt) : ciao_servant, ami {
+  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 \
+                Hello_stub
+  libpaths += ../lib
+  libout = ../lib
+  dynamicflags += HELLO_SENDER_SVNT_BUILD_DLL
+  includes += ..
+  IDL_Files {
+  }
+
+  Source_Files {
+    Hello_SenderS.cpp
+    Hello_Sender_svnt.cpp
+  }
+
+  Header_Files {
+    Hello_SenderS.h
+    Hello_Sender_svnt.h
+    Hello_Sender_svnt_export.h
+  }
+
+  Inline_Files {
+    Hello_SenderS.inl
+  }
+}
+
+
diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.cpp
new file mode 100644
index 00000000000..ce07e5679dc
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.cpp
@@ -0,0 +1,400 @@
+// -*- C++ -*-
+// $Id$
+
+/**
+ * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
+ * 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
+ * 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 "Hello_Sender_exec.h"
+
+#include "ace/OS_NS_unistd.h"
+
+namespace CIAO_Hello_Sender_Impl
+{
+  void HandleException (
+      long id,
+      const char* error_string,
+      const char* func)
+  {
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT("Sender (%C) :\tCallback except from AMI.\n"),
+                func));
+    if (id != 42)
+      {
+        ACE_ERROR ((LM_ERROR,
+                    ACE_TEXT("ERROR (%C) :\tReceived unexpected ID received")
+                    ACE_TEXT(" in except handler.\n"),
+                    func));
+        return;
+      }
+    if (ACE_OS::strcmp (error_string, "Hello world") != 0)
+      {
+        ACE_ERROR ((LM_ERROR,
+                    ACE_TEXT("ERROR (%C) :\tReceived unexpected error string")
+                    ACE_TEXT(" received in except handler.\n"),
+                    func));
+        return;
+      }
+  }
+
+  void HandleException (
+      ::CCM_AMI::ExceptionHolder_ptr excep_holder,
+      const char* func)
+  {
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT("Sender (%C) :\tHandle except AMI\n"), func));
+    try
+      {
+        excep_holder->raise_exception ();
+      }
+    catch (const Hello::InternalError& ex)
+      {
+        ACE_DEBUG ((LM_DEBUG,
+                    ACE_TEXT("Sender: Caught the correct except type")
+                    ACE_TEXT(" <%u> <%C>\n"),
+                    ex.id, ex.error_string.in ()));
+        HandleException (ex.id, ex.error_string.in (), func);
+      }
+    catch (const CORBA::Exception& ex)
+      {
+        ex._tao_print_exception ("ERROR: Caught unexpected except:");
+      }
+  }
+
+  //============================================================
+  // Worker thread for asynchronous invocations for MyFoo
+  //============================================================
+  asynch_foo_generator::asynch_foo_generator (
+     ::Hello::CCM_Sender_Context_ptr context)
+   : context_(::Hello::CCM_Sender_Context::_duplicate (context))
+  {
+  }
+
+  int asynch_foo_generator::svc ()
+  {
+    ACE_OS::sleep (3);
+    ::Hello::AMI4CCM_MyFoo_var my_foo_ami_  =
+       context_->get_connection_sendc_run_my_foo();
+
+    if (CORBA::is_nil (my_foo_ami_))
+      {
+        ACE_ERROR ((LM_ERROR,
+                    ACE_TEXT("ERROR Sender (ASYNCH) :")
+                    ACE_TEXT("\tfoo_ami is NIL !!!\n")));
+        return 1;
+      }
+    ::Hello::CCM_AMI4CCM_MyFooReplyHandler_var cb =
+         new AMI4CCM_MyFooReplyHandler_run_my_foo_i ();
+
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT("Sender (ASYNCH) :")
+                ACE_TEXT("\tInvoke Asynchronous calls\n")));
+    my_foo_ami_->sendc_foo (cb.in (),
+                             "Do something asynchronous");
+    my_foo_ami_->sendc_hello (cb.in ());
+    my_foo_ami_->sendc_get_rw_attrib(cb.in ());
+    my_foo_ami_->sendc_set_rw_attrib(cb.in (), 15);
+    my_foo_ami_->sendc_get_ro_attrib(cb.in ());
+    ACE_DEBUG ((LM_DEBUG,
+         ACE_TEXT("Sender (ASYNCH) :\tInvoked Asynchronous calls\n")));
+
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT("Sender (ASYNCH) :\tInvoke Asynchronous calls ")
+                ACE_TEXT("to test except handling\n")));
+    my_foo_ami_->sendc_foo (cb.in (), "");
+    my_foo_ami_->sendc_set_rw_attrib(cb.in (), 0);
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT("Sender (ASYNCH) :\tInvoked Asynchronous call.\n")));
+    return 0;
+  }
+
+  //============================================================
+  // Worker thread for synchronous invocations for MyFoo
+  //============================================================
+  synch_foo_generator::synch_foo_generator (
+     ::Hello::CCM_Sender_Context_ptr context)
+  : context_(::Hello::CCM_Sender_Context::_duplicate (context))
+  {
+  }
+
+  int synch_foo_generator::svc ()
+  {
+    ACE_OS::sleep (3);
+    ::Hello::MyFoo_var my_foo_ami_ =
+         context_->get_connection_run_my_foo ();
+
+    //run synch calls
+    CORBA::String_var out_str;
+    CORBA::Long result = my_foo_ami_->foo ("Do something synchronous",
+                                            out_str.out ());
+    ACE_DEBUG ((LM_DEBUG,
+            ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call (FOO)")
+            ACE_TEXT(" result <%u> answer <%C>\n"), result, out_str.in ()));
+
+    CORBA::Long answer;
+    my_foo_ami_->hello (answer);
+    ACE_DEBUG ((LM_DEBUG,
+             ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ")
+             ACE_TEXT("(HELLO) answer <%u>\n"), answer));
+    try
+      {
+        ACE_DEBUG ((LM_DEBUG,
+                 ACE_TEXT("Sender (SYNCH) :\tInvoke synchronous call foo, expect exception \n")));
+
+        CORBA::Long result = my_foo_ami_->foo ("", out_str.out ());
+        ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT("ERROR : Sender (SYNCH):\tInvoked synchronous call (FOO)")
+                ACE_TEXT(" result <%u> answer <%C>\n"), result, out_str.in ()));
+
+      }
+    catch (const Hello::InternalError& ex)
+      {
+        ACE_DEBUG ((LM_DEBUG,
+                 ACE_TEXT("Sender (SYNCH FOO) :\tExpected Except caught : ")
+                 ACE_TEXT("<%u> <%C>\n"), ex.id, ex.error_string.in ()));
+      }
+   try
+     {
+       ACE_DEBUG ((LM_DEBUG,
+           ACE_TEXT("Sender (SYNCH):\tInvoke synchronous call rw_attrib\n")));
+
+       CORBA::Short rw_attrib = my_foo_ami_->rw_attrib ();
+       ACE_DEBUG ((LM_DEBUG,
+           ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call rw_attrib ")
+           ACE_TEXT("(GET_RW_ATTRIB) answer <%u>\n"), rw_attrib));
+
+      }
+   catch (const Hello::InternalError& ex)
+     {
+       ACE_DEBUG ((LM_DEBUG,
+          ACE_TEXT("ERROR:Sender (SYNCH FOO) :\tUnexpected Except caught :")
+          ACE_TEXT(" <%u> <%C>\n"), ex.id, ex.error_string.in ()));
+     }
+
+   try
+     {
+       my_foo_ami_->rw_attrib (15);
+              ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ")
+              ACE_TEXT("(SET_RW_ATTRIB) to <15>\n")));
+     }
+   catch (const Hello::InternalError& ex)
+     {
+       ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT("ERROR:Sender (SYNCH FOO) :\tUnexpected Except caught :")
+              ACE_TEXT(" <%u> <%C>\n"), ex.id, ex.error_string.in ()));
+     }
+
+   try
+     {
+       CORBA::Short ro_attrib = my_foo_ami_->ro_attrib ();
+       ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT("Sender (SYNCH):\tInvoked synchronous call ")
+              ACE_TEXT("(GET_RO_ATTRIB) answer <%u>\n"), ro_attrib));
+     }
+   catch (const Hello::InternalError& ex)
+     {
+        ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT("ERROR: Sender (SYNCH FOO) :\tUnexpected Except caught :")
+              ACE_TEXT(" <%u> <%C>\n"), ex.id, ex.error_string.in ()));
+     }
+   try
+     {
+       my_foo_ami_->rw_attrib (0);
+       ACE_DEBUG ((LM_DEBUG,
+            ACE_TEXT("Sender (SYNCH) :\tInvoked synchronous call rw_attrib\n")));
+     }
+   catch (const Hello::InternalError& ex)
+     {
+       ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT("Sender (SYNCH RW_ATTRIB) :\tExpected Except caught :")
+                ACE_TEXT(" <%u> <%C>\n"), ex.id, ex.error_string.in ()));
+     }
+   catch (const CORBA::Exception& ex)
+     {
+       ex._tao_print_exception ("ERROR: Caught unexpected except:");
+     }
+   return 0;
+  }
+
+  //============================================================
+  // Component Executor Implementation Class: Sender_exec_i
+  //============================================================
+  Sender_exec_i::Sender_exec_i (void)
+  {
+  }
+
+  Sender_exec_i::~Sender_exec_i (void)
+  {
+  }
+
+  // Supported operations and attributes.
+
+  // Component attributes.
+
+  // Port operations.
+  // Operations from Components::SessionComponent.
+
+  void
+  Sender_exec_i::set_session_context (
+     ::Components::SessionContext_ptr ctx)
+  {
+    this->context_ =
+      ::Hello::CCM_Sender_Context::_narrow (ctx);
+    if ( ::CORBA::is_nil (this->context_.in ()))
+      {
+        throw ::CORBA::INTERNAL ();
+      }
+  }
+
+  void
+  Sender_exec_i::configuration_complete (void)
+  {
+  }
+
+  void
+  Sender_exec_i::ccm_activate (void)
+  {
+    this->asynch_foo_gen_ =
+      new asynch_foo_generator (this->context_.in ());
+    this->asynch_foo_gen_->activate (THR_NEW_LWP | THR_JOINABLE, 1);
+    this->synch_foo_gen_ =
+       new synch_foo_generator (this->context_.in());
+    this->synch_foo_gen_->activate (THR_NEW_LWP | THR_JOINABLE, 1);
+  }
+
+  void
+  Sender_exec_i::ccm_passivate (void)
+  {
+  }
+
+  void
+  Sender_exec_i::ccm_remove (void)
+  {
+    delete this->asynch_foo_gen_;
+    this->asynch_foo_gen_ = 0;
+    delete this->synch_foo_gen_;
+    this->synch_foo_gen_ = 0;
+  }
+
+  AMI4CCM_MyFooReplyHandler_run_my_foo_i::AMI4CCM_MyFooReplyHandler_run_my_foo_i (void)
+  {
+  }
+
+  AMI4CCM_MyFooReplyHandler_run_my_foo_i::~AMI4CCM_MyFooReplyHandler_run_my_foo_i (void)
+  {
+  }
+
+  void
+  AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo (
+      ::CORBA::Long ami_return_val,
+       const char * answer)
+  {
+    ACE_DEBUG ((LM_DEBUG,
+               ACE_TEXT("Sender (FOO) :\tCallback from AMI: result <%u> ")
+               ACE_TEXT("answer <%C>\n"), ami_return_val, answer));
+  }
+
+  void
+  AMI4CCM_MyFooReplyHandler_run_my_foo_i::foo_excep (
+    ::CCM_AMI::ExceptionHolder_ptr excep_holder)
+  {
+    HandleException (excep_holder, "FOO");
+  }
+
+  void
+  AMI4CCM_MyFooReplyHandler_run_my_foo_i::hello (
+      ::CORBA::Long answer)
+  {
+    ACE_DEBUG ((LM_DEBUG,
+                 ACE_TEXT("Sender (FOO) :\tCallback from AMI (HELLO) :")
+                 ACE_TEXT(" answer <%u>\n"), answer));
+  }
+
+  void
+  AMI4CCM_MyFooReplyHandler_run_my_foo_i::hello_excep (
+    ::CCM_AMI::ExceptionHolder_ptr excep_holder)
+  {
+    HandleException (excep_holder, "HELLO");
+  }
+
+  void
+  AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_rw_attrib (
+      ::CORBA::Short ami_return_val)
+  {
+    ACE_DEBUG ((LM_DEBUG,
+                   ACE_TEXT("Sender (RW_ATTRIB) :\tCallback from AMI (RW_ATTRIB):")
+                   ACE_TEXT(" answer <%u>\n"), ami_return_val));
+  }
+
+  void
+  AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_rw_attrib_excep (
+    ::CCM_AMI::ExceptionHolder_ptr excep_holder)
+  {
+    HandleException (excep_holder, "GET RW_ATTRIB");
+  }
+
+  void
+  AMI4CCM_MyFooReplyHandler_run_my_foo_i::set_rw_attrib (void)
+  {
+    ACE_DEBUG ((LM_DEBUG,
+                ACE_TEXT("Sender (RW_ATTRIB) :\tCallback from ")
+                ACE_TEXT("AMI (RW_ATTRIB)\n")));
+  }
+
+  void
+  AMI4CCM_MyFooReplyHandler_run_my_foo_i::set_rw_attrib_excep (
+    ::CCM_AMI::ExceptionHolder_ptr excep_holder)
+  {
+    HandleException (excep_holder, "SET_RW_ATTRIB");
+  }
+
+  void
+  AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_ro_attrib (
+    ::CORBA::Short ro_attrib)
+  {
+    ACE_DEBUG ((LM_DEBUG,
+                 ACE_TEXT("Sender (RO_ATTRIB) :\tCallback from AMI ")
+                 ACE_TEXT("(RO_ATTRIB) : answer <%u>\n"), ro_attrib));
+ }
+
+  void
+  AMI4CCM_MyFooReplyHandler_run_my_foo_i::get_ro_attrib_excep (
+    ::CCM_AMI::ExceptionHolder_ptr excep_holder)
+  {
+    HandleException (excep_holder, "RO_ATTRIB");
+  }
+
+  extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Hello_Sender_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      Sender_exec_i);
+
+    return retval;
+  }
+}
diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.h
new file mode 100644
index 00000000000..1587775550d
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/SyncPortConn/Sender/Hello_Sender_exec.h
@@ -0,0 +1,190 @@
+// -*- C++ -*-
+// $Id$
+
+/**
+ * Code generated by the The ACE ORB (TAO) IDL Compiler v1.8.3
+ * 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
+ * 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
+ **/
+#ifndef CIAO_HELLO_SENDER_EXEC_JDPMZZ_H_
+#define CIAO_HELLO_SENDER_EXEC_JDPMZZ_H_
+
+#include /**/ "ace/pre.h"
+
+#include "Hello_SenderEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "Hello_Sender_exec_export.h"
+#include "tao/LocalObject.h"
+#include "ace/Task.h"
+
+namespace CIAO_Hello_Sender_Impl
+{
+  /// Common exception handlers
+  void HandleException (
+      long id,
+      const char* error_string,
+      const char* func);
+
+  void HandleException (
+      ::Messaging::ExceptionHolder * excep_holder,
+      const char* func);
+
+  /// Worker thread for asynchronous invocations
+  class asynch_foo_generator : public virtual ACE_Task_Base
+  {
+  public:
+    asynch_foo_generator (::Hello::CCM_Sender_Context_ptr context);
+
+    virtual int svc (void);
+
+  private:
+    ::Hello::CCM_Sender_Context_var context_;
+  };
+
+  /// Worker thread for synchronous invocations
+  class synch_foo_generator : public virtual ACE_Task_Base
+  {
+  public:
+    synch_foo_generator (::Hello::CCM_Sender_Context_ptr context);
+
+    virtual int svc (void);
+
+  private:
+    ::Hello::CCM_Sender_Context_var context_;
+  };
+
+  /**
+   * Component Executor Implementation Class: Sender_exec_i
+   */
+
+  class Sender_exec_i
+    : public virtual Sender_Exec,
+      public virtual ::CORBA::LocalObject
+  {
+  public:
+    Sender_exec_i (void);
+    virtual ~Sender_exec_i (void);
+
+    //@{
+    /** Supported operations and attributes. */
+
+    //@}
+
+    //@{
+    /** Component attributes and port operations. */
+    //@}
+
+    //@{
+    /** Operations from Components::SessionComponent. */
+    virtual void set_session_context (::Components::SessionContext_ptr ctx);
+    virtual void configuration_complete (void);
+    virtual void ccm_activate (void);
+    virtual void ccm_passivate (void);
+    virtual void ccm_remove (void);
+    //@}
+
+    //@{
+    /** User defined public operations. */
+
+    //@}
+
+  private:
+    ::Hello::CCM_Sender_Context_var ciao_context_;
+
+    //@{
+    /** Component attributes. */
+    //@}
+
+    //@{
+    /** User defined members. */
+
+    //@}
+
+    //@{
+    /** User defined private operations. */
+  private:
+    ::Hello::CCM_Sender_Context_var context_;
+    asynch_foo_generator* asynch_foo_gen_;
+    synch_foo_generator* synch_foo_gen_;
+
+    //@}
+  };
+
+  class AMI4CCM_MyFooReplyHandler_run_my_foo_i
+    : public ::Hello::CCM_AMI4CCM_MyFooReplyHandler,
+      public virtual ::CORBA::LocalObject
+    {
+    public:
+      AMI4CCM_MyFooReplyHandler_run_my_foo_i (void);
+      virtual ~AMI4CCM_MyFooReplyHandler_run_my_foo_i (void);
+
+      virtual void
+      foo (
+        ::CORBA::Long ami_return_val,
+        const char * answer);
+
+      virtual void
+      foo_excep (
+        ::CCM_AMI::ExceptionHolder_ptr excep_holder);
+
+      virtual void
+      hello (
+        ::CORBA::Long answer);
+
+      virtual void
+      hello_excep (
+        ::CCM_AMI::ExceptionHolder_ptr excep_holder);
+
+      virtual void
+      get_rw_attrib (
+        ::CORBA::Short rw_attrib);
+
+      virtual void
+      get_rw_attrib_excep (
+        ::CCM_AMI::ExceptionHolder_ptr excep_holder);
+
+      virtual void
+      set_rw_attrib (void);
+
+      virtual void
+      set_rw_attrib_excep (
+        ::CCM_AMI::ExceptionHolder_ptr excep_holder);
+
+      virtual void
+      get_ro_attrib (
+        ::CORBA::Short ro_attrib);
+
+      virtual void
+      get_ro_attrib_excep (
+        ::CCM_AMI::ExceptionHolder_ptr excep_holder);
+    };
+
+    extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
+    create_Hello_Sender_Impl (void);
+  }
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/Plan.cdp b/CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/Plan.cdp
new file mode 100644
index 00000000000..2bfc735c7b2
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/Plan.cdp
@@ -0,0 +1,394 @@
+<?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="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="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="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-->
+
+ <connection>
+    <name>run_synch_foo_connection</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>run_my_foo</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="Hello.ComponentImplementations.HelloImplementation.Hello.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_sync_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="Hello.ComponentImplementations.HelloImplementation.Hello.AMI" />
+    </internalEndpoint>
+  </connection>
+
+  <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>
+
+</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/Plan_no_sync_amiconn.cdp b/CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/Plan_no_sync_amiconn.cdp
new file mode 100644
index 00000000000..a7174393ba8
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/Plan_no_sync_amiconn.cdp
@@ -0,0 +1,394 @@
+<?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="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="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="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>
+
+ <!--connection>
+    <name>run_synch_foo_connection</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>run_my_foo</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="Hello.ComponentImplementations.HelloImplementation.Hello.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_sync_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="Hello.ComponentImplementations.HelloImplementation.Hello.AMI" />
+    </internalEndpoint>
+  </connection-->
+
+  <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>
+
+</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/run_test.pl
new file mode 100755
index 00000000000..4033fac9d86
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/SyncPortConn/descriptors/run_test.pl
@@ -0,0 +1,265 @@
+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'}";
+
+#$ENV{'DANCE_LOG_LEVEL'}=9;
+#$ENV{'CIAO_LOG_LEVEL'}=10;
+#$ENV{'DANCE_TRACE_ENABLE'}=1;
+#$ENV{'CIAO_TRACE_ENABLE'}=1;
+
+$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 = "Plan.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;
+}
+
+if ($#ARGV == -1) {
+    opendir(DIR, ".");
+    @files = grep(/\.cdp$/,readdir(DIR));
+    closedir(DIR);
+}
+else {
+    @files = @ARGV;
+}
+
+create_targets ();
+init_ior_files ();
+
+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
+        "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 $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) {
+          print STDERR "ERROR: The ior file of daemon $i could not be found\n";
+          kill_open_processes ();
+          exit 1;
+      }
+  }
+
+  print "Sleeping 15 seconds to allow task to complete\n";
+  sleep (15);
+
+  # 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 $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;
+  }
+    delete_ior_files ();
+    kill_open_processes ();
+        # Sleep for a couple seconds to make sure everything has a chance to shut down.
+    sleep 5;
+}
+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/tests/UsesMulti/descriptors/PlanSyncPort.cdp b/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/PlanSyncPort.cdp
new file mode 100644
index 00000000000..97882fa6ba5
--- /dev/null
+++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/PlanSyncPort.cdp
@@ -0,0 +1,558 @@
+<?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="UsesMulti_ReceiverHomeImplementation">
+    <name>UsesMulti_ReceiverHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="UsesMulti_Receiver_ExecArtifact"/>
+    <artifact xmi:idref="UsesMulti_Receiver_SvntArtifact"/>
+    <execParameter>
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_UsesMulti_Receiver_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>UsesMulti.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_UsesMulti_Receiver_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>UsesMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+  <implementation xmi:id="UsesMulti_SenderHomeImplementation">
+    <name>UsesMulti_SenderHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="UsesMulti_Sender_ExecArtifact"/>
+    <artifact xmi:idref="UsesMulti_Sender_SvntArtifact"/>
+    <execParameter>
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_UsesMulti_Sender_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>UsesMulti.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_UsesMulti_Sender_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>UsesMulti.ImplementationArtifacts.SenderArtifacts.Sender_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+<!-- conn one-->
+  <implementation xmi:id="UsesMulti_AMIOneHomeImplementation">
+    <name>UsesMulti_AMIHomeImplementation</name>
+    <source/>
+    <artifact xmi:idref="UsesMulti_AMIOne_ExecArtifact"/>
+    <artifact xmi:idref="UsesMulti_AMIOne_SvntArtifact"/>
+    <execParameter>
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_UsesMulti_AMI4CCM_One_Connector_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>UsesMulti.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_UsesMulti_AMI4CCM_One_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>UsesMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+    <instance xmi:id="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.ReceiverA">
+    <name>UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.ReceiverA</name>
+    <node>Receiver</node>
+    <source/>
+    <implementation xmi:idref="UsesMulti_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="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.ReceiverB">
+    <name>UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.ReceiverB</name>
+    <node>Receiver</node>
+    <source/>
+    <implementation xmi:idref="UsesMulti_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="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.ReceiverC">
+    <name>UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.ReceiverC</name>
+    <node>Receiver</node>
+    <source/>
+    <implementation xmi:idref="UsesMulti_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="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.Sender">
+    <name>UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.Sender</name>
+    <node>Sender</node>
+    <source/>
+    <implementation xmi:idref="UsesMulti_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="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneA">
+    <name>UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneA</name>
+    <node>Sender</node>
+    <source/>
+    <implementation xmi:idref="UsesMulti_AMIOneHomeImplementation"/>
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>AMI.ior</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+  <instance xmi:id="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneB">
+    <name>UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneB</name>
+    <node>Sender</node>
+    <source/>
+    <implementation xmi:idref="UsesMulti_AMIOneHomeImplementation"/>
+    <configProperty>
+      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>AMI.ior</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+  <instance xmi:id="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneC">
+    <name>UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneC</name>
+    <node>Sender</node>
+    <source/>
+    <implementation xmi:idref="UsesMulti_AMIOneHomeImplementation"/>
+    <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_one_connectionA</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>sendc_run_my_um_one</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneA" />
+    </internalEndpoint>
+  </connection>
+  <connection>
+    <name>run_asynch_one_connectionB</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>sendc_run_my_um_one</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneB" />
+    </internalEndpoint>
+  </connection>
+  <connection>
+    <name>run_asynch_one_connectionC</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>sendc_run_my_um_one</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneC" />
+    </internalEndpoint>
+  </connection>
+
+
+  <connection>
+    <name>do_one_connectionA</name>
+    <internalEndpoint>
+      <portName>do_my_one</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.ReceiverA" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_uses</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneA" />
+    </internalEndpoint>
+  </connection>
+  <connection>
+    <name>do_one_connectionB</name>
+    <internalEndpoint>
+      <portName>do_my_one</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.ReceiverB" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_uses</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneB" />
+    </internalEndpoint>
+  </connection>
+  <connection>
+    <name>do_one_connectionC</name>
+    <internalEndpoint>
+      <portName>do_my_one</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.ReceiverC" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_uses</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneC" />
+    </internalEndpoint>
+  </connection>
+
+ <connection>
+    <name>synch_one_connectionA</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>run_my_um_one</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_sync_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneA" />
+    </internalEndpoint>
+  </connection>
+  <connection>
+    <name>synch_one_connectionB</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>run_my_um_one</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_sync_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneB" />
+    </internalEndpoint>
+  </connection>
+  <connection>
+    <name>synch_one_connectionC</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>run_my_um_one</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.Sender" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>ami4ccm_port_ami4ccm_sync_provides</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="UsesMulti.ComponentImplementations.UsesMultiImplementation.UsesMulti.AMIOneC" />
+    </internalEndpoint>
+  </connection>
+
+
+  <artifact xmi:id="UsesMulti_AMIOne_SvntArtifact">
+    <name>UsesMulti.ImplementationArtifacts.AMIArtifacts.AMI_svnt</name>
+    <source/>
+    <node/>
+    <location>UsesMulti_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_UsesMulti_AMI4CCM_One_Connector_AMI4CCM_Connector_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+
+
+  <artifact xmi:id="UsesMulti_AMIOne_ExecArtifact">
+    <name>UsesMulti.ImplementationArtifacts.AMIArtifacts.AMI_exec</name>
+    <source/>
+    <node/>
+    <location>UsesMulti_conn</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_UsesMulti_AMI_One_Connector_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+
+  <artifact xmi:id="UsesMulti_Receiver_SvntArtifact">
+    <name>UsesMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_svnt</name>
+    <source/>
+    <node/>
+    <location>UsesMulti_Receiver_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_UsesMulti_AMI_ReceiverHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="UsesMulti_Receiver_ExecArtifact">
+    <name>UsesMulti.ImplementationArtifacts.ReceiverArtifacts.Receiver_exec</name>
+    <source/>
+    <node/>
+    <location>UsesMulti_Receiver_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_UsesMulti_AMI_ReceiverHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="UsesMulti_Sender_SvntArtifact">
+    <name>UsesMulti.ImplementationArtifacts.SenderArtifacts.Sender_svnt</name>
+    <source/>
+    <node/>
+    <location>UsesMulti_Sender_svnt</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_UsesMulti_AMI_SenderHome_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+
+  <artifact xmi:id="UsesMulti_Sender_ExecArtifact">
+    <name>UsesMulti.ImplementationArtifacts.SenderArtifacts.Sender_exec</name>
+    <source/>
+    <node/>
+    <location>UsesMulti_Sender_exec</location>
+    <execParameter>
+      <name>entryPoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_UsesMulti_AMI_SenderHome_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+  </artifact>
+</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl
index 8510b5e19ae..30ea89f152e 100755
--- a/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl
+++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/descriptors/run_test.pl
@@ -135,107 +135,121 @@ sub run_node_daemons {
 
 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 ($#ARGV == -1) {
+    opendir(DIR, ".");
+    @files = grep(/\.cdp$/,readdir(DIR));
+    closedir(DIR);
 }
-
-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 (3 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
-    kill_open_processes ();
-    exit 1;
+else {
+    @files = @ARGV;
 }
+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
+	      "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 $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) {
+	        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
+	        kill_open_processes ();
+	        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 ();
+	    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 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 $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 (3 * $tg_executor->ProcessStartWaitInterval ());
-
-if ($pl_status != 0) {
-    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
+    delete_ior_files ();
     kill_open_processes ();
-    exit 1;
+    # Sleep for a couple seconds to make sure everything has a chance to shut down.
+    sleep 5;
 }
-
-print "Executor returned.\n";
 print "Shutting down rest of the processes.\n";
 
 delete_ior_files ();
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/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/DAnCE/ChangeLog b/DAnCE/ChangeLog
index f35c45ac578..0e0e6e9c1d3 100644
--- a/DAnCE/ChangeLog
+++ b/DAnCE/ChangeLog
@@ -1,426 +1,3 @@
-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
diff --git a/DAnCE/ChangeLog.BRANCH b/DAnCE/ChangeLog.BRANCH
deleted file mode 100644
index 0e0e6e9c1d3..00000000000
--- a/DAnCE/ChangeLog.BRANCH
+++ /dev/null
@@ -1,6 +0,0 @@
-
-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/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/TAO/ChangeLog b/TAO/ChangeLog
index a22dbec7709..b18a4792178 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3926 +1,428 @@
-Tue Nov 29 15:50:06 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+Mon Dec 12 07:33:25 UTC 2011  Johnny Willemsen  <jwillemsen@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). 
+        Merged changes from our work branch. Facet servants are now generated
+        as C++ template at the moment the interface is declared, this reduces
+        the amount of code generated heavily. Component/Connector context is
+        now also generated as C++ template
 
-        * 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
+        === start changelog ===
 
-Mon Nov 28 12:57:57 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+        Sun Dec 11 19:40:16 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * bin/tao_orb_tests.lst:
+                * TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp:
+                * TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
+                  Throw exception when dynamic_cast fails
 
-          Removed !FIXED_BUGS_ONLY for Bug_3000_Regression since this
-          might be fixed.
+        Sun Dec 11 19:13:21 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Mon Nov 28 12:28:14 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+                * TAO_IDL/be/be_visitor_interface/facet_svth.cpp:
+                * TAO_IDL/be/be_visitor_interface/facet_svts.cpp:
+                  No servant is needed for local interfaces
 
-        * tao/PortableServer/Servant_Base.h:
-        * tao/PortableServer/Servant_Base.cpp:
-          Disable serveral methods with CORBA/e or minimum corba, fixes
-          bugzilla 3019
+        Sun Dec 11 18:23:17 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-Mon Nov 28 10:49:43 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+                * TAO_IDL/be/be_util.cpp:
+                  Removed mentioning of -Gsc which got removed a long time ago
 
-        * MPC/config/taobaseidldefaults.mpb:
-          Handle the S extension also manually, needed when using -oS
+        Sun Dec 11 12:32:28 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * 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_IDL/be/be_interface.cpp:
+                * TAO_IDL/be/be_visitor_interface.cpp:
+                * TAO_IDL/be/be_visitor_module/module.cpp:
+                * TAO_IDL/be_include/be_interface.h:
+                * TAO_IDL/be_include/be_visitor_interface.h:
+                * TAO_IDL/be/be_visitor_interface/interface_svh.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_svs.cpp:
+                  Removed some old stuff we don't need anymore, fixes cornucopia
 
-        * 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_IDL/be_include/be_visitor_interface/interface_svh.h:
+                * TAO_IDL/be_include/be_visitor_interface/interface_svs.h:
+                  Removed these files.
 
-        * 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.
+        Fri Dec  9 13:23:29 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
-Mon Nov 28 08:26:29 UTC 2011  Marcel Smit  <msmit@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_component.cpp:
+                * TAO_IDL/be/be_visitor_component/component_ex_idl.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_ex_idl.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_svh.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_svs.cpp:
+                * TAO_IDL/be_include/be_global.h:
+                * TAO_IDL/be_include/be_visitor_component.h:
+                * docs/compiler.html:
+                  Removed the -Glfa option from the IDL compiler.
 
-        * 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.
+                * TAO_IDL/be/be_visitor_component/facet_ex_idl.cpp:
+                * TAO_IDL/be_include/be_visitor_component/facet_ex_idl.h:
+                  Removed these files.
 
-Sun Nov 27 18:19:18 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+        Thu Dec  8 14:43:36 UTC 2011  Marcel Smit  <msmit@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
+                * TAO_IDL/be/be_visitor_component/context_svth.cpp:
+                * TAO_IDL/be/be_visitor_component/context_svts.cpp:
+                  Removed export macro for contextes.
 
-        === start changelog ===
+                * TAO_IDL/be/be_visitor_component.cpp:
+                * TAO_IDL/be/be_visitor_interface/facet_svts.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_svth.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_svts.cpp:
+                  Fixed warnings.
 
-        Sat Nov 26 11:58:18 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+        Thu Dec  8 14:16:52 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
+                * TAO_IDL/be/be_produce.cpp:
                 * 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.cpp:
+                * TAO_IDL/be/be_visitor_component/component_svth.cpp:
+                * TAO_IDL/be/be_visitor_component/component_svts.cpp:
+                * TAO_IDL/be/be_visitor_interface.cpp:
+                * TAO_IDL/be/be_visitor_interface/facet_svth.cpp:
+                * TAO_IDL/be/be_visitor_interface/facet_svts.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_svth.cpp:
+                * TAO_IDL/be/be_visitor_interface/interface_svts.cpp:
+                * TAO_IDL/be/be_visitor_module/module.cpp:
+                * TAO_IDL/be/be_visitor_operation/operation_svs.cpp:
+                * TAO_IDL/be_include/be_provides.h:
+                * TAO_IDL/be_include/be_visitor_component.h:
+                * TAO_IDL/be_include/be_visitor_interface.h:
+                * TAO_IDL/be_include/be_visitor_interface/facet_svth.h:
+                * TAO_IDL/be_include/be_visitor_interface/facet_svts.h:
+                * TAO_IDL/be_include/be_visitor_interface/interface_svth.h:
+                * TAO_IDL/be_include/be_visitor_interface/interface_svts.h:
                 * 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,
+                  Moved the generation of the facet servants to the place
+                  where they are declared (from the place where they were
+                  used). -Gsv needs to set as command line option.
 
-        Thu Nov 24 12:19:07 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+        Wed Dec  7 13:26:49 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.
+                * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+                  Fixed errors in logging.
 
-        Thu Nov 24 11:14:31 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+        Wed Dec  7 12:34:49 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
-                * TAO_IDL/be/be_codegen.cpp:
-                  Don't use the fullname for the included template source.
+                * TAO_IDL/be/be_visitor_component/context_svth.cpp:
+                * TAO_IDL/be/be_visitor_component/context_svts.cpp:
+                  No need to visit the component_scope; just visit
+                  the scope is enough..
 
-        Thu Nov 24 10:59:28 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+        Wed Dec  7 07:34:56 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_include/be_codegen.h:
+                  Reduced the number of generated include files.
+                  Also generated a include guard for the servant
+                  template source code.
 
-                * 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
+        Tue Dec  6 13:25:04 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
-        Fri Nov  4 16:24:26 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+                * TAO_IDL/be/be_visitor_component/context_svth.cpp:
+                * TAO_IDL/be/be_visitor_component/context_svts.cpp:
+                  Fixed generation issues in case dds4ccm
 
-                * MPC/config/taobaseidldefaults.mpb:
-                  Don't generate S.inl extensions in the make files.
+        Tue Dec  6 09:22:09 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
-        Tue Nov 22 15:53:18 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+                * TAO_IDL/be/be_visitor_component/component_svts.cpp:
+                  Removed comments.
 
-                * 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.
+                * TAO_IDL/be/be_visitor_root.cpp:
+                * TAO_IDL/be_include/be_visitor_root.h:
+                  Removed reference to the files below.
 
-        Tue Nov 22 10:51:12 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+                * TAO_IDL/be/be_visitor_root/root_ex_svs.cpp:
+                * TAO_IDL/be_include/be_visitor_root/root_ex_svs.h:
+                  Removed these files since a separate servant file
+                  is not needed.
 
-                * TAO_IDL:
+        Tue Dec  6 09:15:52 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
                 * 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/be_visitor_root/root_ex_svs.cpp:
+                * TAO_IDL/be_include/be_global.h:
+                  No need to create a new type of svnt file.
 
                 * 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:
+                  Using pragma ciao lem to determine which files
+                  to include.
 
-                * TAO_IDL/be_include/be_visitor_interface/amh_ss.h:
-                * TAO_IDL/be_include/be_visitor_interface/interface_ss.h:
+        Mon Dec  5 19:33:12 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
+                * TAO_IDL/be/be_produce.cpp:
+                * TAO_IDL/be/be_visitor_root.cpp:
+                * TAO_IDL/be/be_visitor_root/root_ex_svs.cpp:
                 * 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.
+                * TAO_IDL/be_include/be_visitor_root/root_ex_svs.h:
+                * TAO_IDL/be/be_visitor_root/root_ex_svnt.cpp:
+                  Renamed _svnt files since these are ignored by subversion
 
-        Mon Nov 21 09:17:14 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+        Mon Dec  5 18:43:32 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).
+                * TAO_IDL/be/be_global.cpp:
+                * TAO_IDL/be/be_produce.cpp:
+                  Reduced the restrictions for generating an executor servant.
 
-        Thu Nov 17 15:55:04 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+        Mon Dec  5 16:08:50 UTC 2011  Marcel Smit  <msmit@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/be_visitor_root/root_ex_svnt.cpp:
                 * TAO_IDL/be_include/be_codegen.h:
                 * TAO_IDL/be_include/be_global.h:
+                * TAO_IDL/be_include/be_helper.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>
+                  Generate a new svnt.h which is a place holder for the
+                  _svnt_T.h files. This will be included via S.h.
+                  The new _svnt.h is only generated when the ciao lem
+                  pragma is used or when -Glem is part of the command
+                  line options.
 
-        * 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>
+        Sun Dec  4 16:04:04 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:
+                  One step closer in solving AMI4CCM compile issues.
 
-                  Adedd test variant for full blocking configuration
-                  (RW + EXCLUSIVE TMS + blocking connect and flushing)
+        Fri Dec  2 15:57:52 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
-        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.
+                * TAO_IDL/be/be_provides.cpp:
+                * TAO_IDL/be/be_visitor_component/context_svth.cpp:
+                * TAO_IDL/be/be_visitor_component/context_svts.cpp:
+                  No multiple inheritance so no virtual needed.
 
-        Fri Oct 28 10:22:48 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+        Fri Dec  2 14:59:28 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_global.cpp:
+                * TAO_IDL/be_include/be_codegen.h:
+                * TAO_IDL/be_include/be_global.h:
+                  Include base file into inherited template header file.
 
-                * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
-                Changes for removing activators for CIAO consumers
+                * TAO_IDL/be/be_visitor_component/component_svth.cpp:
+                * TAO_IDL/be/be_visitor_component/component_svts.cpp:
+                * 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/component_svts.h:
+                  Contexts are now template classes which derive from their template
+                  base classes.
 
-        Wed Oct 26 07:18:40 UTC 2011  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
+        Fri Dec  2 08:00:16 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
                 * TAO_IDL/be/be_codegen.cpp:
-                Remove include files for ciao servant- and port_activator.
-
+                * TAO_IDL/be/be_visitor_component.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/component_svth.cpp:
+                * TAO_IDL/be/be_visitor_component/component_svts.cpp:
+                * TAO_IDL/be/be_visitor_component/context_svth.cpp:
+                * TAO_IDL/be/be_visitor_component/context_svts.cpp:
+                * TAO_IDL/be/be_visitor_component/servant_svh.cpp:
                 * 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_include/be_visitor_component.h:
+                * TAO_IDL/be_include/be_visitor_component/context_svth.h:
+                * TAO_IDL/be_include/be_visitor_component/context_svts.h:
+                  Context implementation is now templated. Therefor
+                  renamed context_sv* files.
 
                 * 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
+                * TAO_IDL/be_include/be_visitor_component/context_svh.h:
+                * TAO_IDL/be_include/be_visitor_component/context_svs.h:
+                  Removed these files.
 
-        Tue Oct 18 11:35:58 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+        Thu Dec  1 09:06:16 UTC 2011  Marcel Smit  <msmit@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
+                * TAO_IDL/be/be_visitor_component/facet_svth.cpp:
+                * TAO_IDL/be/be_visitor_component/facet_svts.cpp:
+                  Fixed coverity warning.
 
-        Tue Oct 18 10:51:21 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+        Thu Dec  1 08:37:33 UTC 2011  Marcel Smit  <msmit@remedy.nl>
 
+                * TAO_IDL/be/be_codegen.cpp:
+                * TAO_IDL/be/be_visitor_component.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/component_svth.cpp:
+                * TAO_IDL/be/be_visitor_component/component_svts.cpp:
                 * 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
+                * TAO_IDL/be/be_visitor_module/module.cpp:
+                * TAO_IDL/be_include/be_visitor_component.h:
+                * TAO_IDL/be_include/be_visitor_component/component_svth.h:
+                * TAO_IDL/be_include/be_visitor_component/component_svts.h:
+                  Moved the generated Context code to the _svnt_T files. Later on
+                  these classes will be templated.
 
-        Wed Oct 12 10:09:25 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+        === end changelog ===
 
-                * 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 Dec  7 17:54:41 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        Wed Oct  5 18:49:30 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * TAO_IDL/util/utl_stack.cpp(UTL_ScopeStack::pop):
 
-                * 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
+          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.
 
-        Wed Oct  5 18:42:43 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Dec  7 10:47:15 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
+        Merged in the changes to update AMI4CCM to match the initial revision
+        with the synchronous port and the new pragma's added
 
-                * 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.
+        === start changelog ===
 
-        Wed Oct  5 18:34:21 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+        Tue Dec  6 14:42:39 UTC 2011  Marijke Hengstmengel  <mhengstmengel@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:
+                * 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 Oct  5 08:35:20 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+        Wed Nov 30 14:19:10 UTC 2011  Marijke Hengstmengel  <mhengstmengel@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.
+                // 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.
 
-        * tests/Bug_3630_Regression/server.cpp:
-          Added \n
+        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
 
-Thu Sep 15 07:42:01 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+        Mon Nov 28 15:26:03 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@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_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
 
-        * 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
+        Wed Nov 23 14:00:38 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@remedy.nl>
 
-        * tao/CodecFactory/codecfactory_export.h:
-          Removed this file.
+                * TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp:
+                Changed return of sync operations.
 
-Wed Sep  7 17:31:31 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+        Mon Nov 21 13:32:38 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@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_IDL/be/be_codegen.cpp:
+                Exclude include *.AE.idl in *E.idl
 
-        * tao/BiDir_GIOP/bidirgiop_export.h:
-          Removed this file.
+                * 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
 
-Wed Sep  7 17:27:01 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+        Mon Nov  7 13:02:55 UTC 2011  Marijke Hengstmengel  <hengstmengel_m@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
+                * 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.
 
-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
+        === end changelog ===
 
-Tue Sep  6 08:06:46 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+Wed Dec  7 10:28:00 UTC 2011  Simon Massey <simon dot massey at prismtech dot com>
 
-        * tao/PortableServer/Basic_SArguments.h:
-          Added support for std::wstring
+        * tests/IDL_Test/IDL_Tests.mpc:
 
-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
+          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.
 
-Thu Sep  1 06:31:53 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+Mon Dec  5 20:32:56 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * 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
+        * TAO_IDL/be/be_visitor_valuetype/valuetype.cpp:
 
-Mon Aug 29 07:20:29 UTC 2011  Marcel Smit  <msmit@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.
 
-        * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp:
-          Fixed runtime issues in orbsvcs.
+        * tests/IDL_Test/valuetype.idl:
+        * tests/IDL_Test/IDL_Tests.mpc:
 
-        * tests/OBV/ValueBox/client.cpp:
-          Fixed runtime issues.
+          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.
 
-Fri Aug 26 11:09:12 UTC 2011  Marcel Smit  <msmit@remedy.nl>
+Mon Dec  5 19:57:02 UTC 2011  Johnny Willemsen  <jwillemsen@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.
-
-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>
+        * 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
 
-        * TAO_IDL/ast/ast_interface:
+Mon Dec  5 12:30:15 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-          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.
+        * TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp:
+          const fix
 
-Tue Jul 19 13:25:22 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+        * TAO_IDL/be/be_visitor_valuetype/field_cs.cpp:
+          Layout changes and generate doxygen style documentation
 
-        * 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
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp:
+          Layout changes to the generated code
 
-Tue May 17 11:32:18 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+        * examples/AMH/Sink_Server/run_test.pl:
+        * tao/PortableServer/Adapter_Activator.h:
+        * tests/Multiple/Multiple_Impl.h:
+          Zapped empty lines
 
-        * 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
+        * tests/Multiple/server.cpp:
+          Fixed typo in comment
 
-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.
+        * 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 e49dd6b23f8..00000000000
--- a/TAO/ChangeLog.BRANCH
+++ /dev/null
@@ -1,264 +0,0 @@
-Sun Dec 11 19:40:16 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
-          Throw exception when dynamic_cast fails
-
-Sun Dec 11 19:13:21 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_interface/facet_svth.cpp:
-        * TAO_IDL/be/be_visitor_interface/facet_svts.cpp:
-          No servant is needed for local interfaces
-
-Sun Dec 11 18:23:17 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_util.cpp:
-          Removed mentioning of -Gsc which got removed a long time ago
-
-Sun Dec 11 12:32:28 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_visitor_interface.cpp:
-        * TAO_IDL/be/be_visitor_module/module.cpp:
-        * TAO_IDL/be_include/be_interface.h:
-        * TAO_IDL/be_include/be_visitor_interface.h:
-        * TAO_IDL/be/be_visitor_interface/interface_svh.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_svs.cpp:
-          Removed some old stuff we don't need anymore, fixes cornucopia
-
-        * TAO_IDL/be_include/be_visitor_interface/interface_svh.h:
-        * TAO_IDL/be_include/be_visitor_interface/interface_svs.h:
-          Removed these files.
-
-Fri Dec  9 13:23:29 UTC 2011  Marcel Smit  <msmit@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_component.cpp:
-        * TAO_IDL/be/be_visitor_component/component_ex_idl.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_ex_idl.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_svh.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_svs.cpp:
-        * TAO_IDL/be_include/be_global.h:
-        * TAO_IDL/be_include/be_visitor_component.h:
-        * docs/compiler.html:
-          Removed the -Glfa option from the IDL compiler.
-
-        * TAO_IDL/be/be_visitor_component/facet_ex_idl.cpp:
-        * TAO_IDL/be_include/be_visitor_component/facet_ex_idl.h:
-          Removed these files.
-
-Thu Dec  8 14:43:36 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_component/context_svth.cpp:
-        * TAO_IDL/be/be_visitor_component/context_svts.cpp:
-          Removed export macro for contextes.
-
-        * TAO_IDL/be/be_visitor_component.cpp:
-        * TAO_IDL/be/be_visitor_interface/facet_svts.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_svth.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_svts.cpp:
-          Fixed warnings.
-
-Thu Dec  8 14:16:52 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * TAO_IDL/be/be_produce.cpp:
-        * TAO_IDL/be/be_provides.cpp:
-        * TAO_IDL/be/be_visitor_component.cpp:
-        * TAO_IDL/be/be_visitor_component/component_svth.cpp:
-        * TAO_IDL/be/be_visitor_component/component_svts.cpp:
-        * TAO_IDL/be/be_visitor_interface.cpp:
-        * TAO_IDL/be/be_visitor_interface/facet_svth.cpp:
-        * TAO_IDL/be/be_visitor_interface/facet_svts.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_svth.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_svts.cpp:
-        * TAO_IDL/be/be_visitor_module/module.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation_svs.cpp:
-        * TAO_IDL/be_include/be_provides.h:
-        * TAO_IDL/be_include/be_visitor_component.h:
-        * TAO_IDL/be_include/be_visitor_interface.h:
-        * TAO_IDL/be_include/be_visitor_interface/facet_svth.h:
-        * TAO_IDL/be_include/be_visitor_interface/facet_svts.h:
-        * TAO_IDL/be_include/be_visitor_interface/interface_svth.h:
-        * TAO_IDL/be_include/be_visitor_interface/interface_svts.h:
-        * 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:
-          Moved the generation of the facet servants to the place
-          where they are declared (from the place where they were
-          used). -Gsv needs to set as command line option.
-
-Wed Dec  7 13:26:49 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
-          Fixed errors in logging.
-
-Wed Dec  7 12:34:49 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_component/context_svth.cpp:
-        * TAO_IDL/be/be_visitor_component/context_svts.cpp:
-          No need to visit the component_scope; just visit
-          the scope is enough..
-
-Wed Dec  7 07:34:56 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be_include/be_codegen.h:
-          Reduced the number of generated include files.
-          Also generated a include guard for the servant
-          template source code.
-
-Tue Dec  6 13:25:04 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_component/context_svth.cpp:
-        * TAO_IDL/be/be_visitor_component/context_svts.cpp:
-          Fixed generation issues in case dds4ccm
-
-Tue Dec  6 09:22:09 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_component/component_svts.cpp:
-          Removed comments.
-
-        * TAO_IDL/be/be_visitor_root.cpp:
-        * TAO_IDL/be_include/be_visitor_root.h:
-          Removed reference to the files below.
-
-        * TAO_IDL/be/be_visitor_root/root_ex_svs.cpp:
-        * TAO_IDL/be_include/be_visitor_root/root_ex_svs.h:
-          Removed these files since a separate servant file
-          is not needed.
-
-Tue Dec  6 09:15:52 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * 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_module/module.cpp:
-        * TAO_IDL/be/be_visitor_root/root_ex_svs.cpp:
-        * TAO_IDL/be_include/be_global.h:
-          No need to create a new type of svnt file.
-
-        * TAO_IDL/be_include/be_codegen.h:
-          Using pragma ciao lem to determine which files
-          to include.
-
-Mon Dec  5 19:33:12 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * TAO_IDL/be/be_produce.cpp:
-        * TAO_IDL/be/be_visitor_root.cpp:
-        * TAO_IDL/be/be_visitor_root/root_ex_svs.cpp:
-        * TAO_IDL/be_include/be_visitor_root.h:
-        * TAO_IDL/be_include/be_visitor_root/root_ex_svs.h:
-        * TAO_IDL/be/be_visitor_root/root_ex_svnt.cpp:
-          Renamed _svnt files since these are ignored by subversion
-
-Mon Dec  5 18:43:32 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_global.cpp:
-        * TAO_IDL/be/be_produce.cpp:
-          Reduced the restrictions for generating an executor servant.
-
-Mon Dec  5 16:08:50 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * 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_module/module.cpp:
-        * TAO_IDL/be/be_visitor_root.cpp:
-        * TAO_IDL/be/be_visitor_root/root_ex_svnt.cpp:
-        * TAO_IDL/be_include/be_codegen.h:
-        * TAO_IDL/be_include/be_global.h:
-        * TAO_IDL/be_include/be_helper.h:
-        * TAO_IDL/be_include/be_visitor_root.h:
-          Generate a new svnt.h which is a place holder for the
-          _svnt_T.h files. This will be included via S.h.
-          The new _svnt.h is only generated when the ciao lem
-          pragma is used or when -Glem is part of the command
-          line options.
-
-Sun Dec  4 16:04:04 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * TAO_IDL/be/be_codegen.cpp:
-          One step closer in solving AMI4CCM compile issues.
-
-Fri Dec  2 15:57:52 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * TAO_IDL/be/be_provides.cpp:
-        * TAO_IDL/be/be_visitor_component/context_svth.cpp:
-        * TAO_IDL/be/be_visitor_component/context_svts.cpp:
-          No multiple inheritance so no virtual needed.
-
-Fri Dec  2 14:59:28 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_global.cpp:
-        * TAO_IDL/be_include/be_codegen.h:
-        * TAO_IDL/be_include/be_global.h:
-          Include base file into inherited template header file.
-
-        * TAO_IDL/be/be_visitor_component/component_svth.cpp:
-        * TAO_IDL/be/be_visitor_component/component_svts.cpp:
-        * 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/component_svts.h:
-          Contexts are now template classes which derive from their template
-          base classes.
-
-Fri Dec  2 08:00:16 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_visitor_component.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/component_svth.cpp:
-        * TAO_IDL/be/be_visitor_component/component_svts.cpp:
-        * TAO_IDL/be/be_visitor_component/context_svth.cpp:
-        * TAO_IDL/be/be_visitor_component/context_svts.cpp:
-        * TAO_IDL/be/be_visitor_component/servant_svh.cpp:
-        * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
-        * TAO_IDL/be_include/be_visitor_component.h:
-        * TAO_IDL/be_include/be_visitor_component/context_svth.h:
-        * TAO_IDL/be_include/be_visitor_component/context_svts.h:
-          Context implementation is now templated. Therefor
-          renamed context_sv* files.
-
-        * TAO_IDL/be/be_visitor_component/context_svh.cpp:
-        * TAO_IDL/be/be_visitor_component/context_svs.cpp:
-        * TAO_IDL/be_include/be_visitor_component/context_svh.h:
-        * TAO_IDL/be_include/be_visitor_component/context_svs.h:
-          Removed these files.
-
-Thu Dec  1 09:06:16 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 coverity warning.
-
-Thu Dec  1 08:37:33 UTC 2011  Marcel Smit  <msmit@remedy.nl>
-
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_visitor_component.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/component_svth.cpp:
-        * TAO_IDL/be/be_visitor_component/component_svts.cpp:
-        * TAO_IDL/be/be_visitor_component/context_svh.cpp:
-        * TAO_IDL/be/be_visitor_component/context_svs.cpp:
-        * TAO_IDL/be/be_visitor_module/module.cpp:
-        * TAO_IDL/be_include/be_visitor_component.h:
-        * TAO_IDL/be_include/be_visitor_component/component_svth.h:
-        * TAO_IDL/be_include/be_visitor_component/component_svts.h:
-          Moved the generated Context code to the _svnt_T files. Later on
-          these classes will be templated.
-
-
-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/NEWS b/TAO/NEWS
index af16dc898d4..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)
@@ -11,9 +14,15 @@ USER VISIBLE CHANGES BETWEEN TAO-2.0.5 and TAO-2.1.0
 . 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. As a side effect
-  the S.inl files are not generated anymore
+  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 48045498a14..be8899f7ff5 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -3557,11 +3557,31 @@ TAO_CodeGen::gen_exec_idl_includes (void)
       const char *exec_idl_fname =
         be_global->be_get_ciao_exec_idl_fname (true);
 
-      /// No need to have the exec IDL file include itself.
-      if (ACE_OS::strcmp (*path_tmp, exec_idl_fname) != 0)
+      bool skip_incl = false;
+      // special case for ami4ccm, if xxxE.idl. don't include xxxAE.idl.
+      char *exe_idl_fname = ACE_OS::strdup(exec_idl_fname);
+      char * base = ACE_OS::strstr(exe_idl_fname, "E.idl");
+      if (base != 0)
         {
-          this->gen_standard_include (this->ciao_exec_idl_, *path_tmp);
-        }
+          static char test[MAXPATHLEN];
+          ACE_OS::memset (test, 0, MAXPATHLEN);
+
+          ACE_OS::strncpy(test, exe_idl_fname, base - exe_idl_fname);
+          ACE_OS::strcat (test, "AE.idl");
+
+          if (ACE_OS::strstr ( *path_tmp,  test) != 0)
+           {
+             //skip include
+             skip_incl = true;
+           }
+
+       }
+        /// No need to have the exec IDL file include itself.
+       if ((ACE_OS::strcmp (*path_tmp, exec_idl_fname) != 0) &&
+           (!skip_incl))
+         {
+            this->gen_standard_include (this->ciao_exec_idl_, *path_tmp);
+         }
     }
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp
index b523c254798..8bb17ebc304 100644
--- a/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp
@@ -86,7 +86,11 @@ be_visitor_executor_ami_exh::visit_connector (be_connector *node)
   ACE_CString half_stripped_name (
     connector_name.substr (0, connector_name.find ("_Connector")));
 
-  os_ << half_stripped_name.c_str () <<  "_exec_i *facet_exec_;";
+  os_ << half_stripped_name.c_str () <<  "_exec_i *facet_exec_0_;" << be_nl;;
+
+  ACE_CString double_stripped_name (
+     half_stripped_name.substr (ACE_OS::strlen ("AMI4CCM_")));
+  os_ << double_stripped_name.c_str () <<  "_exec_i *facet_exec_1_;";
 
   os_ << be_uidt_nl
       << "};";
diff --git a/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp
index aac8f39309e..9747958a30f 100644
--- a/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp
@@ -12,7 +12,6 @@
  *  @author Jeff Parsons
  */
 //=============================================================================
-
 be_visitor_executor_ami_exs::be_visitor_executor_ami_exs (
       be_visitor_context *ctx)
   : be_visitor_component_scope (ctx)
@@ -36,14 +35,15 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node)
 
   os_ << be_nl_2
       << class_name << "::"
-      << class_name << " (void)" << be_idt_nl
-      << ": facet_exec_ (new ";
+      << class_name << " (void)" << be_idt_nl;
 
   /// The port is the only item in the connector's scope.
   UTL_ScopeActiveIterator j (node, UTL_Scope::IK_decls);
   AST_Extended_Port *p =
     AST_Extended_Port::narrow_from_decl (j.item ());
 
+  bool first = true;
+  int port_nr = 0;
   for (UTL_ScopeActiveIterator i (p->port_type (), UTL_Scope::IK_decls);
        !i.is_done ();
        i.next ())
@@ -53,19 +53,35 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node)
 
       if (p != 0)
         {
-          os_ << p->provides_type ()->local_name ();
+          if (first)
+            {
+             os_  << ": facet_exec_" << port_nr << "_ (new ";
+             os_ << p->provides_type ()->local_name ();
+             os_ << suffix << " ())" << be_nl;
+             first = false;
+            }
+          else
+            {
+             os_  << ", facet_exec_" << port_nr << "_ (new ";
+             os_ << p->provides_type ()->local_name ();
+             os_ << suffix << " ())" << be_uidt_nl;
+            }
+          port_nr++;
         }
     }
 
-  os_ << suffix << " ())" << be_uidt_nl
-      << "{" << be_nl
+  os_ << "{" << be_nl
       << "}";
 
   os_ << be_nl_2
       << class_name << "::~"
       << class_name << " (void)" << be_nl
-      << "{" << be_idt_nl
-      << "::CORBA::release (this->facet_exec_);" << be_uidt_nl
+      << "{" << be_idt_nl;
+  for (int i = 0; i < port_nr; i ++)
+    {
+      os_ << "::CORBA::release (this->facet_exec_" << i <<"_);" << be_nl;
+    }
+  os_ << be_uidt_nl
       << "}";
 
   if (this->visit_scope (node) == -1)
@@ -87,19 +103,25 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node)
       << "::Components::" << be_global->ciao_container_type ()
       << "Context_ptr ctx)"
       << be_uidt_nl
-      << "{" << be_idt_nl
-      << "this->facet_exec_->set_"
+      << "{" << be_idt_nl;
+   for (int i = 0; i < port_nr; i ++)
+    {
+      os_ << "this->facet_exec_" << i << "_->set_"
       << tao_cg->downcase (container_type)
       << "_context "
-      << "(ctx);" << be_uidt_nl
-      << "}";
+      << "(ctx);" << be_nl;
+   }
+   os_  << be_uidt_nl << "}";
 
   os_ << be_nl_2
       << "void" << be_nl
       << class_name << "::configuration_complete (void)" << be_nl
-      << "{" << be_idt_nl
-      << "this->facet_exec_->_set_component (this);" << be_uidt_nl
-      << "}";
+      << "{" << be_idt_nl;
+   for (int i = 0; i < port_nr; i ++)
+    {
+      os_ << "this->facet_exec_" << i << "_->_set_component (this);" << be_nl;
+    }
+  os_ << be_uidt_nl << "}";
 
   os_ << be_nl_2
       << "void" << be_nl
@@ -121,12 +143,15 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node)
   os_ << be_nl_2
       << "void" << be_nl
       << class_name << "::ccm_remove (void)" << be_nl
-      << "{" << be_idt_nl
-      << "this->facet_exec_->_set_component (" << be_idt_nl
+      << "{" << be_idt_nl;
+   for (int i = 0; i < port_nr; i ++)
+    {
+      os_ << "this->facet_exec_" << i <<"_->_set_component (" << be_idt_nl
       << "::" << s->name () << smart_scope
       << "CCM_" << this->node_->local_name ()
-      << "::_nil ());" << be_uidt << be_uidt_nl
-      << "}";
+      << "::_nil ());" << be_uidt_nl;
+   }
+  os_ << be_uidt_nl << "}";
 
   return 0;
 }
@@ -135,7 +160,7 @@ int
 be_visitor_executor_ami_exs::visit_provides (be_provides *node)
 {
   AST_Type *t = node->provides_type ();
-  AST_Decl *scope = ScopeAsDecl (t->defined_in ());
+   AST_Decl *scope = ScopeAsDecl (t->defined_in ());
   bool global = (scope->node_type () == AST_Decl::NT_root);
   const char *smart_scope = (global ? "" : "::");
 
@@ -150,14 +175,16 @@ be_visitor_executor_ami_exs::visit_provides (be_provides *node)
   UTL_ScopeActiveIterator i (this->node_, UTL_Scope::IK_decls);
   AST_Decl *d = i.item ();
 
-  os_ << d->local_name () << "_"
+  const char * loc_name = node->local_name()->get_string();
+  const char *exec_ext = (strstr (loc_name, "sync") ? "1" : "0");
+
+    os_ << d->local_name () << "_"
       << node->local_name () << " (void)" << be_nl
       << "{" << be_idt_nl
       << "return "
       << smart_scope << scope->full_name () << "::CCM_" << t->local_name () << "::_duplicate ("
-      << "this->facet_exec_);" << be_uidt_nl
+      << "this->facet_exec_" << exec_ext << "_);" << be_uidt_nl
       << "}";
 
   return 0;
 }
-
diff --git a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp
index e8eeef9e16e..f524a05ac16 100644
--- a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp
@@ -12,6 +12,8 @@
  *  @author Jeff Parsons
  */
 //=============================================================================
+#include "ast_generator.h"
+#include "be_predefined_type.h"
 
 be_visitor_facet_ami_exh::be_visitor_facet_ami_exh (
       be_visitor_context *ctx)
@@ -19,7 +21,8 @@ be_visitor_facet_ami_exh::be_visitor_facet_ami_exh (
     iface_ (0),
     callback_iface_ (0),
     scope_name_ (0),
-    iface_name_ (0)
+    iface_name_ (0),
+    sync_ (false)
 {
   // This is initialized in the base class to svnt_export_macro()
   // or skel_export_macro(), since there are many more visitor
@@ -53,24 +56,89 @@ be_visitor_facet_ami_exh::visit_provides (be_provides *node)
 
   if (this->gen_reply_handler_class () == -1)
     {
+    ACE_ERROR_RETURN ((LM_ERROR,
+             ACE_TEXT ("be_visitor_facet_ami_exh")
+             ACE_TEXT ("::visit_provides - ")
+             ACE_TEXT ("gen_reply_handler_class() ")
+             ACE_TEXT ("failed\n")),
+            -1);
+   }
+
+
+  if (this->gen_facet_executor_class () == -1)
+    {
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("be_visitor_facet_ami_exh")
                          ACE_TEXT ("::visit_provides - ")
-                         ACE_TEXT ("gen_reply_handler_class() ")
+                         ACE_TEXT ("gen_facet_executor_class() ")
                          ACE_TEXT ("failed\n")),
                         -1);
     }
 
-  if (this->gen_facet_executor_class () == -1)
+  return 0;
+}
+int
+be_visitor_facet_ami_exh::visit_attribute (be_attribute *node)
+{
+
+  be_operation get_op (node->field_type (),
+                       AST_Operation::OP_noflags,
+                       node->name (),
+                       0,
+                       0);
+
+  get_op.set_name ((UTL_IdList *) node->name ()->copy ());
+  if (this->visit_operation (&get_op) == -1)
+    {
+       ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_facet_ami_exh::"
+                             "visit_attribute - "
+                             "codegen for get_attribute failed\n"),
+                            -1);
+    }
+  get_op.destroy ();
+
+  if (node->readonly ())
+    {
+      // Nothing else to do.
+      return 0;
+    }
+  Identifier id ("void");
+  UTL_ScopedName sn (&id, 0);
+
+  // Create the return type, which is "void"
+  be_predefined_type rt (AST_PredefinedType::PT_void, &sn);
+
+  // Argument type is the same as the attribute type.
+  AST_Argument *arg =
+    idl_global->gen ()->create_argument (AST_Argument::dir_IN,
+                                         node->field_type (),
+                                         node->name ());
+
+  arg->set_name ((UTL_IdList *) node->name ()->copy ());
+
+  // Create the operation.
+  be_operation set_op (&rt,
+                       AST_Operation::OP_noflags,
+                       node->name (),
+                       0,
+                       0);
+
+  set_op.set_name ((UTL_IdList *) node->name ()->copy ());
+  set_op.be_add_argument (arg);
+
+  if (this->visit_operation (&set_op) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_facet_ami_exh")
-                         ACE_TEXT ("::visit_provides - ")
-                         ACE_TEXT ("gen_facet_executor_class() ")
-                         ACE_TEXT ("failed\n")),
+                        "(%N:%l) be_visitor_facet_ami_exh::"
+                        "visit_attribute - "
+                        "codegen for set_attribute failed\n"),
                         -1);
     }
 
+    set_op.destroy ();
+    rt.destroy ();
+
   return 0;
 }
 
@@ -84,7 +152,9 @@ be_visitor_facet_ami_exh::visit_operation (be_operation *node)
   /// connector. We want to skip the CCM-related operations
   /// that were added to the connector since it's a component.
   /// We want only the facet interface operations.
-  if (d->node_type () != AST_Decl::NT_interface)
+  /// In case of sync. attribute operations we have a node_type NT_root
+  if ((d->node_type () != AST_Decl::NT_interface) &&
+      (d->node_type () != AST_Decl::NT_root))
     {
       return  0;
     }
@@ -139,6 +209,9 @@ be_visitor_facet_ami_exh::init (bool for_impl)
   AST_Decl *d = s->lookup_by_name (sn, true, false);
   this->callback_iface_ = be_interface::narrow_from_decl (d);
 
+  if (this->callback_iface_ == 0)
+    this->sync_  = true;
+
   sn->destroy ();
   delete sn;
   sn = 0;
@@ -147,9 +220,14 @@ be_visitor_facet_ami_exh::init (bool for_impl)
 int
 be_visitor_facet_ami_exh::gen_reply_handler_class (void)
 {
+  os_ << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__;
+
+
   const char *suffix = "_reply_handler";
   this->init (false);
-
+  if (this->sync_)
+    return 0;
   os_ << be_nl
       << "class " << this->export_macro_.c_str () << " "
       << this->iface_name_ << suffix << be_idt_nl
@@ -194,6 +272,9 @@ be_visitor_facet_ami_exh::gen_reply_handler_class (void)
 int
 be_visitor_facet_ami_exh::gen_facet_executor_class (void)
 {
+    os_ << be_nl_2 << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__;
+
   const char *suffix = "_exec_i";
   const char *scope_name =
     ScopeAsDecl (this->iface_->defined_in ())->full_name ();
@@ -212,15 +293,69 @@ be_visitor_facet_ami_exh::gen_facet_executor_class (void)
       << "virtual ~" << iface_name << suffix
       << " (void);";
 
-  if (this->visit_scope (this->iface_) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_connector_ami_exh")
-                         ACE_TEXT ("::gen_facet_executor_class - ")
-                         ACE_TEXT ("visit_scope() on sendc ")
-                         ACE_TEXT ("interface failed\n")),
-                        -1);
-    }
+
+  ACE_CString handler_str (
+  ScopeAsDecl (this->iface_->defined_in ())->full_name ());
+  ACE_CString tmp (this->iface_->local_name ());
+  handler_str += "::";
+  handler_str += tmp;
+
+  if (ACE_OS::strstr (tmp.c_str(), "AMI4CCM") != 0)
+    this->sync_ = false;
+  else
+    this->sync_ = true;
+  if (this->sync_)
+   {
+     UTL_Scope *ss = this->iface_->defined_in();
+     UTL_ScopedName *sn =
+     FE_Utils::string_to_scoped_name (handler_str.c_str ());
+     AST_Decl *d = ss->lookup_by_name (sn, true);
+
+     sn->destroy ();
+     delete sn;
+     sn = 0;
+
+     be_interface *sync_iface =
+     be_interface::narrow_from_decl (d);
+
+     /// The overload of traverse_inheritance_graph() used here
+     /// doesn't automatically prime the queues.
+     sync_iface->get_insert_queue ().reset ();
+     sync_iface->get_del_queue ().reset ();
+     sync_iface->get_insert_queue ().enqueue_tail (sync_iface);
+
+
+
+     Facet_AMI_ExecH_Op_Attr_Generator op_attr_gen (this);
+     int status =
+         sync_iface->traverse_inheritance_graph(
+             op_attr_gen,
+             &os_,
+             false,
+             false);
+
+     if (status == -1)
+       {
+         ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("be_visitor_facet_ami_exh")
+                      ACE_TEXT ("::gen_facet_executor_class - ")
+                      ACE_TEXT ("traverse_inheritance_graph() on ")
+                      ACE_TEXT ("interface failed\n")));
+
+       }
+   }
+ else
+   {
+     if (this->visit_scope (this->iface_) == -1)
+       {
+         ACE_ERROR_RETURN ((LM_ERROR,
+                                ACE_TEXT ("be_visitor_connector_ami_exh")
+                                ACE_TEXT ("::gen_facet_executor_class - ")
+                                ACE_TEXT ("visit_scope() on sendc ")
+                                ACE_TEXT ("interface failed\n")),
+                               -1);
+       }
+   }
 
   const char *container_type = be_global->ciao_container_type ();
 
@@ -257,4 +392,18 @@ be_visitor_facet_ami_exh::gen_facet_executor_class (void)
 
   return 0;
 }
+// ==================================================
 
+Facet_AMI_ExecH_Op_Attr_Generator::Facet_AMI_ExecH_Op_Attr_Generator (
+      be_visitor_scope * visitor)
+  : visitor_ (visitor)
+{
+}
+
+int
+Facet_AMI_ExecH_Op_Attr_Generator::emit (be_interface * /*derived_interface*/,
+                                        TAO_OutStream *  /*os*/,
+                                        be_interface * base_interface)
+{
+  return visitor_->visit_scope (base_interface);
+}
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 a47895645a0..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
@@ -1,4 +1,3 @@
-
 //=============================================================================
 /**
  *  @file    facet_ami_exs.cpp
@@ -12,11 +11,15 @@
  *  @author Jeff Parsons
  */
 //=============================================================================
+#include "ast_generator.h"
+#include "be_predefined_type.h"
+
 
 be_visitor_facet_ami_exs::be_visitor_facet_ami_exs (
       be_visitor_context *ctx)
   : be_visitor_component_scope (ctx),
-    for_reply_handler_ (true)
+    for_reply_handler_ (true),
+    sync_(false)
 {
 }
 
@@ -40,17 +43,18 @@ be_visitor_facet_ami_exs::visit_component (be_component *node)
 int
 be_visitor_facet_ami_exs::visit_provides (be_provides *node)
 {
+
   this->iface_ =
     be_interface::narrow_from_decl (node->provides_type ());
 
-  if (this->gen_reply_handler_class () == -1)
+    if (this->gen_reply_handler_class () == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_facet_ami_exs")
-                         ACE_TEXT ("::visit_provides - ")
-                         ACE_TEXT ("gen_reply_handler_class() ")
-                         ACE_TEXT ("failed\n")),
-                        -1);
+               ACE_TEXT ("be_visitor_facet_ami_exs")
+               ACE_TEXT ("::visit_provides - ")
+               ACE_TEXT ("gen_reply_handler_class() ")
+               ACE_TEXT ("failed\n")),
+              -1);
     }
 
   if (this->gen_facet_executor_class () == -1)
@@ -65,6 +69,70 @@ be_visitor_facet_ami_exs::visit_provides (be_provides *node)
 
   return 0;
 }
+int
+be_visitor_facet_ami_exs::visit_attribute (be_attribute *node)
+{
+
+  be_operation get_op (node->field_type (),
+                         AST_Operation::OP_noflags,
+                         node->name (),
+                         0,
+                         0);
+  get_op.set_name ((UTL_IdList *) node->name ()->copy ());
+  if (this->visit_operation (&get_op) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                           "(%N:%l) be_visitor_facet_ami_exs::"
+                           "visit_attribute - "
+                           "codegen for get_attribute failed\n"),
+                          -1);
+    }
+
+  get_op.destroy ();
+
+  if (node->readonly ())
+    {
+      // Nothing else to do.
+      return 0;
+    }
+  Identifier id ("void");
+  UTL_ScopedName sn (&id, 0);
+
+  // Create the return type, which is "void"
+  be_predefined_type rt (AST_PredefinedType::PT_void, &sn);
+
+  // Argument type is the same as the attribute type.
+  AST_Argument *arg =
+      idl_global->gen ()->create_argument (AST_Argument::dir_IN,
+                                           node->field_type (),
+                                           node->name ());
+
+  arg->set_name ((UTL_IdList *) node->name ()->copy ());
+
+  // Create the operation.
+  be_operation set_op (&rt,
+                       AST_Operation::OP_noflags,
+                       node->name (),
+                       0,
+                       0);
+
+  set_op.set_name ((UTL_IdList *) node->name ()->copy ());
+  set_op.be_add_argument (arg);
+
+  if (this->visit_operation (&set_op) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                           "(%N:%l) be_visitor_facet_ami_exs::"
+                           "visit_attribute - "
+                           "codegen for set_attribute failed\n"),
+                          -1);
+    }
+
+  set_op.destroy ();
+  rt.destroy ();
+
+  return 0;
+}
 
 int
 be_visitor_facet_ami_exs::visit_operation (be_operation *node)
@@ -76,19 +144,37 @@ be_visitor_facet_ami_exs::visit_operation (be_operation *node)
   /// connector. We want to skip the CCM-related operations
   /// that were added to the connector since it's a component.
   /// We want only the facet interface operations.
+
+  // Coming for sync attribute operations, node_type is NT_root
+  if (d->node_type () == AST_Decl::NT_root)
+    {
+       return gen_facet_executor_sync_op (node);
+    }
+
   if (d->node_type () != AST_Decl::NT_interface)
     {
       return  0;
     }
 
-  if (this->for_reply_handler_)
+  if ((this->for_reply_handler_) && (this->sync_))
+    {
+      return 0;
+   }
+
+  if ((this->for_reply_handler_) && (!this->sync_))
     {
       return this->gen_reply_hander_op (node);
     }
-  else
+  else if ((!this->for_reply_handler_) && (this->sync_))
+    {
+      return gen_facet_executor_sync_op (node);
+    }
+  else if ((!this->for_reply_handler_) && (!this->sync_))
     {
       return this->gen_facet_executor_op (node);
     }
+  else
+    return 0;
 }
 
 int
@@ -118,12 +204,46 @@ be_visitor_facet_ami_exs::post_process (be_decl *node)
 
   return 0;
 }
+void
+be_visitor_facet_ami_exs::init (void)
+{
+  UTL_Scope *s = this->iface_->defined_in ();
+  ACE_CString handler_str (
+    ScopeAsDecl (this->iface_->defined_in ())->full_name ());
+  handler_str += "::AMI_";
+  ACE_CString tmp (this->iface_->local_name ());
+  handler_str += tmp.substr (ACE_OS::strlen ("AMI4CCM_"));
+  handler_str += "Handler";
 
+  UTL_ScopedName *sn =
+    FE_Utils::string_to_scoped_name (handler_str.c_str ());
+  AST_Decl *d = s->lookup_by_name (sn, true);
+
+  sn->destroy ();
+  delete sn;
+  sn = 0;
+
+
+  be_interface *callback_iface =
+    be_interface::narrow_from_decl (d);
+
+  if (callback_iface == 0)
+   this->sync_ = true;
+  else
+    this->sync_ = false;
+
+
+}
 int
 be_visitor_facet_ami_exs::gen_reply_handler_class (void)
 {
   this->for_reply_handler_ = true;
 
+  this->init ();
+  if (this->sync_)
+    return 0;
+
+
   const char *suffix = "_reply_handler";
   UTL_Scope *s = this->iface_->defined_in ();
   AST_Decl *scope = ScopeAsDecl (s);
@@ -175,6 +295,7 @@ be_visitor_facet_ami_exs::gen_reply_handler_class (void)
   delete sn;
   sn = 0;
 
+
   be_interface *callback_iface =
     be_interface::narrow_from_decl (d);
 
@@ -186,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_,
@@ -208,6 +329,7 @@ be_visitor_facet_ami_exs::gen_reply_handler_class (void)
 int
 be_visitor_facet_ami_exs::gen_facet_executor_class (void)
 {
+
   this->for_reply_handler_ = false;
 
   const char *suffix = "_exec_i";
@@ -227,15 +349,47 @@ be_visitor_facet_ami_exs::gen_facet_executor_class (void)
       << "{" << be_nl
       << "}";
 
-
-  if (this->visit_scope (this->iface_) == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("be_visitor_connector_ami_exs")
-                  ACE_TEXT ("::gen_reply_handler_class - ")
-                  ACE_TEXT ("visit_scope() on sendc ")
-                  ACE_TEXT ("interface failed\n")));
-    }
+    ACE_CString handler_str (
+    ScopeAsDecl (this->iface_->defined_in ())->full_name ());
+    ACE_CString tmp (this->iface_->local_name ());
+    handler_str += "::";
+    handler_str += tmp;
+
+    UTL_Scope *ss = this->iface_->defined_in();
+    UTL_ScopedName *sn =
+       FE_Utils::string_to_scoped_name (handler_str.c_str ());
+    AST_Decl *d = ss->lookup_by_name (sn, true);
+
+    sn->destroy ();
+    delete sn;
+    sn = 0;
+
+    be_interface *sync_iface =
+       be_interface::narrow_from_decl (d);
+
+    /// The overload of traverse_inheritance_graph() used here
+    /// doesn't automatically prime the queues.
+    sync_iface->get_insert_queue ().reset ();
+    sync_iface->get_del_queue ().reset ();
+    sync_iface->get_insert_queue ().enqueue_tail (sync_iface);
+
+    Facet_AMI_Exec_Op_Attr_Generator op_attr_gen (this);
+    int status =
+           sync_iface->traverse_inheritance_graph(
+               op_attr_gen,
+               &os_,
+               false,
+               false);
+
+    if (status == -1)
+      {
+        ACE_ERROR ((LM_ERROR,
+                        ACE_TEXT ("be_visitor_facet_ami_exh")
+                        ACE_TEXT ("::gen_facet_executor_class - ")
+                        ACE_TEXT ("traverse_inheritance_graph() on ")
+                        ACE_TEXT ("interface failed\n")));
+
+      }
 
   ACE_CString scope_str (scope_name, 0, false);
 
@@ -299,6 +453,7 @@ be_visitor_facet_ami_exs::gen_facet_executor_class (void)
 int
 be_visitor_facet_ami_exs::gen_reply_hander_op (be_operation *node)
 {
+
   os_ << be_nl_2
       << "void" << be_nl
       << this->iface_->local_name () << "_reply_handler::"
@@ -384,7 +539,12 @@ be_visitor_facet_ami_exs::gen_reply_hander_op (be_operation *node)
 int
 be_visitor_facet_ami_exs::gen_facet_executor_op (be_operation *node)
 {
-  os_ << be_nl_2
+
+  // do not handle not sendc operations.
+  if (ACE_OS::strstr (node->local_name()->get_string (), "sendc_")== 0)
+     return 0;
+
+    os_ << be_nl_2
       << "void" << be_nl
       << this->iface_->local_name () << "_exec_i::"
       << node->local_name ();
@@ -486,7 +646,110 @@ be_visitor_facet_ami_exs::gen_facet_executor_op (be_operation *node)
 
   return 0;
 }
+int
+be_visitor_facet_ami_exs::gen_facet_executor_sync_op (be_operation *node)
+{
+
+   if (node->is_sendc_ami())
+     return 0;
+
+   os_ << be_nl_2;
+  // generate the return type.
+  be_type *bt = be_type::narrow_from_decl (node->return_type ());
+
+  if (!bt)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_operation_ch::")
+                         ACE_TEXT ("gen_facet_executor_sync_op - ")
+                         ACE_TEXT ("Bad return type\n")),
+                        -1);
+    }
+
+  // Grab the right visitor to generate the return type.
+  be_visitor_operation_rettype oro_visitor (this->ctx_);
+
+  if (bt->accept (&oro_visitor) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) facet_ami_exs::"
+                         "gen_facet_executor_sync_op - "
+                         "codegen for return type failed\n"),
+                        -1);
+    }
+
+  os_ << be_nl
+      << this->iface_->local_name () << "_exec_i::"
+      << node->local_name ();
 
+  be_visitor_operation_arglist al_visitor (this->ctx_);
+
+  if (node->accept (&al_visitor) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_facet_ami_exs::")
+                         ACE_TEXT ("gen_facet_executor_op - ")
+                         ACE_TEXT ("codegen for argument ")
+                         ACE_TEXT ("list failed\n")),
+                        -1);
+    }
+
+  AST_Decl *scope = ScopeAsDecl (this->iface_->defined_in ());
+  bool global = (scope->node_type () == AST_Decl::NT_root);
+  const char *smart_scope = (global ? "" : "::");
+
+  ACE_CString iface_str (this->iface_->local_name ());
+  const char *orig_iface_name = iface_str.c_str ();
+  os_ << be_nl
+      << "{" << be_idt_nl;
+
+  AST_PredefinedType *pdt = 0;
+  pdt = AST_PredefinedType::narrow_from_decl (bt);
+  bool ret = true;
+  if ((pdt != 0) && (pdt->pt () == AST_PredefinedType::PT_void))
+    ret =false;
+
+  os_  << "::" << scope->full_name () << smart_scope
+      << orig_iface_name << "_var receptacle_objref =" << be_idt_nl
+      << "this->context_->get_connection_ami4ccm_port_ami4ccm_uses ();"
+      << be_uidt_nl << be_nl;
+
+  os_ << "if (::CORBA::is_nil (receptacle_objref.in ()))"
+      << be_idt_nl
+      << "{" << be_idt_nl
+      << "throw ::CORBA::INV_OBJREF ();" << be_uidt_nl
+      << "}" <<  be_uidt_nl << be_nl;
+  if (ret)
+    {
+      os_  << "return " ;
+    }
+  os_ << "receptacle_objref->" << node->local_name ()
+      << " (" << be_idt << be_idt_nl;
+
+  unsigned long index = 0UL;
+
+  /// Quick scope iteration to catch all the args .
+  for (UTL_ScopeActiveIterator i (node, UTL_Scope::IK_decls);
+       !i.is_done ();
+       i.next (), ++index)
+    {
+      AST_Decl *d = i.item ();
+      if (index == 0UL)
+        {
+          os_ << d->local_name ();
+        }
+     else
+        {
+          os_ << "," << be_nl
+          << d->local_name ();
+        }
+    }
+
+  os_ << ");" << be_uidt << be_uidt << be_uidt_nl;
+  os_ << "}";
+
+  return 0;
+}
 // ==================================================
 
 Facet_AMI_Exec_Op_Attr_Generator::Facet_AMI_Exec_Op_Attr_Generator (
@@ -496,10 +759,11 @@ Facet_AMI_Exec_Op_Attr_Generator::Facet_AMI_Exec_Op_Attr_Generator (
 }
 
 int
-Facet_AMI_Exec_Op_Attr_Generator::emit (be_interface * /*derived_interface */,
-                                        TAO_OutStream * /* os */,
+Facet_AMI_Exec_Op_Attr_Generator::emit (be_interface * /*derived_interface*/,
+                                        TAO_OutStream * /*os*/ ,
                                         be_interface * base_interface)
 {
   return visitor_->visit_scope (base_interface);
 }
 
+
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 6d2559612db..dbe0de1df37 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
@@ -510,6 +510,8 @@ 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:
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_include/be_visitor_connector/facet_ami_exh.h b/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exh.h
index 1ab59a3edef..4041ff91eac 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exh.h
@@ -36,6 +36,7 @@ public:
   virtual int visit_component (be_component *node);
   virtual int visit_provides (be_provides *node);
   virtual int visit_operation (be_operation *node);
+  virtual int visit_attribute (be_attribute *node);
 
 protected:
   /// Common the this class and derived class.
@@ -48,11 +49,28 @@ protected:
   const char *scope_name_;
   const char *iface_name_;
   const char *smart_scope_;
+  bool sync_;
 
 private:
   int gen_reply_handler_class (void);
   int gen_facet_executor_class (void);
 };
+  //==============================================================
 
+  /// Worker class passed to traverse_inheritance_graph(),
+  /// collects all operations and attributes.
+  class Facet_AMI_ExecH_Op_Attr_Generator
+    : public TAO_IDL_Inheritance_Hierarchy_Worker
+  {
+  public:
+    Facet_AMI_ExecH_Op_Attr_Generator (be_visitor_scope * visitor);
+
+    virtual int emit (be_interface * derived_interface,
+                      TAO_OutStream * os,
+                      be_interface * base_interface);
+
+  private:
+    be_visitor_scope * visitor_;
+  };
 #endif /* _BE_COMPONENT_FACET_AMI_EXH_H_ */
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h b/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h
index 525e9cfa439..95fb47a81ea 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h
@@ -37,14 +37,17 @@ public:
   virtual int visit_provides (be_provides *node);
   virtual int visit_operation (be_operation *node);
   virtual int visit_argument (be_argument *node);
+  virtual int visit_attribute (be_attribute *node);
 
   virtual int post_process (be_decl *node);
 
 private:
+  void init (void);
   int gen_reply_handler_class (void);
   int gen_facet_executor_class (void);
   int gen_reply_hander_op (be_operation *node);
   int gen_facet_executor_op (be_operation *node);
+  int gen_facet_executor_sync_op (be_operation *node);
 
 private:
   /// Storage for the interface type of the facet.
@@ -53,6 +56,7 @@ private:
   /// Flag to tell us which operation body (reply handler
   /// or sendc_* class) we are generating.
   bool for_reply_handler_;
+  bool sync_;
 };
 
 //==============================================================
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll
index dfe41a3e039..ff88c20ada1 100644
--- a/TAO/TAO_IDL/fe/idl.ll
+++ b/TAO/TAO_IDL/fe/idl.ll
@@ -846,7 +846,8 @@ idl_store_pragma (char *buf)
       // Delete tmp since add_ciao_spl_ts_file_names() doesn't take its ownership.
       delete [] tmp;
     }
-  else if (ACE_OS::strncmp (buf + 8, "ciao ami4ccm interface", 22) == 0)
+  else if ((ACE_OS::strncmp (buf + 8, "ciao ami4ccm interface", 22) == 0) ||
+           (ACE_OS::strncmp (buf + 8, "ami4ccm interface", 17) == 0))
     {
       if (idl_global->in_main_file ())
         {
@@ -857,7 +858,8 @@ idl_store_pragma (char *buf)
           delete [] tmp;
         }
     }
-  else if (ACE_OS::strncmp (buf + 8, "ciao ami4ccm receptacle", 23) == 0)
+  else if ((ACE_OS::strncmp (buf + 8, "ciao ami4ccm receptacle", 23) == 0)||
+           (ACE_OS::strncmp (buf + 8, "ami4ccm receptacle", 18) == 0))
     {
       char *tmp = idl_get_pragma_string (buf);
 
@@ -876,7 +878,8 @@ idl_store_pragma (char *buf)
       // Delete tmp since add_ciao_spl_ts_file_names() doesn't take its ownership.
       delete [] tmp;
     }
-  else if (ACE_OS::strncmp (buf + 8, "ciao ami4ccm idl", 16) == 0)
+  else if ((ACE_OS::strncmp (buf + 8, "ciao ami4ccm idl", 16) == 0) ||
+           (ACE_OS::strncmp (buf + 8, "ami4ccm idl", 11) == 0))
     {
       char *tmp = idl_get_pragma_string (buf);
 
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp
index 1ba2ff65fac..e0242d36959 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp
@@ -3368,7 +3368,8 @@ idl_store_pragma (char *buf)
       // Delete tmp since add_ciao_spl_ts_file_names() doesn't take its ownership.
       delete [] tmp;
     }
-  else if (ACE_OS::strncmp (buf + 8, "ciao ami4ccm interface", 22) == 0)
+  else if ((ACE_OS::strncmp (buf + 8, "ciao ami4ccm interface", 22) == 0) ||
+           (ACE_OS::strncmp (buf + 8, "ami4ccm interface", 17) == 0))
     {
       if (idl_global->in_main_file ())
         {
@@ -3379,7 +3380,8 @@ idl_store_pragma (char *buf)
           delete [] tmp;
         }
     }
-  else if (ACE_OS::strncmp (buf + 8, "ciao ami4ccm receptacle", 23) == 0)
+  else if ((ACE_OS::strncmp (buf + 8, "ciao ami4ccm receptacle", 23) == 0) ||
+           (ACE_OS::strncmp (buf + 8, "ami4ccm receptacle", 18) == 0))
     {
       char *tmp = idl_get_pragma_string (buf);
 
@@ -3398,7 +3400,8 @@ idl_store_pragma (char *buf)
       // Delete tmp since add_ciao_spl_ts_file_names() doesn't take its ownership.
       delete [] tmp;
     }
-  else if (ACE_OS::strncmp (buf + 8, "ciao ami4ccm idl", 16) == 0)
+  else if ((ACE_OS::strncmp (buf + 8, "ciao ami4ccm idl", 16) == 0) ||
+           (ACE_OS::strncmp (buf + 8, "ami4ccm idl", 11) == 0))
     {
       char *tmp = idl_get_pragma_string (buf);
 
diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h
index 0ae8a618e35..435a3275158 100644
--- a/TAO/TAO_IDL/include/idl_global.h
+++ b/TAO/TAO_IDL/include/idl_global.h
@@ -916,7 +916,8 @@ private:
   // ...but we need to do it only once.
 
   ACE_Unbounded_Queue<char *> ciao_ami_idl_fnames_;
-  // Stores directives from #pragma ciao ami4ccm idl "xxx".
+  // Stores directives from #pragma ciao ami4ccm idl "xxx"
+  // or  #pragma ami4ccm idl "xxx".
 
   ACE_Unbounded_Queue<char *> dds4ccm_impl_fnames_;
   // Stores directives from #pragma dds4ccm impl "xxx".
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/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/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/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/tao/Leader_Follower.cpp b/TAO/tao/Leader_Follower.cpp
index 363f804e094..427374ee726 100644
--- a/TAO/tao/Leader_Follower.cpp
+++ b/TAO/tao/Leader_Follower.cpp
@@ -3,7 +3,6 @@
 #include "ace/Countdown_Time.h"
 #include "ace/OS_NS_sys_time.h"
 #include "ace/Reactor.h"
-#include "ace/Timer_Queue.h"
 #include "ace/Auto_Ptr.h"
 
 #include "tao/Leader_Follower.h"
@@ -93,9 +92,7 @@ int
 TAO_Leader_Follower::wait_for_client_leader_to_complete (ACE_Time_Value *max_wait_time)
 {
   int result = 0;
-  ACE_Reactor * const reactor = this->reactor ();
-  ACE_Countdown_Time countdown (max_wait_time,
-                                reactor->timer_queue ()->get_timer_method ());
+  ACE_Countdown_Time countdown (max_wait_time);
 
   // Note that we are waiting.
   ++this->event_loop_threads_waiting_;
@@ -256,8 +253,7 @@ TAO_Leader_Follower::wait_for_event (TAO_LF_Event *event,
   // Obtain the lock.
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock (), -1);
 
-  ACE_Countdown_Time countdown (max_wait_time,
-                                this->reactor ()->timer_queue ()->get_timer_method ());
+  ACE_Countdown_Time countdown (max_wait_time);
 
   // Optimize the first iteration [no access to errno]
   int result = 1;
diff --git a/TAO/tao/Messaging/Messaging_Queueing_Strategies.cpp b/TAO/tao/Messaging/Messaging_Queueing_Strategies.cpp
index 05748654ed8..90c0e441f7d 100644
--- a/TAO/tao/Messaging/Messaging_Queueing_Strategies.cpp
+++ b/TAO/tao/Messaging/Messaging_Queueing_Strategies.cpp
@@ -3,13 +3,10 @@
 #include "tao/Messaging/Messaging_Queueing_Strategies.h"
 #include "tao/Messaging/Buffering_Constraint_Policy.h"
 #include "tao/Stub.h"
-#include "tao/ORB_Core.h"
 #include "tao/debug.h"
 
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_sys_time.h"
-#include "ace/Reactor.h"
-#include "ace/Timer_Queue.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -84,8 +81,7 @@ namespace TAO
         constraints_reached = true;
       }
 
-    if (this->timer_check (stub,
-                           buffering_constraint,
+    if (this->timer_check (buffering_constraint,
                            current_deadline,
                            set_timer,
                            new_deadline))
@@ -98,7 +94,6 @@ namespace TAO
 
   bool
   Eager_Transport_Queueing_Strategy::timer_check (
-    TAO_Stub *stub,
     const TAO::BufferingConstraint &buffering_constraint,
     const ACE_Time_Value &current_deadline,
     bool &set_timer,
@@ -113,9 +108,7 @@ namespace TAO
       }
 
     // Compute the next deadline...
-    ACE_Reactor * const reactor = stub->orb_core ()->reactor ();
-    ACE_Time_Value const now =
-        reactor->timer_queue ()->gettimeofday ();
+    ACE_Time_Value const now = ACE_OS::gettimeofday ();
     ACE_Time_Value timeout =
       this->time_conversion (buffering_constraint.timeout);
     new_deadline = now + timeout;
diff --git a/TAO/tao/Messaging/Messaging_Queueing_Strategies.h b/TAO/tao/Messaging/Messaging_Queueing_Strategies.h
index 2bf7c425b84..9bceb8518a6 100644
--- a/TAO/tao/Messaging/Messaging_Queueing_Strategies.h
+++ b/TAO/tao/Messaging/Messaging_Queueing_Strategies.h
@@ -62,7 +62,6 @@ namespace TAO
     /// Check if the buffering constraint includes any timeouts and
     /// compute the right timeout interval if needed.
     /**
-     * @param stub
      * @param buffering_constraint The constraints defined by the
      *        application
      * @param current_deadline The current deadline
@@ -74,8 +73,7 @@ namespace TAO
      *         returns false then flushing may need to be delayed, use @c
      *         set_timer and
      */
-    bool timer_check (TAO_Stub *stub,
-                      const TAO::BufferingConstraint &buffering_constraint,
+    bool timer_check (const TAO::BufferingConstraint &buffering_constraint,
                       const ACE_Time_Value &current_deadline,
                       bool &set_timer,
                       ACE_Time_Value &new_deadline) const;
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index dd06f2aa5a0..774271bdfa5 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -50,8 +50,6 @@
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
 #include "ace/Reactor.h"
-#include "ace/Timer_Queue.h"
-#include "ace/High_Res_Timer.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/Argv_Type_Converter.h"
@@ -782,16 +780,6 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
           arg_shifter.consume_arg ();
         }
       else if (0 != (current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBUseHighresTimer"))))
-        {
-          // Use Highres Timer or not (default).
-          int const use_highres_timer =
-            ACE_OS::atoi (current_arg);
-          this->orb_params ()->use_highres_timer (use_highres_timer != 0);
-
-          arg_shifter.consume_arg ();
-        }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBAMICollocation"))))
         {
           int const ami_collocation = ACE_OS::atoi (current_arg);
@@ -1264,16 +1252,6 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
         CORBA::COMPLETED_NO);
     }
 
-  // handle the ORB timer setting
-  if (this->orb_params ()->use_highres_timer ())
-    {
-      // intialize GSF now
-      (void) ACE_High_Res_Timer::global_scale_factor ();
-      // install highres timer for reactor timer queue
-      reactor->timer_queue ()->gettimeofday
-        (&ACE_High_Res_Timer::gettimeofday_hr);
-    }
-
   TAO_Server_Strategy_Factory *ssf = this->server_factory ();
 
   if (ssf == 0)
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/Transport.cpp b/TAO/tao/Transport.cpp
index 3b5a6b6e55b..ce7224a2287 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -29,7 +29,6 @@
 #include "ace/OS_NS_sys_time.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/Reactor.h"
-#include "ace/Timer_Queue.h"
 #include "ace/os_include/sys/os_uio.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/Countdown_Time.h"
@@ -1326,8 +1325,7 @@ TAO_Transport::check_buffering_constraints_i (TAO_Stub *stub, bool &must_flush)
       ACE_Event_Handler *eh = this->event_handler_i ();
       ACE_Reactor * const reactor = eh->reactor ();
       this->current_deadline_ = new_deadline;
-      ACE_Time_Value delay =
-          new_deadline - reactor->timer_queue ()->gettimeofday ();
+      ACE_Time_Value delay = new_deadline - ACE_OS::gettimeofday ();
 
       if (this->flush_timer_pending ())
         {
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/params.cpp b/TAO/tao/params.cpp
index 4997236f46f..4008d358ca9 100644
--- a/TAO/tao/params.cpp
+++ b/TAO/tao/params.cpp
@@ -31,7 +31,6 @@ TAO_ORB_Parameters::TAO_ORB_Parameters (void)
   , linger_ (-1)
   , accept_error_delay_ (0)
   , std_profile_components_ (1)
-  , use_highres_timer_ (false)
   , ace_sched_policy_ (ACE_SCHED_OTHER)
   , sched_policy_ (THR_SCHED_DEFAULT)
   , scope_policy_ (THR_SCOPE_PROCESS)
diff --git a/TAO/tao/params.h b/TAO/tao/params.h
index e0312f70d0d..e604e76814a 100644
--- a/TAO/tao/params.h
+++ b/TAO/tao/params.h
@@ -147,10 +147,6 @@ public:
   bool std_profile_components (void) const;
   void std_profile_components (bool x);
 
-  /// Use Highres Timer for all timer events and countdowns
-  bool use_highres_timer (void) const;
-  void use_highres_timer (bool x);
-
   /// Scheduling policy.
   /**
    * Scheduling policy specified by the user through the
@@ -343,9 +339,6 @@ private:
   /// If true then the standard OMG components are not generated.
   bool std_profile_components_;
 
-  /// Use Highres timer for all timer events and countdowns
-  bool use_highres_timer_;
-
   /// Scheduling policy.
   /**
    * Scheduling policy specified by the user through the
diff --git a/TAO/tao/params.inl b/TAO/tao/params.inl
index 84f3202e3ad..d148ea835e3 100644
--- a/TAO/tao/params.inl
+++ b/TAO/tao/params.inl
@@ -151,17 +151,6 @@ TAO_ORB_Parameters::std_profile_components (bool x)
   this->std_profile_components_ = x;
 }
 
-ACE_INLINE bool
-TAO_ORB_Parameters::use_highres_timer (void) const
-{
-  return this->use_highres_timer_;
-}
-ACE_INLINE void
-TAO_ORB_Parameters::use_highres_timer (bool x)
-{
-  this->use_highres_timer_ = x;
-}
-
 ACE_INLINE int
 TAO_ORB_Parameters::nodelay (void) const
 {
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/valuetype.idl b/TAO/tests/IDL_Test/valuetype.idl
index de7d0f56ea3..799ff4806fd 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/Mixed_Sync_ASync_Events/main.cpp b/TAO/tests/Mixed_Sync_ASync_Events/main.cpp
index cff4b78d7b1..c5094d29282 100644
--- a/TAO/tests/Mixed_Sync_ASync_Events/main.cpp
+++ b/TAO/tests/Mixed_Sync_ASync_Events/main.cpp
@@ -150,7 +150,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         opponent =  A::Test::_narrow (object.in ());
       } while (mode_flag == A::RM_SLAVE && CORBA::is_nil (opponent.in ()));
 
-      if (CORBA::is_nil (opponent))
+      if (CORBA::is_nil (opponent.in ()))
       {
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot resolve opponent IOR: %s",
diff --git a/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp b/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp
index 5d3c356b210..e7288c42745 100644
--- a/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp
+++ b/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp
@@ -92,7 +92,7 @@ Test_i::report (
 void
 Test_i::shutdown (void)
 {
-  if (this->mode_ == A::RM_SLAVE && !CORBA::is_nil (this->opponent_))
+  if (this->mode_ == A::RM_SLAVE && !CORBA::is_nil (this->opponent_.in ()))
   {
     this->opponent_->shutdown ();
   }
@@ -190,7 +190,7 @@ TestHandler::handle_timeout (const ACE_Time_Value &,
   if ((ACE_OS::rand_r (&this->seed_) % 2) == 0)
   {
     A::FollowUp followup;
-    if (!CORBA::is_nil (this->opponent_))
+    if (!CORBA::is_nil (this->opponent_.in ()))
     {
       this->opponent_->request(A::RQM_SYNCH, this->counter_, followup);
       this->handle_followup (followup, this->counter_);
@@ -198,9 +198,9 @@ TestHandler::handle_timeout (const ACE_Time_Value &,
   }
   else
   {
-    if (!CORBA::is_nil (this->opponent_))
+    if (!CORBA::is_nil (this->opponent_.in ()))
     {
-      this->opponent_->sendc_request(this->rh_, A::RQM_ASYNCH, this->counter_);
+      this->opponent_->sendc_request(this->rh_.in (), A::RQM_ASYNCH, this->counter_);
     }
   }
   return 0;
@@ -222,7 +222,7 @@ TestHandler::handle_exception (ACE_HANDLE)
   {
     if (!CORBA::is_nil (this->opponent_))
     {
-      this->opponent_->sendc_request(this->rh_, A::RQM_ASYNCH, this->counter_);
+      this->opponent_->sendc_request(this->rh_.in (), A::RQM_ASYNCH, this->counter_);
     }
   }
   return 0;
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/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/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/Skeleton_Inheritance/skel_inheritance.mpc b/TAO/tests/Skeleton_Inheritance/skel_inheritance.mpc
index 60c5c9d29a0..78d643353fd 100644
--- a/TAO/tests/Skeleton_Inheritance/skel_inheritance.mpc
+++ b/TAO/tests/Skeleton_Inheritance/skel_inheritance.mpc
@@ -132,7 +132,7 @@ project(stub_three): taolib {
   sharedname = stub_three
   after += idl_three_gen idl_two_gen idl_one_gen \
            stub_one stub_two
-  libs += stub_one stub_two
+  libs += stub_two stub_one
 
   dynamicflags += SKELETON_INHERITANCE_STUB_3_BUILD_DLL
 
@@ -152,7 +152,7 @@ project(stub_three): taolib {
 
 project(skel_three): taolib, portableserver {
   after += idl_three_gen stub_three skel_one skel_two
-  libs += stub_three skel_one stub_one skel_two stub_two
+  libs += stub_three skel_two stub_two skel_one stub_one
 
   sharedname = skel_three
   dynamicflags += SKELETON_INHERITANCE_SKEL_3_BUILD_DLL
@@ -176,9 +176,9 @@ project(*Server): taoserver {
             stub_one skel_one \
             stub_two skel_two \
             stub_three skel_three
-  libs +=   stub_one skel_one \
+  libs +=   skel_three stub_three  \
             stub_two skel_two \
-            stub_three skel_three
+            skel_one stub_one
 
   Source_Files {
     interface_3_i.cpp
@@ -197,9 +197,7 @@ project(*Client): taoclient {
             stub_one \
             stub_two \
             stub_three
-  libs +=   stub_one \
-            stub_two \
-            stub_three
+  libs +=   stub_three stub_two stub_one
 
   Source_Files {
     client.cpp